Porting to Qt4.

diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx
index 4a3f6e0e9ab23d9af89a4499838e6d189a33bf2d..c59629575913bd59c19be2c8f355c41dc5a7b21e 100644 (file)
--- 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 <AIS_Drawer.hxx>
 #include <AIS_InteractiveContext.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
-#include <Prs3d_Drawer.hxx>
-#include <Prs3d_IsoAspect.hxx>
-#include <Prs3d_LineAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <SelectBasics_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -51,7 +46,6 @@
 #include <SelectMgr_Selection.hxx>
 #include <StdSelect_DisplayMode.hxx>
 #include <StdPrs_WFShape.hxx>
-#include <StdPrs_ShadedShape.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>

diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h
index ae4a08d10cc305632de122102d6d86eb724f8fc3..fe465835bebed06701669d76d1865ee49cb7deb4 100644 (file)
--- a/src/OBJECT/GEOM_Actor.h
+++ b/src/OBJECT/GEOM_Actor.h
@@ -38,7 +38,6 @@
 #include <TopoDS.hxx>
 
 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 cb1a8ba03cd8e09df2f6aadf63ac50fa1a1e6991..3ba95145b97c727aea62348ddc2581505023e141 100644 (file)
--- a/src/OBJECT/GEOM_AssemblyBuilder.cxx
+++ b/src/OBJECT/GEOM_AssemblyBuilder.cxx
@@ -35,8 +35,11 @@
 #include "GEOM_Actor.h"
 
 #include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
 
 #include <vtkProperty.h>
+#include <vtkAssembly.h>
+#include <vtkActorCollection.h>
 
 // Open CASCADE Includes
 #include <TopExp_Explorer.hxx>
@@ -50,6 +53,9 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopoDS_Iterator.hxx>
 
+// Qt includes
+#include <QColor>
+
 #include "utilities.h"
 
 using namespace std;

diff --git a/src/OBJECT/GEOM_AssemblyBuilder.h b/src/OBJECT/GEOM_AssemblyBuilder.h
index c74cc11d5d6d4b71ff86d5c2f942a436a8f48b83..08f372c146501d012a2744299cb7ecbdd00c3d3d 100644 (file)
--- a/src/OBJECT/GEOM_AssemblyBuilder.h
+++ b/src/OBJECT/GEOM_AssemblyBuilder.h
@@ -28,9 +28,9 @@
 
 #include "GEOM_OBJECT_defs.hxx"
 
-#include <vtkAssembly.h>
-#include <vtkPropAssembly.h>
-#include <vtkActorCollection.h>
+class vtkProperty;
+class vtkAssembly;
+class vtkActorCollection;
 
 // Open CASCADE Inlcudes
 #include <TopoDS.hxx>

diff --git a/src/OBJECT/GEOM_InteractiveObject.hxx b/src/OBJECT/GEOM_InteractiveObject.hxx
index cc405f407409494f335763a195a44159cf120c73..0e601609d03d752e615fdfc230b45bf816645be8 100644 (file)
--- 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 01400b67f43bca1890e1b3084fc0a39d7ddf9df5..76d398dd11fad4b5dba52d5c89713cc5542a6384 100644 (file)
--- a/src/OBJECT/GEOM_OCCReader.cxx
+++ b/src/OBJECT/GEOM_OCCReader.cxx
@@ -34,24 +34,14 @@
 
 #include <vtkObjectFactory.h>
 #include <vtkPolyData.h>
-#include <vtkPolyDataMapper.h>
-#include <vtkMergePoints.h>
-
-#include <vtkTransform.h>
-#include <vtkMatrix4x4.h>
 
 // OpenCASCADE Includes
-#include <BRepAdaptor_Surface.hxx>
 #include <TopExp_Explorer.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
 #include <Poly_Triangulation.hxx>
 #include <Poly_Polygon3D.hxx>
-#include <BRep_Tool.hxx>
+#include <Poly_PolygonOnTriangulation.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Wire.hxx>
-#include <BRepBndLib.hxx>
-#include <TopoDS.hxx>
 #include <TopAbs.hxx>
 #include <Precision.hxx>
 #include <BRepTools.hxx>
@@ -63,12 +53,7 @@
 #include <Geom2d_Line.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <HatchGen_Domain.hxx>
-#include <GeomAbs_IsoType.hxx>
-#include <Precision.hxx>
 #include <TopAbs_ShapeEnum.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Pnt2d.hxx>
 #include <TColStd_Array1OfInteger.hxx>

diff --git a/src/OBJECT/GEOM_OCCReader.h b/src/OBJECT/GEOM_OCCReader.h
index 5c0288a75c66191e3cebe72da96fef9930b4f235..1bf1ce70fcc9159bf47c604ca43d649fc704169b 100644 (file)
--- a/src/OBJECT/GEOM_OCCReader.h
+++ b/src/OBJECT/GEOM_OCCReader.h
@@ -44,8 +44,6 @@ class vtkCellArray;
 // OpenCASCADE
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
-#include <Poly_Polygon3D.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
 #include <GeomAbs_IsoType.hxx>
 #include <BRepAdaptor_Surface.hxx>
 

diff --git a/src/OBJECT/GEOM_VTKTrihedron.cxx b/src/OBJECT/GEOM_VTKTrihedron.cxx
index 847077d5588f35cb1d06481639603ec492885be5..7cfadbe8f759ea9f0765cfef149e5d2b05e1b6cf 100644 (file)
--- 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 <Geom_Axis2Placement.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Pnt.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Compound.hxx>
 
-#include <vtkMath.h>
 #include <vtkMapper.h>
-#include <vtkDataSet.h>
 #include <vtkRenderer.h>
-#include <vtkFollower.h>
-#include <vtkRenderWindow.h>
 #include <vtkObjectFactory.h>
-#include <vtkPolyData.h>
 #include <vtkActor.h>
+#include <vtkActorCollection.h>
 #include <vtkProperty.h>
 #include <vtkLineSource.h>
-#include <vtkConeSource.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkAppendPolyData.h>
 #include <vtkMatrix4x4.h>

diff --git a/src/OBJECT/GEOM_VTKTrihedron.hxx b/src/OBJECT/GEOM_VTKTrihedron.hxx
index 1d9e85347ac8daf975d388e566b4f4e31508cc01..fc244a0d70b56ceae5dfb1a9c291e47b52c96a60 100644 (file)
--- 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 3d3e0dacb5484b589674e330277b2b60c8d710b3..828e4e686198311a779a41ca7805324ec4d263e8 100644 (file)
--- 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 (file)
index 0000000..1a72b82
--- /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 (file)
index 0000000..e743648
--- /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