ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-28 18:30:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to Qt4.

Browse Source
This commit is contained in:
mkr 2007-07-02 11:19:22 +00:00
parent 3ffc5a5de6
commit 52be74e46c
8 changed files with 73 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/GEOMFiltersSelection/GEOMFiltersSelection.pro Normal file
View File

@ -0,0 +1,53 @@
TEMPLATE = lib
TARGET = GEOMFiltersSelection
DESTDIR = ../../lib
MOC_DIR = ../../moc
OBJECTS_DIR = ../../obj/$$TARGET
QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
CASROOT = $$(CASROOT)
CAS_CPPFLAGS = $${CASROOT}/inc
BOOST_CPPFLAGS = $$(BOOSTDIR)/include
GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
GUI_LDFLAGS = -L$$(GUI_ROOT_DIR)/lib/salome
KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
INCLUDEPATH += $${QT_INCLUDES} $${CAS_CPPFLAGS} $${BOOST_CPPFLAGS} $${GUI_CXXFLAGS} $${KERNEL_CXXFLAGS} $${CORBA_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMClient $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
LIBS += -L$$(GEOM_ROOT_DIR)/idl -lSalomeIDLGEOM -L$$(GEOM_ROOT_DIR)/lib -lGEOMClient $${GUI_LDFLAGS} -lsuit -lSalomeApp -lSalomeSession $${KERNEL_LDFLAGS} -lSalomeLifeCycleCORBA -lSalomeContainer -lTOOLSDS
CONFIG -= debug release debug_and_release
CONFIG += qt thread debug dll shared
win32:DEFINES += WIN32
DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
HEADERS = GEOM_SelectionFilter.h
HEADERS += GEOM_EdgeFilter.h
HEADERS += GEOM_FaceFilter.h
HEADERS += GEOM_TypeFilter.h
HEADERS += GEOM_PreviewFilter.h
HEADERS += GEOM_LogicalFilter.h
HEADERS += GEOM_OCCFilter.h
SOURCES = GEOM_SelectionFilter.cxx
SOURCES += GEOM_EdgeFilter.cxx
SOURCES += GEOM_FaceFilter.cxx
SOURCES += GEOM_TypeFilter.cxx
SOURCES += GEOM_PreviewFilter.cxx
SOURCES += GEOM_LogicalFilter.cxx
SOURCES += GEOM_OCCFilter.cxx
includes.files = $$HEADERS
includes.path = ../../include
INSTALLS += includes

1
src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx
View File

@ -31,7 +31,6 @@
#include "Handle_GEOM_EdgeFilter.hxx"
#endif
#include "SALOME_InteractiveObject.hxx"
#include "GEOM_ShapeTypeFilter.hxx"
// IDL Headers

12
src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx
View File

@ -23,7 +23,7 @@
// function : GEOM_LogicalFilter
// purpose :
//=======================================================================
GEOM_LogicalFilter::GEOM_LogicalFilter( const QPtrList<SUIT_SelectionFilter>& lst, const int op )
GEOM_LogicalFilter::GEOM_LogicalFilter( const QList<SUIT_SelectionFilter*>& lst, const int op )
: SUIT_SelectionFilter()
{
setFilters( lst );
@ -45,8 +45,12 @@ GEOM_LogicalFilter::~GEOM_LogicalFilter()
bool GEOM_LogicalFilter::isOk( const SUIT_DataOwner* owner ) const
{
GEOM_LogicalFilter* non_const_this = (GEOM_LogicalFilter*)this;
for ( SUIT_SelectionFilter* filter = non_const_this->myFilters.first(); filter; filter = non_const_this->myFilters.next() )
QListIterator<SUIT_SelectionFilter*> it( non_const_this->myFilters );
while ( it.hasNext() )
{
SUIT_SelectionFilter* filter = it.next();
if ( !filter ) continue;
if ( myOperation == LO_OR && filter->isOk( owner ) )
return true;
if ( myOperation == LO_AND && !filter->isOk( owner ) )
@ -62,7 +66,7 @@ bool GEOM_LogicalFilter::isOk( const SUIT_DataOwner* owner ) const
// function : setFilters
// purpose :
//=======================================================================
void GEOM_LogicalFilter::setFilters( const QPtrList<SUIT_SelectionFilter>& lst )
void GEOM_LogicalFilter::setFilters( const QList<SUIT_SelectionFilter*>& lst )
{
myFilters = lst;
}
@ -80,7 +84,7 @@ void GEOM_LogicalFilter::setOperation( const int op )
// function : getFilters
// purpose :
//=======================================================================
QPtrList<SUIT_SelectionFilter> GEOM_LogicalFilter::getFilters() const
QList<SUIT_SelectionFilter*> GEOM_LogicalFilter::getFilters() const
{
return myFilters;
}

12
src/GEOMFiltersSelection/GEOM_LogicalFilter.h
View File

@ -23,7 +23,7 @@
#include <SUIT_SelectionFilter.h>
#include <Standard_Macro.hxx>
#include <qptrlist.h>
#include <QList>
class Standard_EXPORT GEOM_LogicalFilter : public SUIT_SelectionFilter
{
@ -31,19 +31,19 @@ public:
enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };
public:
GEOM_LogicalFilter( const QPtrList<SUIT_SelectionFilter>& lst, const int op );
GEOM_LogicalFilter( const QList<SUIT_SelectionFilter*>& lst, const int op );
~GEOM_LogicalFilter();
virtual bool isOk( const SUIT_DataOwner* ) const;
void setFilters( const QPtrList<SUIT_SelectionFilter>& lst );
void setFilters( const QList<SUIT_SelectionFilter*>& lst );
void setOperation( const int );
QPtrList<SUIT_SelectionFilter> getFilters() const;
QList<SUIT_SelectionFilter*> getFilters() const;
int getOperation() const;
private:
QPtrList<SUIT_SelectionFilter> myFilters;
int myOperation;
QList<SUIT_SelectionFilter*> myFilters;
int myOperation;
};

2
src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
View File

@ -45,6 +45,6 @@ GEOM_PreviewFilter::~GEOM_PreviewFilter()
bool GEOM_PreviewFilter::isOk( const SUIT_DataOwner* sOwner ) const
{
const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*> ( sOwner );
return ( owner && strstr( owner->entry(), "TEMP" ) );
return ( owner && strstr( owner->entry().toStdString().c_str(), "TEMP" ) );
}

7
src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
View File

@ -29,9 +29,6 @@
#include <SUIT_Session.h>
#include <SALOMEDSClient.hxx>
//=======================================================================
// function : GEOM_SelectionFilter
// purpose :
@ -84,7 +81,7 @@ GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject( const SUIT_DataOwner* sOw
_PTR(Study) study = appStudy->studyDS();
QString entry = owner->entry();
_PTR(SObject) aSO (study->FindObjectID(entry.latin1())), aRefSO;
_PTR(SObject) aSO (study->FindObjectID(entry.toStdString())), aRefSO;
if( extractReference && aSO && aSO->ReferencedObject( aRefSO ) )
aSO = aRefSO;
@ -164,7 +161,7 @@ void GEOM_SelectionFilter::add( const int type )
void GEOM_SelectionFilter::remove( const int type )
{
if ( contains( type ) )
myTypes.remove( type );
myTypes.removeAll( type );
}
//=======================================================================

4
src/GEOMFiltersSelection/GEOM_SelectionFilter.h
View File

@ -24,7 +24,7 @@
#include <TopoDS_Shape.hxx>
#include <qvaluelist.h>
#include <QList>
// IDL Headers
#include <SALOMEconfig.h>
@ -52,7 +52,7 @@ protected:
bool isShapeOk( const TopoDS_Shape& ) const;
private:
QValueList<int> myTypes;
QList<int> myTypes;
bool myAll;
};

2
src/src.pro
View File

@ -21,7 +21,7 @@ SUBDIRS += GEOMImpl
SUBDIRS += GEOM_I
SUBDIRS += GEOMClient
SUBDIRS += DlgRef
#SUBDIRS += GEOMFiltersSelection
SUBDIRS += GEOMFiltersSelection
#SUBDIRS += GEOMGUI
#SUBDIRS += GEOMBase
#SUBDIRS += GEOMToolsGUI