ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-28 01:25:37 +05:00
Code Issues Packages Projects Releases Wiki Activity

Improve actions management

Browse Source 
Remove deprecated code
This commit is contained in:
vsr 2010-02-28 19:53:08 +00:00
parent e058a99023
commit b757df10d5
13 changed files with 929 additions and 922 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/BasicGUI/BasicGUI.cxx
View File

@ -33,10 +33,10 @@
#include "BasicGUI_CurveDlg.h" // Method CURVE #include "BasicGUI_CurveDlg.h" // Method CURVE
#include "BasicGUI_VectorDlg.h" // Method VECTOR #include "BasicGUI_VectorDlg.h" // Method VECTOR
#include "BasicGUI_PlaneDlg.h" // Method PLANE #include "BasicGUI_PlaneDlg.h" // Method PLANE
#include "BasicGUI_WorkingPlaneDlg.h" // Method WORKING PLANE #include "BasicGUI_MarkerDlg.h" // Method LOCAL COORDINATE SYSTEM
#include "BasicGUI_MarkerDlg.h" // Method REPAIR
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
@ -81,34 +81,31 @@ bool BasicGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
QDialog* aDlg = NULL; QDialog* aDlg = NULL;
switch ( theCommandID ) { switch ( theCommandID ) {
case 4011: // POINT case GEOMOp::OpPoint: // POINT
aDlg = new BasicGUI_PointDlg( getGeometryGUI(), parent ); aDlg = new BasicGUI_PointDlg( getGeometryGUI(), parent );
break; break;
case 4012: // LINE case GEOMOp::OpLine: // LINE
aDlg = new BasicGUI_LineDlg( getGeometryGUI(), parent ); aDlg = new BasicGUI_LineDlg( getGeometryGUI(), parent );
break; break;
case 4013: // CIRCLE case GEOMOp::OpCircle: // CIRCLE
aDlg = new BasicGUI_CircleDlg( getGeometryGUI(), parent ); aDlg = new BasicGUI_CircleDlg( getGeometryGUI(), parent );
break; break;
case 4014: // ELLIPSE case GEOMOp::OpEllipse: // ELLIPSE
aDlg = new BasicGUI_EllipseDlg( getGeometryGUI(), parent ); aDlg = new BasicGUI_EllipseDlg( getGeometryGUI(), parent );
break; break;
case 4015: // ARC case GEOMOp::OpArc: // ARC
aDlg = new BasicGUI_ArcDlg( getGeometryGUI(), parent ); aDlg = new BasicGUI_ArcDlg( getGeometryGUI(), parent );
break ; break ;
case 4016: // VECTOR case GEOMOp::OpVector: // VECTOR
aDlg = new BasicGUI_VectorDlg( getGeometryGUI(), parent ); aDlg = new BasicGUI_VectorDlg( getGeometryGUI(), parent );
break; break;
case 4017: // PLANE case GEOMOp::OpPlane: // PLANE
aDlg = new BasicGUI_PlaneDlg( getGeometryGUI(), parent ); aDlg = new BasicGUI_PlaneDlg( getGeometryGUI(), parent );
break; break;
/* case 4018: // WORKING PLANE case GEOMOp::OpCurve: // CURVE
aDlg = new BasicGUI_WorkingPlaneDlg( getGeometryGUI(), parent );
break;*/ // DEPRECATED!
case 4019: // CURVE
aDlg = new BasicGUI_CurveDlg( getGeometryGUI(), parent ); aDlg = new BasicGUI_CurveDlg( getGeometryGUI(), parent );
break; break;
case 4020: // REPAIR case GEOMOp::OpLCS: // LOCAL COORDINATE SYSTEM
aDlg = new BasicGUI_MarkerDlg( getGeometryGUI(), parent ); aDlg = new BasicGUI_MarkerDlg( getGeometryGUI(), parent );
break; break;
default: default:

14
src/BasicGUI/Makefile.am
View File

@ -38,8 +38,10 @@ salomeinclude_HEADERS = \
BasicGUI_MarkerDlg.h \ BasicGUI_MarkerDlg.h \
BasicGUI_PlaneDlg.h \ BasicGUI_PlaneDlg.h \
BasicGUI_PointDlg.h \ BasicGUI_PointDlg.h \
BasicGUI_VectorDlg.h \ BasicGUI_VectorDlg.h
BasicGUI_WorkingPlaneDlg.h #
# OBSOLETE: BasicGUI_WorkingPlaneDlg.h
#
# Libraries targets # Libraries targets
@ -55,9 +57,11 @@ dist_libBasicGUI_la_SOURCES = \
BasicGUI_ArcDlg.cxx \ BasicGUI_ArcDlg.cxx \
BasicGUI_VectorDlg.cxx \ BasicGUI_VectorDlg.cxx \
BasicGUI_PlaneDlg.cxx \ BasicGUI_PlaneDlg.cxx \
BasicGUI_WorkingPlaneDlg.cxx \
BasicGUI_CurveDlg.cxx \ BasicGUI_CurveDlg.cxx \
BasicGUI_MarkerDlg.cxx BasicGUI_MarkerDlg.cxx
#
# OBSOLETE: BasicGUI_WorkingPlaneDlg.cxx
#
MOC_FILES = \ MOC_FILES = \
BasicGUI_PointDlg_moc.cxx \ BasicGUI_PointDlg_moc.cxx \
@ -67,9 +71,11 @@ MOC_FILES = \
BasicGUI_ArcDlg_moc.cxx \ BasicGUI_ArcDlg_moc.cxx \
BasicGUI_VectorDlg_moc.cxx \ BasicGUI_VectorDlg_moc.cxx \
BasicGUI_PlaneDlg_moc.cxx \ BasicGUI_PlaneDlg_moc.cxx \
BasicGUI_WorkingPlaneDlg_moc.cxx \
BasicGUI_CurveDlg_moc.cxx \ BasicGUI_CurveDlg_moc.cxx \
BasicGUI_MarkerDlg_moc.cxx BasicGUI_MarkerDlg_moc.cxx
#
# OBSOLETE: BasicGUI_WorkingPlaneDlg_moc.cxx
#
nodist_libBasicGUI_la_SOURCES = \ nodist_libBasicGUI_la_SOURCES = \
$(MOC_FILES) $(MOC_FILES)

11
src/BlocksGUI/BlocksGUI.cxx
View File

@ -32,6 +32,7 @@
#include "BlocksGUI_PropagateDlg.h" #include "BlocksGUI_PropagateDlg.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
@ -66,11 +67,11 @@ bool BlocksGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
QDialog* aDlg = 0; QDialog* aDlg = 0;
switch ( theCommandID ) { switch ( theCommandID ) {
case 9999: aDlg = new BlocksGUI_BlockDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpHexaSolid: aDlg = new BlocksGUI_BlockDlg ( getGeometryGUI(), parent ); break;
case 9998: aDlg = new BlocksGUI_TrsfDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpMultiTransform: aDlg = new BlocksGUI_TrsfDlg ( getGeometryGUI(), parent ); break;
case 9997: aDlg = new BlocksGUI_QuadFaceDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpQuadFace: aDlg = new BlocksGUI_QuadFaceDlg ( getGeometryGUI(), parent ); break;
case 9995: aDlg = new BlocksGUI_ExplodeDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpExplodeBlock: aDlg = new BlocksGUI_ExplodeDlg ( getGeometryGUI(), parent ); break;
case 99991: aDlg = new BlocksGUI_PropagateDlg( getGeometryGUI(), parent ); break; case GEOMOp::OpPropagate: aDlg = new BlocksGUI_PropagateDlg( getGeometryGUI(), parent ); break;
default: default:
getGeometryGUI()->getApp()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); getGeometryGUI()->getApp()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
break; break;

23
src/BooleanGUI/BooleanGUI.cxx
View File

@ -27,6 +27,7 @@
#include "BooleanGUI_Dialog.h" #include "BooleanGUI_Dialog.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
//======================================================================= //=======================================================================
@ -56,17 +57,19 @@ bool BooleanGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
getGeometryGUI()->EmitSignalDeactivateDialog(); getGeometryGUI()->EmitSignalDeactivateDialog();
int anOperation = 0; int anOperation = 0;
if ( theCommandID == 5011 ) switch ( theCommandID ) {
anOperation = FUSE; case GEOMOp::OpFuse:
else if ( theCommandID == 5012 ) anOperation = FUSE; break;
anOperation = COMMON; case GEOMOp::OpCommon:
else if ( theCommandID == 5013 ) anOperation = COMMON; break;
anOperation = CUT; case GEOMOp::OpCut:
else if ( theCommandID == 5014 ) anOperation = CUT; break;
anOperation = SECTION; case GEOMOp::OpSection:
else anOperation = SECTION; break;
default:
return false; return false;
}
QDialog* aDlg = new BooleanGUI_Dialog( anOperation, getGeometryGUI(), parent ); QDialog* aDlg = new BooleanGUI_Dialog( anOperation, getGeometryGUI(), parent );
aDlg->show(); aDlg->show();

13
src/BuildGUI/BuildGUI.cxx
View File

@ -36,6 +36,7 @@
#include "BuildGUI_CompoundDlg.h" // Method COMPOUND #include "BuildGUI_CompoundDlg.h" // Method COMPOUND
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
//======================================================================= //=======================================================================
// function : BuildGUI() // function : BuildGUI()
@ -66,12 +67,12 @@ bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
QDialog* aDlg = 0; QDialog* aDlg = 0;
switch ( theCommandID ) { switch ( theCommandID ) {
case 4081: aDlg = new BuildGUI_EdgeDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpEdge: aDlg = new BuildGUI_EdgeDlg ( getGeometryGUI(), parent ); break;
case 4082: aDlg = new BuildGUI_WireDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpWire: aDlg = new BuildGUI_WireDlg ( getGeometryGUI(), parent ); break;
case 4083: aDlg = new BuildGUI_FaceDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpFace: aDlg = new BuildGUI_FaceDlg ( getGeometryGUI(), parent ); break;
case 4084: aDlg = new BuildGUI_ShellDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpShell: aDlg = new BuildGUI_ShellDlg ( getGeometryGUI(), parent ); break;
case 4085: aDlg = new BuildGUI_SolidDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpSolid: aDlg = new BuildGUI_SolidDlg ( getGeometryGUI(), parent ); break;
case 4086: aDlg = new BuildGUI_CompoundDlg( getGeometryGUI(), parent ); break; case GEOMOp::OpCompound: aDlg = new BuildGUI_CompoundDlg( getGeometryGUI(), parent ); break;
default: default:
getGeometryGUI()->getApp()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); getGeometryGUI()->getApp()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
break; break;

109
src/DisplayGUI/DisplayGUI.cxx
View File

@ -25,6 +25,7 @@
// //
#include "DisplayGUI.h" #include "DisplayGUI.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <GEOM_Displayer.h> #include <GEOM_Displayer.h>
#include <GEOM_AISShape.hxx> #include <GEOM_AISShape.hxx>
#include <GEOM_Actor.h> #include <GEOM_Actor.h>
@ -89,73 +90,49 @@ bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
SALOME_ListIO selected; SALOME_ListIO selected;
Sel->selectedObjects( selected ); Sel->selectedObjects( selected );
switch (theCommandID) { switch ( theCommandID ) {
case 211: // MENU VIEW - WIREFRAME/SHADING case GEOMOp::OpDisplayMode: // MENU VIEW - DISPLAY MODE - WIREFRAME/SHADING
{ InvertDisplayMode();
InvertDisplayMode(); getGeometryGUI()->action( GEOMOp::OpDisplayMode )->setText
int newMode = GetDisplayMode(); ( GetDisplayMode() == 1 ? tr( "GEOM_MEN_WIREFRAME" ) : tr("GEOM_MEN_SHADING") );
getGeometryGUI()->action( 211 )->setText getGeometryGUI()->menuMgr()->update();
( newMode == 1 ? tr( "GEOM_MEN_WIREFRAME" ) : tr("GEOM_MEN_SHADING") ); break;
getGeometryGUI()->menuMgr()->update(); case GEOMOp::OpShowAll: // MENU VIEW - SHOW ALL
break; getGeometryGUI()->EmitSignalDeactivateDialog();
} DisplayAll();
case 212: // MENU VIEW - DISPLAY ALL break;
{ case GEOMOp::OpShowOnly: // POPUP MENU - SHOW ONLY
getGeometryGUI()->EmitSignalDeactivateDialog(); getGeometryGUI()->EmitSignalDeactivateDialog();
DisplayAll(); DisplayOnly();
break; break;
} case GEOMOp::OpHideAll: // MENU VIEW - HIDE ALL
case 213: // MENU VIEW - DISPLAY ONLY EraseAll();
{ break;
getGeometryGUI()->EmitSignalDeactivateDialog(); case GEOMOp::OpHide: // POPUP MENU - HIDE
DisplayOnly(); Erase();
break; break;
} case GEOMOp::OpShow: // POPUP MENU - SHOW
case 214: // MENU VIEW - ERASE ALL getGeometryGUI()->EmitSignalDeactivateDialog();
{ Display();
EraseAll(); break;
break; case GEOMOp::OpSwitchVectors: // MENU VIEW - DISPLAY MODE - SHOW EDGE DIRECTION
} SetVectorMode(!GetVectorMode());
case 215: // MENU VIEW - ERASE getGeometryGUI()->action( GEOMOp::OpSwitchVectors )->setText
{ ( GetVectorMode() ? tr("MEN_VECTOR_MODE_ON") : tr( "MEN_VECTOR_MODE_OFF" ) );
Erase(); getGeometryGUI()->menuMgr()->update();
break; break;
} case GEOMOp::OpWireframe: // POPUP MENU - DISPLAY MODE - WIREFRAME
case 216: // MENU VIEW - DISPLAY ChangeDisplayMode( 0 );
{ break;
getGeometryGUI()->EmitSignalDeactivateDialog(); case GEOMOp::OpShading: // POPUP MENU - DISPLAY MODE - SHADING
Display(); ChangeDisplayMode( 1 );
break; break;
} case GEOMOp::OpVectors: // POPUP MENU - DISPLAY MODE - SHOW EDGE DIRECTION
case 218: // MENU VIEW - VECTORS MODE ChangeDisplayMode( 2 );
{ break;
bool mode = GetVectorMode();
SetVectorMode(!mode);
getGeometryGUI()->action( 218 )->setText
( mode == false ? tr( "MEN_VECTOR_MODE_OFF" ) : tr("MEN_VECTOR_MODE_ON") );
getGeometryGUI()->menuMgr()->update();
break;
}
case 80311: // POPUP VIEWER - WIREFRAME
{
ChangeDisplayMode( 0 );
break;
}
case 80312: // POPUP VIEWER - SHADING
{
ChangeDisplayMode( 1 );
break;
}
case 80313: // POPUP VIEWER - VECTORS
{
ChangeDisplayMode( 2 );
break;
}
default: default:
{ app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); break;
break;
}
} }
Sel->setSelectedObjects( selected ); Sel->setSelectedObjects( selected );
return true; return true;

7
src/EntityGUI/EntityGUI.cxx
View File

@ -26,6 +26,7 @@
#include "EntityGUI.h" #include "EntityGUI.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SUIT_ViewWindow.h> #include <SUIT_ViewWindow.h>
@ -72,14 +73,14 @@ bool EntityGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
QDialog* aDlg = NULL; QDialog* aDlg = NULL;
switch ( theCommandID ) { switch ( theCommandID ) {
case 404: // SKETCHER case GEOMOp::Op2dSketcher: // 2D SKETCHER
getGeometryGUI()->ActiveWorkingPlane(); getGeometryGUI()->ActiveWorkingPlane();
aDlg = new EntityGUI_SketcherDlg( getGeometryGUI(), parent ); aDlg = new EntityGUI_SketcherDlg( getGeometryGUI(), parent );
break; break;
case 405: // 3D SKETCHER case GEOMOp::Op3dSketcher: // 3D SKETCHER
aDlg = new EntityGUI_3DSketcherDlg( getGeometryGUI(), parent ); aDlg = new EntityGUI_3DSketcherDlg( getGeometryGUI(), parent );
break; break;
case 407: // EXPLODE : use ic case GEOMOp::OpExplode: // EXPLODE
aDlg = new EntityGUI_SubShapeDlg( getGeometryGUI(), parent ); aDlg = new EntityGUI_SubShapeDlg( getGeometryGUI(), parent );
break; break;
default: default:

4
src/GEOMGUI/GEOM_images.ts
View File

@ -817,6 +817,10 @@
<source>ICO_FACE</source> <source>ICO_FACE</source>
<translation>build_face.png</translation> <translation>build_face.png</translation>
</message> </message>
<message>
<source>ICO_RECTANGLE</source>
<translation>build_face.png</translation>
</message>
<message> <message>
<source>ICO_FACE_SEL_ONLY</source> <source>ICO_FACE_SEL_ONLY</source>
<translation>build_face.png</translation> <translation>build_face.png</translation>

112
src/GEOMGUI/GEOM_msg_en.ts
View File

@ -497,7 +497,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>GEOM_DISK_TITLE</source> <source>GEOM_DISK_TITLE</source>
<translation>Create A Disk</translation> <translation>Disk Construction</translation>
</message> </message>
<message> <message>
<source>GEOM_DIMENSIONS</source> <source>GEOM_DIMENSIONS</source>
@ -628,7 +628,11 @@ Please, select face, shell or solid and try again</translation>
<translation>Create A Face</translation> <translation>Create A Face</translation>
</message> </message>
<message> <message>
<source>GEOM_FILLET</source> <source>GEOM_RECTANGLE_TITLE</source>
<translation>Face Construction</translation>
</message>
<message>
<source>GEOM_FILLET</source>
<translation>Fillet</translation> <translation>Fillet</translation>
</message> </message>
<message> <message>
@ -1585,7 +1589,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>GEOM_SKETCHER_TITLE</source> <source>GEOM_SKETCHER_TITLE</source>
<translation>Sketch Construction</translation> <translation>2D Sketch Construction</translation>
</message> </message>
<message> <message>
<source>GEOM_3DSKETCHER_TITLE</source> <source>GEOM_3DSKETCHER_TITLE</source>
@ -2143,6 +2147,10 @@ Please, select face, shell or solid and try again</translation>
<source>MEN_CYLINDER</source> <source>MEN_CYLINDER</source>
<translation>Cylinder</translation> <translation>Cylinder</translation>
</message> </message>
<message>
<source>MEN_RECTANGLE</source>
<translation>Face</translation>
</message>
<message> <message>
<source>MEN_DELETE</source> <source>MEN_DELETE</source>
<translation>Delete</translation> <translation>Delete</translation>
@ -2225,7 +2233,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>MEN_FILLET</source> <source>MEN_FILLET</source>
<translation>Fillet</translation> <translation>Fillet 3D</translation>
</message> </message>
<message> <message>
<source>MEN_FILLET_1D</source> <source>MEN_FILLET_1D</source>
@ -2309,7 +2317,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>MEN_MODIFY_LOCATION</source> <source>MEN_MODIFY_LOCATION</source>
<translation>Modify the Location</translation> <translation>Modify Location</translation>
</message> </message>
<message> <message>
<source>MEN_MUL_ROTATION</source> <source>MEN_MUL_ROTATION</source>
@ -2341,7 +2349,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>MEN_PIPE</source> <source>MEN_PIPE</source>
<translation>Extrusion Along a Path</translation> <translation>Extrusion Along Path</translation>
</message> </message>
<message> <message>
<source>MEN_PLANE</source> <source>MEN_PLANE</source>
@ -2473,7 +2481,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>MEN_SKETCH</source> <source>MEN_SKETCH</source>
<translation>Sketch</translation> <translation>2D Sketch</translation>
</message> </message>
<message> <message>
<source>MEN_3DSKETCH</source> <source>MEN_3DSKETCH</source>
@ -2665,7 +2673,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>STB_ARCHIMEDE</source> <source>STB_ARCHIMEDE</source>
<translation>Archimede</translation> <translation>Archimede operation</translation>
</message> </message>
<message> <message>
<source>STB_BASIC_PROPS</source> <source>STB_BASIC_PROPS</source>
@ -2681,7 +2689,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>STB_CHAMFER</source> <source>STB_CHAMFER</source>
<translation>Chamfer</translation> <translation>Create a chamfer</translation>
</message> </message>
<message> <message>
<source>STB_CHANGE_ORIENTATION</source> <source>STB_CHANGE_ORIENTATION</source>
@ -2747,6 +2755,10 @@ Please, select face, shell or solid and try again</translation>
<source>STB_CYLINDER</source> <source>STB_CYLINDER</source>
<translation>Create a cylinder</translation> <translation>Create a cylinder</translation>
</message> </message>
<message>
<source>STB_RECTANGLE</source>
<translation>Create rectangular face</translation>
</message>
<message> <message>
<source>STB_DELETE</source> <source>STB_DELETE</source>
<translation>Delete object</translation> <translation>Delete object</translation>
@ -2813,7 +2825,15 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>STB_FILLET</source> <source>STB_FILLET</source>
<translation>Fillet</translation> <translation>Create 3D fillet</translation>
</message>
<message>
<source>STB_FILLET_1D</source>
<translation>Create 1D fillet</translation>
</message>
<message>
<source>STB_FILLET_2D</source>
<translation>Create 2D fillet</translation>
</message> </message>
<message> <message>
<source>STB_FILLING</source> <source>STB_FILLING</source>
@ -2873,23 +2893,23 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>STB_MIRROR</source> <source>STB_MIRROR</source>
<translation>Mirror image</translation> <translation>Mirror a shape</translation>
</message> </message>
<message> <message>
<source>STB_MODIFY_LOCATION</source> <source>STB_MODIFY_LOCATION</source>
<translation>Modify the Location</translation> <translation>Modify shape's location</translation>
</message> </message>
<message> <message>
<source>STB_MUL_ROTATION</source> <source>STB_MUL_ROTATION</source>
<translation>Multi-Rotation</translation> <translation>Perform multi-rotation</translation>
</message> </message>
<message> <message>
<source>STB_MUL_TRANSFORM</source> <source>STB_MUL_TRANSFORM</source>
<translation>Multi-transformation</translation> <translation>Perform multi-transformation</translation>
</message> </message>
<message> <message>
<source>STB_MUL_TRANSLATION</source> <source>STB_MUL_TRANSLATION</source>
<translation>Multi-Translation</translation> <translation>Perform multi-translation</translation>
</message> </message>
<message> <message>
<source>STB_OFFSET</source> <source>STB_OFFSET</source>
@ -2897,11 +2917,11 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>STB_PARTITION</source> <source>STB_PARTITION</source>
<translation>Partition</translation> <translation>Make a partition</translation>
</message> </message>
<message> <message>
<source>STB_PIPE</source> <source>STB_PIPE</source>
<translation>Create a shape by Extrusion along a path</translation> <translation>Create a shape by extrusion along a path</translation>
</message> </message>
<message> <message>
<source>STB_PLANE</source> <source>STB_PLANE</source>
@ -2973,11 +2993,11 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>STB_ROTATION</source> <source>STB_ROTATION</source>
<translation>Rotation</translation> <translation>Rotate a shape</translation>
</message> </message>
<message> <message>
<source>STB_SCALE</source> <source>STB_SCALE</source>
<translation>Scale transform</translation> <translation>Scale a shape</translation>
</message> </message>
<message> <message>
<source>STB_SECTION</source> <source>STB_SECTION</source>
@ -3013,7 +3033,11 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>STB_SKETCH</source> <source>STB_SKETCH</source>
<translation>Sketch</translation> <translation>Create 2D sketch</translation>
</message>
<message>
<source>STB_3DSKETCH</source>
<translation>Create 3D sketch</translation>
</message> </message>
<message> <message>
<source>STB_SOLID</source> <source>STB_SOLID</source>
@ -3053,7 +3077,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>STB_TRANSLATION</source> <source>STB_TRANSLATION</source>
<translation>Translation</translation> <translation>Translate shape</translation>
</message> </message>
<message> <message>
<source>STB_VECTOR</source> <source>STB_VECTOR</source>
@ -3163,6 +3187,14 @@ Please, select face, shell or solid and try again</translation>
<source>TOOL_TRANSFORMATION</source> <source>TOOL_TRANSFORMATION</source>
<translation>Transformation</translation> <translation>Transformation</translation>
</message> </message>
<message>
<source>TOOL_BUILD</source>
<translation>Build</translation>
</message>
<message>
<source>TOOL_OPERATIONS</source>
<translation>Operations</translation>
</message>
<message> <message>
<source>TOP_ARC</source> <source>TOP_ARC</source>
<translation>Create an arc</translation> <translation>Create an arc</translation>
@ -3229,7 +3261,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>TOP_COMPOUND</source> <source>TOP_COMPOUND</source>
<translation>Build a compound</translation> <translation>Build compound</translation>
</message> </message>
<message> <message>
<source>TOP_CONE</source> <source>TOP_CONE</source>
@ -3251,9 +3283,13 @@ Please, select face, shell or solid and try again</translation>
<source>TOP_DELETE</source> <source>TOP_DELETE</source>
<translation>Delete object</translation> <translation>Delete object</translation>
</message> </message>
<message>
<source>TOP_RECTANGLE</source>
<translation>Create rectangular face</translation>
</message>
<message> <message>
<source>TOP_DISK</source> <source>TOP_DISK</source>
<translation>Build a Disk</translation> <translation>Create a disk</translation>
</message> </message>
<message> <message>
<source>TOP_DISPLAY</source> <source>TOP_DISPLAY</source>
@ -3269,7 +3305,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>TOP_EDGE</source> <source>TOP_EDGE</source>
<translation>Build an edge</translation> <translation>Build edge</translation>
</message> </message>
<message> <message>
<source>TOP_ELLIPSE</source> <source>TOP_ELLIPSE</source>
@ -3301,11 +3337,19 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>TOP_FACE</source> <source>TOP_FACE</source>
<translation>Build a face</translation> <translation>Build face</translation>
</message> </message>
<message> <message>
<source>TOP_FILLET</source> <source>TOP_FILLET</source>
<translation>Fillet</translation> <translation>Fillet 3D</translation>
</message>
<message>
<source>TOP_FILLET_1D</source>
<translation>Fillet 1D</translation>
</message>
<message>
<source>TOP_FILLET_2D</source>
<translation>Fillet 2D</translation>
</message> </message>
<message> <message>
<source>TOP_FILLING</source> <source>TOP_FILLING</source>
@ -3365,7 +3409,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>TOP_MODIFY_LOCATION</source> <source>TOP_MODIFY_LOCATION</source>
<translation>Modify the Location</translation> <translation>Modify location</translation>
</message> </message>
<message> <message>
<source>TOP_MUL_ROTATION</source> <source>TOP_MUL_ROTATION</source>
@ -3389,7 +3433,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>TOP_PIPE</source> <source>TOP_PIPE</source>
<translation>Extrusion along a path</translation> <translation>Extrusion along path</translation>
</message> </message>
<message> <message>
<source>TOP_PLANE</source> <source>TOP_PLANE</source>
@ -3489,15 +3533,19 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>TOP_SHELL</source> <source>TOP_SHELL</source>
<translation>Build a shell</translation> <translation>Build shell</translation>
</message> </message>
<message> <message>
<source>TOP_SKETCH</source> <source>TOP_SKETCH</source>
<translation>Sketch</translation> <translation>2D sketch</translation>
</message>
<message>
<source>TOP_3DSKETCH</source>
<translation>3D sketch</translation>
</message> </message>
<message> <message>
<source>TOP_SOLID</source> <source>TOP_SOLID</source>
<translation>Build a solid</translation> <translation>Build solid</translation>
</message> </message>
<message> <message>
<source>TOP_SPHERE</source> <source>TOP_SPHERE</source>
@ -3541,7 +3589,7 @@ Please, select face, shell or solid and try again</translation>
</message> </message>
<message> <message>
<source>TOP_WIRE</source> <source>TOP_WIRE</source>
<translation>Build a wire</translation> <translation>Build wire</translation>
</message> </message>
<message> <message>
<source>TOP_WORK_PLANE</source> <source>TOP_WORK_PLANE</source>

1347
src/GEOMGUI/GeometryGUI.cxx
View File

File diff suppressed because it is too large Load Diff

23
src/GEOMGUI/GeometryGUI.h
View File

@ -50,8 +50,6 @@
// minimum allowed value for deflection coefficient // minimum allowed value for deflection coefficient
#define DEFLECTION_MIN 1e-06 #define DEFLECTION_MIN 1e-06
typedef QMap<QString, GEOMGUI*> GUIMap;
class QDialog; class QDialog;
class QMenu; class QMenu;
class GEOMGUI_OCCSelector; class GEOMGUI_OCCSelector;
@ -81,17 +79,14 @@ public:
static Handle(Graphic3d_HArray1OfBytes) getTexture( SalomeApp_Study*, int, int&, int& ); static Handle(Graphic3d_HArray1OfBytes) getTexture( SalomeApp_Study*, int, int&, int& );
static bool InitGeomGen(); //BugID IPAL9186: SRN: To be called by Python scripts static bool InitGeomGen();
static GEOM::GEOM_Gen_var GetGeomGen();// { return GeometryGUI::myComponentGeom; } static GEOM::GEOM_Gen_var GetGeomGen();
static CORBA::Object_var ClientSObjectToObject (_PTR(SObject) theSObject); static CORBA::Object_var ClientSObjectToObject (_PTR(SObject) theSObject);
static SALOMEDS::Study_var ClientStudyToStudy (_PTR(Study) theStudy); static SALOMEDS::Study_var ClientStudyToStudy (_PTR(Study) theStudy);
GEOM_Client& GetShapeReader() { return myShapeReader; } GEOM_Client& GetShapeReader() { return myShapeReader; }
Standard_CString& GetFatherior() { return myFatherior; }
//void SetState( const int state ) { myState = state; }
//int GetState() const { return myState; }
// Get active dialog box // Get active dialog box
QDialog* GetActiveDialogBox(){ return myActiveDialogBox; } QDialog* GetActiveDialogBox(){ return myActiveDialogBox; }
@ -103,16 +98,9 @@ public:
void EmitSignalCloseAllDialogs(); void EmitSignalCloseAllDialogs();
void EmitSignalDefaultStepValueChanged( double newVal ); void EmitSignalDefaultStepValueChanged( double newVal );
// Process action
void OnGUIEvent( int id ); void OnGUIEvent( int id );
// virtual bool SetSettings();
// virtual void SupportedViewType ( int* buffer, int bufferSize );
virtual void BuildPresentation( const Handle(SALOME_InteractiveObject)&, SUIT_ViewWindow* = 0 );
// virtual void DefinePopup( QString & theContext, QString & theParent, QString & theObject);
// virtual bool CustomPopup( QAD_Desktop* parent, QMenu* popup, const QString& theContext,
// const QString& theParent, const QString& theObject );
// The Working Plane management // The Working Plane management
void SetWorkingPlane( gp_Ax3 wp ) { myWorkingPlane = wp; } void SetWorkingPlane( gp_Ax3 wp ) { myWorkingPlane = wp; }
gp_Ax3 GetWorkingPlane() { return myWorkingPlane; } gp_Ax3 GetWorkingPlane() { return myWorkingPlane; }
@ -171,12 +159,11 @@ private:
typedef QMap<long, Handle(Graphic3d_HArray1OfBytes)> TextureMap; typedef QMap<long, Handle(Graphic3d_HArray1OfBytes)> TextureMap;
typedef QMap<long, TextureMap> StudyTextureMap; typedef QMap<long, TextureMap> StudyTextureMap;
typedef QMap<QString, GEOMGUI*> GUIMap;
GUIMap myGUIMap; // GUI libraries map GUIMap myGUIMap; // GUI libraries map
QDialog* myActiveDialogBox; // active dialog box QDialog* myActiveDialogBox; // active dialog box
GEOM_Client myShapeReader; // geom shape reader GEOM_Client myShapeReader; // geom shape reader
Standard_CString myFatherior;
int myState; // identify a method
gp_Ax3 myWorkingPlane; gp_Ax3 myWorkingPlane;
QMap<int,QString> myRules; // popup rules QMap<int,QString> myRules; // popup rules
static StudyTextureMap myTextureMap; // texture map static StudyTextureMap myTextureMap; // texture map

162
src/GEOMGUI/GeometryGUI_Operations.h Normal file
View File

@ -0,0 +1,162 @@
// Copyright (C) 2007-2008 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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : GeometryGUI_Operations.h
// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
//
#ifndef GEOMETRYGUI_OPERATIONS_H
#define GEOMETRYGUI_OPERATIONS_H
namespace GEOMOp {
enum {
// ToolsGUI
OpImport = 1000, // MENU FILE - IMPORT
OpExport = 1001, // MENU FILE - EXPORT
OpDelete = 1020, // MENU EDIT - DELETE
OpCheckGeom = 1030, // MENU TOOLS - CHECK GEOMETRY
OpSelectVertex = 1100, // POPUP MENU - SELECT ONLY - VERTEX
OpSelectEdge = 1101, // POPUP MENU - SELECT ONLY - EDGE
OpSelectWire = 1102, // POPUP MENU - SELECT ONLY - WIRE
OpSelectFace = 1103, // POPUP MENU - SELECT ONLY - FACE
OpSelectShell = 1104, // POPUP MENU - SELECT ONLY - SHELL
OpSelectSolid = 1105, // POPUP MENU - SELECT ONLY - SOLID
OpSelectCompound = 1106, // POPUP MENU - SELECT ONLY - COMPOUND
OpSelectAll = 1107, // POPUP MENU - SELECT ONLY - SELECT ALL
OpDeflection = 1200, // POPUP MENU - DEFLECTION COEFFICIENT
OpColor = 1201, // POPUP MENU - COLOR
OpTransparency = 1202, // POPUP MENU - TRANSPARENCY
OpIsos = 1203, // POPUP MENU - ISOS
OpAutoColor = 1204, // POPUP MENU - AUTO COLOR
OpNoAutoColor = 1205, // POPUP MENU - DISABLE AUTO COLOR
OpPointMarker = 1206, // POPUP MENU - POINT MARKER
OpShowChildren = 1250, // POPUP MENU - SHOW CHILDREN
OpHideChildren = 1251, // POPUP MENU - HIDE CHILDREN
OpRename = 1252, // POPUP MENU - RENAME
// DisplayGUI
OpDisplayMode = 2000, // MENU VIEW - DISPLAY MODE - WIREFRAME/SHADING
OpSwitchVectors = 2001, // MENU VIEW - DISPLAY MODE - SHOW/HIDE EDGE DIRECTION
OpShowAll = 2002, // MENU VIEW - SHOW ALL
OpHideAll = 2003, // MENU VIEW - HIDE ALL
OpShow = 2100, // POPUP MENU - SHOW
OpShowOnly = 2101, // POPUP MENU - SHOW ONLY
OpHide = 2102, // POPUP MENU - HIDE
OpWireframe = 2200, // POPUP MENU - DISPLAY MODE - WIREFRAME
OpShading = 2201, // POPUP MENU - DISPLAY MODE - SHADING
OpVectors = 2202, // POPUP MENU - DISPLAY MODE - SHOW EDGE DIRECTION
// BasicGUI
OpPoint = 3000, // MENU NEW ENTITY - BASIC - POINT
OpLine = 3001, // MENU NEW ENTITY - BASIC - LINE
OpCircle = 3002, // MENU NEW ENTITY - BASIC - CIRCLE
OpEllipse = 3003, // MENU NEW ENTITY - BASIC - ELLIPSE
OpArc = 3004, // MENU NEW ENTITY - BASIC - ARC
OpVector = 3005, // MENU NEW ENTITY - BASIC - VECTOR
OpPlane = 3006, // MENU NEW ENTITY - BASIC - PLANE
OpCurve = 3007, // MENU NEW ENTITY - BASIC - CURVE
OpLCS = 3008, // MENU NEW ENTITY - BASIC - LOCAL COORDINATE SYSTEM
// PrimitiveGUI
OpBox = 3100, // MENU NEW ENTITY - PRIMITIVES - BOX
OpCylinder = 3101, // MENU NEW ENTITY - PRIMITIVES - CYLINDER
OpSphere = 3102, // MENU NEW ENTITY - PRIMITIVES - SPHERE
OpTorus = 3103, // MENU NEW ENTITY - PRIMITIVES - TORUS
OpCone = 3104, // MENU NEW ENTITY - PRIMITIVES - CONE
OpRectangle = 3105, // MENU NEW ENTITY - PRIMITIVES - FACE
OpDisk = 3106, // MENU NEW ENTITY - PRIMITIVES - DISK
// GenerationGUI
OpPrism = 3200, // MENU NEW ENTITY - GENERATION - EXTRUSION
OpRevolution = 3201, // MENU NEW ENTITY - GENERATION - REVOLUTION
OpFilling = 3202, // MENU NEW ENTITY - GENERATION - FILLING
OpPipe = 3203, // MENU NEW ENTITY - GENERATION - EXTRUSION ALONG PATH
// EntityGUI
Op2dSketcher = 3300, // MENU NEW ENTITY - SKETCHER
Op3dSketcher = 3301, // MENU NEW ENTITY - 3D SKETCHER
OpExplode = 3302, // MENU NEW ENTITY - EXPLODE
// BuildGUI
OpEdge = 3400, // MENU NEW ENTITY - BUILD - EDGE
OpWire = 3401, // MENU NEW ENTITY - BUILD - WIRE
OpFace = 3402, // MENU NEW ENTITY - BUILD - FACE
OpShell = 3403, // MENU NEW ENTITY - BUILD - SHELL
OpSolid = 3404, // MENU NEW ENTITY - BUILD - SOLID
OpCompound = 3405, // MENU NEW ENTITY - BUILD - COMPOUND
// BooleanGUI
OpFuse = 3500, // MENU OPERATIONS - BOOLEAN - FUSE
OpCommon = 3501, // MENU OPERATIONS - BOOLEAN - COMMON
OpCut = 3502, // MENU OPERATIONS - BOOLEAN - CUT
OpSection = 3503, // MENU OPERATIONS - BOOLEAN - SECTION
// TransformationGUI
OpTranslate = 3600, // MENU OPERATIONS - TRANSFORMATION - TRANSLATION
OpRotate = 3601, // MENU OPERATIONS - TRANSFORMATION - ROTATION
OpChangeLoc = 3602, // MENU OPERATIONS - TRANSFORMATION - LOCATION
OpMirror = 3603, // MENU OPERATIONS - TRANSFORMATION - MIRROR
OpScale = 3604, // MENU OPERATIONS - TRANSFORMATION - SCALE
OpOffset = 3605, // MENU OPERATIONS - TRANSFORMATION - OFFSET
OpMultiTranslate = 3606, // MENU OPERATIONS - TRANSFORMATION - MULTI-TRANSLATION
OpMultiRotate = 3607, // MENU OPERATIONS - TRANSFORMATION - MULTI-ROTATION
OpReimport = 3608, // POPUP MENU - RELOAD IMPORTED
// OperationGUI
OpPartition = 3700, // MENU OPERATION - PARTITION
OpArchimede = 3701, // MENU OPERATION - ARCHIMEDE
OpFillet3d = 3702, // MENU OPERATION - FILLET
OpChamfer = 3703, // MENU OPERATION - CHAMFER
OpShapesOnShape = 3704, // MENU OPERATION - GET SHAPES ON SHAPE
OpFillet2d = 3705, // MENU OPERATION - FILLET 2D
OpFillet1d = 3706, // MENU OPERATION - FILLET 1D
OpClipping = 3707, // MENU OPERATION - CLIPPING RANGE
// RepairGUI
OpSewing = 4000, // MENU REPAIR - SEWING
OpSuppressFaces = 4001, // MENU REPAIR - SUPPRESS FACES
OpSuppressHoles = 4002, // MENU REPAIR - SUPPRESS HOLES
OpShapeProcess = 4003, // MENU REPAIR - SHAPE PROCESSING
OpCloseContour = 4004, // MENU REPAIR - CLOSE CONTOUR
OpRemoveIntWires = 4005, // MENU REPAIR - REMOVE INTERNAL WIRES
OpAddPointOnEdge = 4006, // MENU REPAIR - ADD POINT ON EDGE
OpFreeBoundaries = 4007, // MENU MEASURES - FREE BOUNDARIES
OpFreeFaces = 4008, // MENU MEASURES - FREE FACES
OpOrientation = 4009, // MENU REPAIR - CHANGE ORIENTATION
OpGlueFaces = 4010, // MENU REPAIR - GLUE FACES
OpRemoveExtraEdges = 4011, // MENU REPAIR - REMOVE EXTRA EDGES
// MeasureGUI
OpProperties = 5000, // MENU MEASURES - PROPERTIES
OpCenterMass = 5001, // MENU MEASURES - CENTRE OF MASS
OpInertia = 5002, // MENU MEASURES - INERTIA
OpNormale = 5003, // MENU MEASURES - NORMALE
OpBoundingBox = 5004, // MENU MEASURES - BOUNDING BOX
OpMinDistance = 5005, // MENU MEASURES - MIN DISTANCE
OpAngle = 5006, // MENU MEASURES - ANGLE
OpTolerance = 5007, // MENU MEASURES - TOLERANCE
OpWhatIs = 5008, // MENU MEASURES - WHAT IS
OpCheckShape = 5009, // MENU MEASURES - CHECK
OpCheckCompound = 5010, // MENU MEASURES - CHECK COMPOUND OF BLOCKS
OpPointCoordinates = 5011, // MENU MEASURES - POINT COORDINATES
// GroupGUI
OpGroupCreate = 6000, // MENU GROUP - CREATE
OpGroupEdit = 6001, // MENU GROUP - EDIT
OpGroupCreatePopup = 6002, // POPUP MENU - CREATE GROUP
// BlocksGUI
OpHexaSolid = 6100, // MENU BLOCKS - HEXAHEDRAL SOLID
OpMultiTransform = 6101, // MENU BLOCKS - MULTI-TRANSFORMATION
OpQuadFace = 6102, // MENU BLOCKS - QUADRANGLE FACE
OpPropagate = 6103, // MENU BLOCKS - PROPAGATE
OpExplodeBlock = 6104, // MENU BLOCKS - EXPLODE ON BLOCKS
};
}
#endif // GEOMETRYGUI_OPERATIONS_H

1
src/GEOMGUI/Makefile.am
View File

@ -32,6 +32,7 @@ lib_LTLIBRARIES = libGEOM.la
# header files # header files
salomeinclude_HEADERS = \ salomeinclude_HEADERS = \
GeometryGUI.h \ GeometryGUI.h \
GeometryGUI_Operations.h\
GEOMGUI.h \ GEOMGUI.h \
GEOM_Displayer.h \ GEOM_Displayer.h \
GEOMGUI_OCCSelector.h \ GEOMGUI_OCCSelector.h \