From: mkr Date: Thu, 28 Jun 2007 07:40:46 +0000 (+0000) Subject: Porting to Qt4. X-Git-Tag: snapshot_171207~41 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9384e0b64db89a42d49803c3f3b9eeda6e05f5a1;p=modules%2Fgeom.git Porting to Qt4. --- diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx index 4a3f6e0e9..c59629575 100644 --- a/src/OBJECT/GEOM_AISShape.cxx +++ b/src/OBJECT/GEOM_AISShape.cxx @@ -34,15 +34,10 @@ #include "GEOM_AISShape.ixx" #include "SALOME_InteractiveObject.hxx" -#include "utilities.h" - // Open CASCADE Includes #include #include #include -#include -#include -#include #include #include #include @@ -51,7 +46,6 @@ #include #include #include -#include #include #include #include diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h index ae4a08d10..fe465835b 100644 --- a/src/OBJECT/GEOM_Actor.h +++ b/src/OBJECT/GEOM_Actor.h @@ -38,7 +38,6 @@ #include class vtkCamera; -class TopoDS_Shape; class GEOM_OBJECT_EXPORT GEOM_Actor : public SALOME_Actor { public: diff --git a/src/OBJECT/GEOM_AssemblyBuilder.cxx b/src/OBJECT/GEOM_AssemblyBuilder.cxx index cb1a8ba03..3ba95145b 100644 --- a/src/OBJECT/GEOM_AssemblyBuilder.cxx +++ b/src/OBJECT/GEOM_AssemblyBuilder.cxx @@ -35,8 +35,11 @@ #include "GEOM_Actor.h" #include +#include #include +#include +#include // Open CASCADE Includes #include @@ -50,6 +53,9 @@ #include #include +// Qt includes +#include + #include "utilities.h" using namespace std; diff --git a/src/OBJECT/GEOM_AssemblyBuilder.h b/src/OBJECT/GEOM_AssemblyBuilder.h index c74cc11d5..08f372c14 100644 --- a/src/OBJECT/GEOM_AssemblyBuilder.h +++ b/src/OBJECT/GEOM_AssemblyBuilder.h @@ -28,9 +28,9 @@ #include "GEOM_OBJECT_defs.hxx" -#include -#include -#include +class vtkProperty; +class vtkAssembly; +class vtkActorCollection; // Open CASCADE Inlcudes #include diff --git a/src/OBJECT/GEOM_InteractiveObject.hxx b/src/OBJECT/GEOM_InteractiveObject.hxx index cc405f407..0e601609d 100644 --- a/src/OBJECT/GEOM_InteractiveObject.hxx +++ b/src/OBJECT/GEOM_InteractiveObject.hxx @@ -46,8 +46,6 @@ #ifndef _Handle_SALOME_InteractiveObject_HeaderFile #include "Handle_SALOME_InteractiveObject.hxx" #endif -class SALOME_InteractiveObject; - class GEOM_InteractiveObject : public SALOME_InteractiveObject { diff --git a/src/OBJECT/GEOM_OCCReader.cxx b/src/OBJECT/GEOM_OCCReader.cxx index 01400b67f..76d398dd1 100644 --- a/src/OBJECT/GEOM_OCCReader.cxx +++ b/src/OBJECT/GEOM_OCCReader.cxx @@ -34,24 +34,14 @@ #include #include -#include -#include - -#include -#include // OpenCASCADE Includes -#include #include -#include #include #include -#include +#include #include #include -#include -#include -#include #include #include #include @@ -63,12 +53,7 @@ #include #include #include -#include -#include #include -#include -#include -#include #include #include #include diff --git a/src/OBJECT/GEOM_OCCReader.h b/src/OBJECT/GEOM_OCCReader.h index 5c0288a75..1bf1ce70f 100644 --- a/src/OBJECT/GEOM_OCCReader.h +++ b/src/OBJECT/GEOM_OCCReader.h @@ -44,8 +44,6 @@ class vtkCellArray; // OpenCASCADE #include #include -#include -#include #include #include diff --git a/src/OBJECT/GEOM_VTKTrihedron.cxx b/src/OBJECT/GEOM_VTKTrihedron.cxx index 847077d55..7cfadbe8f 100644 --- a/src/OBJECT/GEOM_VTKTrihedron.cxx +++ b/src/OBJECT/GEOM_VTKTrihedron.cxx @@ -27,30 +27,19 @@ // $Header: #include "GEOM_VTKTrihedron.hxx" -#include "utilities.h" -#include "GEOM_OCCReader.h" #include #include #include #include -#include -#include -#include -#include -#include #include -#include #include -#include -#include #include -#include #include +#include #include #include -#include #include #include #include diff --git a/src/OBJECT/GEOM_VTKTrihedron.hxx b/src/OBJECT/GEOM_VTKTrihedron.hxx index 1d9e85347..fc244a0d7 100644 --- a/src/OBJECT/GEOM_VTKTrihedron.hxx +++ b/src/OBJECT/GEOM_VTKTrihedron.hxx @@ -35,7 +35,6 @@ #include "SALOME_Actor.h" #include "VTKViewer_Trihedron.h" -class vtkActorCollection; class vtkRenderer; class vtkPolyDataMapper; diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am index 3d3e0dacb..828e4e686 100644 --- a/src/OBJECT/Makefile.am +++ b/src/OBJECT/Makefile.am @@ -62,7 +62,6 @@ libGEOMObject_la_CPPFLAGS = \ $(PYTHON_INCLUDES) \ $(CAS_CPPFLAGS) \ $(VTK_INCLUDES) \ - $(OGL_INCLUDES) \ $(KERNEL_CXXFLAGS) \ $(GUI_CXXFLAGS) diff --git a/src/OBJECT/OBJECT.pro b/src/OBJECT/OBJECT.pro new file mode 100644 index 000000000..1a72b8209 --- /dev/null +++ b/src/OBJECT/OBJECT.pro @@ -0,0 +1,59 @@ +TEMPLATE = lib +TARGET = GEOMObject +DESTDIR = ../../lib +MOC_DIR = ../../moc +OBJECTS_DIR = ../../obj/$$TARGET + +CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS + +QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml + +PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4 + +CASROOT = $$(CASROOT) +CAS_CPPFLAGS = $${CASROOT}/inc + +VTK_INCLUDES = $$(VTKHOME)/include/vtk + +KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome + +GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome + +KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome + +GUI_LDFLAGS = -L$$(GUI_ROOT_DIR)/lib/salome + +INCLUDEPATH += $${CORBA_INCLUDES} $${QT_INCLUDES} $${PYTHON_INCLUDES} $${CAS_CPPFLAGS} $${VTK_INCLUDES} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} + +LIBS += $${KERNEL_LDFLAGS} -lSALOMELocalTrace $${GUI_LDFLAGS} -lqtx -lVTKViewer -lSVTK -lSalomeObject + +CONFIG -= debug release debug_and_release +CONFIG += qt thread debug dll shared + +win32:DEFINES += WIN32 +DEFINES += OBJECT_EXPORTS 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_Actor.h +HEADERS += GEOM_AssemblyBuilder.h +HEADERS += GEOM_AISShape.hxx +HEADERS += Handle_GEOM_AISShape.hxx +HEADERS += GEOM_InteractiveObject.hxx +HEADERS += Handle_GEOM_InteractiveObject.hxx +HEADERS += GEOM_AISTrihedron.hxx +HEADERS += GEOM_VTKTrihedron.hxx +HEADERS += GEOM_AISVector.hxx +HEADERS += GEOM_OBJECT_defs.hxx + +SOURCES = GEOM_Actor.cxx +SOURCES += GEOM_OCCReader.cxx +SOURCES += GEOM_AssemblyBuilder.cxx +SOURCES += GEOM_AISShape.cxx +SOURCES += GEOM_InteractiveObject.cxx +SOURCES += GEOM_AISTrihedron.cxx +SOURCES += GEOM_VTKTrihedron.cxx +SOURCES += GEOM_AISVector.cxx + +includes.files = $$HEADERS +includes.path = ../../include + +INSTALLS += includes diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 000000000..e74364864 --- /dev/null +++ b/src/src.pro @@ -0,0 +1,42 @@ +TEMPLATE = subdirs +CONFIG += ordered + +SUBDIRS = OBJECT +#SUBDIRS += ARCHIMEDE +#SUBDIRS += NMTDS +#SUBDIRS += NMTTools +#SUBDIRS += NMTAlgo +#SUBDIRS += GEOMAlgo +#SUBDIRS += SKETCHER +#SUBDIRS += GEOM +#SUBDIRS += BREPExport +#SUBDIRS += BREPImport +#SUBDIRS += IGESExport +#SUBDIRS += IGESImport +#SUBDIRS += STEPExport +#SUBDIRS += STEPImport +#SUBDIRS += STLExport +#SUBDIRS += ShHealOper +#SUBDIRS += GEOMImpl +#SUBDIRS += GEOM_I +#SUBDIRS += GEOMClient +#SUBDIRS += DlgRef +#SUBDIRS += GEOMFiltersSelection +#SUBDIRS += GEOMGUI +#SUBDIRS += GEOMBase +#SUBDIRS += GEOMToolsGUI +#SUBDIRS += DisplayGUI +#SUBDIRS += BasicGUI +#SUBDIRS += PrimitiveGUI +#SUBDIRS += GenerationGUI +#SUBDIRS += EntityGUI +#SUBDIRS += BuildGUI +#SUBDIRS += BooleanGUI +#SUBDIRS += TransformationGUI +#SUBDIRS += OperationGUI +#SUBDIRS += RepairGUI +#SUBDIRS += MeasureGUI +#SUBDIRS += GroupGUI +#SUBDIRS += BlocksGUI +#SUBDIRS += GEOM_I_Superv +#SUBDIRS += GEOM_SWIG