Merge pull request #983 from DLR-SC/occt_761-joergbrech

some changes for compatibility with OCCT 7.6.2
DLR-SC · Dec 14, 2023 · cd087d8 · cd087d8
2 parents 03bc3bf + d73616e
commit cd087d8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/TIGLViewer/src/TIGLViewer.h b/TIGLViewer/src/TIGLViewer.h
@@ -32,7 +32,6 @@
 #include <Standard_TypeDef.hxx>
 #include <Standard_Real.hxx>
 #include <Quantity_NameOfColor.hxx>
-#include <V3d_Coordinate.hxx>
 
 #include "tigl_internal.h"
 

diff --git a/TIGLViewer/src/TIGLViewerInternal.h b/TIGLViewer/src/TIGLViewerInternal.h
@@ -83,7 +83,6 @@
 
 #include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_NameOfMaterial.hxx>
-#include <MMgt_TShared.hxx>
 #include <OSD_Environment.hxx>
 #include <Precision.hxx>
 #include <Prs3d_IsoAspect.hxx>

diff --git a/TIGLViewer/src/TIGLViewerWidget.h b/TIGLViewer/src/TIGLViewerWidget.h
@@ -109,8 +109,8 @@ class TIGLViewerWidget : public QWidget
 
     void initialized();
     void selectionChanged();
-    void mouseMoved   ( V3d_Coordinate X, V3d_Coordinate Y, V3d_Coordinate Z );
-    void pointClicked ( V3d_Coordinate X, V3d_Coordinate Y, V3d_Coordinate Z );
+    void mouseMoved   ( Standard_Real X, Standard_Real Y, Standard_Real Z );
+    void pointClicked ( Standard_Real X, Standard_Real Y, Standard_Real Z );
     void sendStatus   ( QString aMessage );
 
     void error ( int errorCode, QString& errorDescription );
@@ -191,7 +191,7 @@ public slots:
     Standard_Boolean                myGridSnap;
     AIS_StatusOfDetection           myDetection;
 
-    V3d_Coordinate                  myV3dX,
+    Standard_Real                  myV3dX,
                                     myV3dY,
                                     myV3dZ;
 

diff --git a/TIGLViewer/src/TIGLViewerWindow.cpp b/TIGLViewer/src/TIGLViewerWindow.cpp
@@ -544,9 +544,9 @@ void TIGLViewerWindow::aboutQt()
 }
 
 
-void TIGLViewerWindow::xyzPosition (V3d_Coordinate X,
-                                    V3d_Coordinate Y,
-                                    V3d_Coordinate Z)
+void TIGLViewerWindow::xyzPosition (Standard_Real X,
+                                    Standard_Real Y,
+                                    Standard_Real Z)
 {
     QString aString;
     QTextStream ts(&aString);
@@ -731,8 +731,8 @@ void TIGLViewerWindow::connectSignals()
     connect(openTimer, SIGNAL(timeout()), this, SLOT(reopenFile()));
 
     // The co-ordinates from the view
-    connect( myOCC, SIGNAL(mouseMoved(V3d_Coordinate,V3d_Coordinate,V3d_Coordinate)),
-             this,   SLOT(xyzPosition(V3d_Coordinate,V3d_Coordinate,V3d_Coordinate)) );
+    connect( myOCC, SIGNAL(mouseMoved(Standard_Real,Standard_Real,Standard_Real)),
+             this,   SLOT(xyzPosition(Standard_Real,Standard_Real,Standard_Real)) );
 
 
     connect( myOCC, SIGNAL(sendStatus(const QString)), this,  SLOT  (statusMessage(const QString)) );

diff --git a/TIGLViewer/src/TIGLViewerWindow.h b/TIGLViewer/src/TIGLViewerWindow.h
@@ -94,9 +94,9 @@ private slots:
     void setBackgroundImage();
     void about();
     void aboutQt();
-    void xyzPosition (V3d_Coordinate X,
-                      V3d_Coordinate Y,
-                      V3d_Coordinate Z);
+    void xyzPosition (Standard_Real X,
+                      Standard_Real Y,
+                      Standard_Real Z);
     void statusMessage (const QString& aMessage);
     void loadSettings();
     void saveSettings();

diff --git a/src/configuration/CCPACSConfiguration.cpp b/src/configuration/CCPACSConfiguration.cpp
@@ -29,7 +29,6 @@
 #include "Standard_CString.hxx"
 #include "BRepOffsetAPI_ThruSections.hxx"
 #include "BRepAlgoAPI_Fuse.hxx"
-#include "BRepAlgo_Fuse.hxx"
 #include "ShapeFix_Shape.hxx"
 #include "TopoDS_Compound.hxx"
 #include "BRepFeat_Gluer.hxx"