Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' branch into 'V9_dev' branch.
[modules/geom.git]
/
src
/
EntityGUI
/
EntityGUI.cxx
diff --git
a/src/EntityGUI/EntityGUI.cxx
b/src/EntityGUI/EntityGUI.cxx
index f8c6d5d0225d6fc908c1dfc00e9ea085b17928de..672298e41e524f65f61264a62443c327d36824ed 100644
(file)
--- a/
src/EntityGUI/EntityGUI.cxx
+++ b/
src/EntityGUI/EntityGUI.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-56,6
+56,7
@@
#include "EntityGUI_SketcherDlg.h" // Sketcher
#include "EntityGUI_3DSketcherDlg.h" // Sketcher
#include "EntityGUI_IsolineDlg.h" // Isoline
#include "EntityGUI_SketcherDlg.h" // Sketcher
#include "EntityGUI_3DSketcherDlg.h" // Sketcher
#include "EntityGUI_IsolineDlg.h" // Isoline
+#include "EntityGUI_SurfFromFaceDlg.h" // Surface From Face
#include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE
#include "EntityGUI_FeatureDetectorDlg.h" // Feature Detection
#include "EntityGUI_PictureImportDlg.h" // Import Picture in viewer
#include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE
#include "EntityGUI_FeatureDetectorDlg.h" // Feature Detection
#include "EntityGUI_PictureImportDlg.h" // Import Picture in viewer
@@
-107,6
+108,9
@@
bool EntityGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
case GEOMOp::OpIsoline: // ISOLINE
aDlg = new EntityGUI_IsolineDlg( getGeometryGUI(), parent );
break;
case GEOMOp::OpIsoline: // ISOLINE
aDlg = new EntityGUI_IsolineDlg( getGeometryGUI(), parent );
break;
+ case GEOMOp::OpSurfaceFromFace: // SURFACE FROM FACE
+ aDlg = new EntityGUI_SurfFromFaceDlg( getGeometryGUI(), parent );
+ break;
case GEOMOp::OpExplode: // EXPLODE
aDlg = new EntityGUI_SubShapeDlg( getGeometryGUI(), parent );
break;
case GEOMOp::OpExplode: // EXPLODE
aDlg = new EntityGUI_SubShapeDlg( getGeometryGUI(), parent );
break;
@@
-230,9
+234,9
@@
bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi
ic->InitSelected();
if ( pe->modifiers() == Qt::ShiftModifier )
ic->InitSelected();
if ( pe->modifiers() == Qt::ShiftModifier )
- ic->ShiftSelect(); // Append selection
+ ic->ShiftSelect(
Standard_True
); // Append selection
else
else
- ic->Select(); // New selection
+ ic->Select(
Standard_True
); // New selection
ic->InitSelected();
if ( ic->MoreSelected() ) {
ic->InitSelected();
if ( ic->MoreSelected() ) {
@@
-259,7
+263,7
@@
bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi
Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext();
ic->InitSelected();
Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext();
ic->InitSelected();
- ic->Select(); // New selection
+ ic->Select(
Standard_True
); // New selection
ic->InitSelected();
TopoDS_Shape aShape;
ic->InitSelected();
TopoDS_Shape aShape;
@@
-293,8
+297,8
@@
bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi
bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow )
{
((OCCViewer_ViewWindow*)theViewWindow)->setSketcherStyle(false);
bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow )
{
((OCCViewer_ViewWindow*)theViewWindow)->setSketcherStyle(false);
- QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
#ifdef WITH_OPENCV
#ifdef WITH_OPENCV
+ QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
if ( aDlg && ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_FeatureDetectorDlg" ) == 0 ) &&
theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() &&
pe->modifiers() != Qt::ControlModifier )
if ( aDlg && ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_FeatureDetectorDlg" ) == 0 ) &&
theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() &&
pe->modifiers() != Qt::ControlModifier )
@@
-361,7
+365,7
@@
void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha
if ( !S1.IsNull() ) {
/* erase any previous */
ic->Erase( mySimulationShape1, Standard_True );
if ( !S1.IsNull() ) {
/* erase any previous */
ic->Erase( mySimulationShape1, Standard_True );
- ic->ClearPrs( mySimulationShape1 );
+ ic->ClearPrs( mySimulationShape1
, 0, Standard_True
);
mySimulationShape1 = new AIS_Shape( TopoDS_Shape() );
mySimulationShape1->Set( S1 );
mySimulationShape1 = new AIS_Shape( TopoDS_Shape() );
mySimulationShape1->Set( S1 );
@@
-373,7
+377,7
@@
void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha
}
if ( !S2.IsNull() ) {
ic->Erase( mySimulationShape2, Standard_True );
}
if ( !S2.IsNull() ) {
ic->Erase( mySimulationShape2, Standard_True );
- ic->ClearPrs( mySimulationShape2 );
+ ic->ClearPrs( mySimulationShape2
, 0, Standard_True
);
mySimulationShape2 = new AIS_Shape( TopoDS_Shape() );
mySimulationShape2->Set( S2 );
mySimulationShape2 = new AIS_Shape( TopoDS_Shape() );
mySimulationShape2->Set( S2 );
@@
-386,7
+390,7
@@
void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha
ic->UpdateCurrentViewer();
}
catch( Standard_Failure ) {
ic->UpdateCurrentViewer();
}
catch( Standard_Failure ) {
- MESSAGE( "Exception ca
tched
in EntityGUI::DisplaySimulationShape" );
+ MESSAGE( "Exception ca
ught
in EntityGUI::DisplaySimulationShape" );
}
}
}
}
@@
-418,8
+422,8
@@
void EntityGUI::EraseSimulationShape()
Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
ic->Erase( mySimulationShape1, Standard_True );
ic->Erase( mySimulationShape2, Standard_True );
Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
ic->Erase( mySimulationShape1, Standard_True );
ic->Erase( mySimulationShape2, Standard_True );
- ic->ClearPrs( mySimulationShape1 );
- ic->ClearPrs( mySimulationShape2 );
+ ic->ClearPrs( mySimulationShape1
, 0, Standard_True
);
+ ic->ClearPrs( mySimulationShape2
, 0, Standard_True
);
ic->UpdateCurrentViewer();
}
}
ic->UpdateCurrentViewer();
}
}