Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some changes for compatibility with OCCT 7.6.2 #983

Merged
merged 1 commit into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion TIGLViewer/src/TIGLViewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <Standard_TypeDef.hxx>
#include <Standard_Real.hxx>
#include <Quantity_NameOfColor.hxx>
#include <V3d_Coordinate.hxx>

#include "tigl_internal.h"

Expand Down
1 change: 0 additions & 1 deletion TIGLViewer/src/TIGLViewerInternal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions TIGLViewer/src/TIGLViewerWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -191,7 +191,7 @@ public slots:
Standard_Boolean myGridSnap;
AIS_StatusOfDetection myDetection;

V3d_Coordinate myV3dX,
Standard_Real myV3dX,
myV3dY,
myV3dZ;

Expand Down
10 changes: 5 additions & 5 deletions TIGLViewer/src/TIGLViewerWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)) );
Expand Down
6 changes: 3 additions & 3 deletions TIGLViewer/src/TIGLViewerWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/configuration/CCPACSConfiguration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading