added new Advanced Repair menu

diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index ba2b35507af1c3335a795b87c48b83ab96b96288..2d25cd520827350faa8230b36956d8a4a581f421 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -5028,6 +5028,42 @@ Please, select face, shell or solid and try again</translation>
         <source>STB_UNION_FACES</source>
         <translation>Union faces</translation>
     </message>
+    <message>
+        <source>TOP_LOCATE_SUBSHAPES</source>
+        <translation>Locate Subshapes</translation>
+    </message>
+    <message>
+        <source>MEN_LOCATE_SUBSHAPES</source>
+        <translation>Locate Subshapes</translation>
+    </message>
+    <message>
+        <source>STB_LOCATE_SUBSHAPES</source>
+        <translation>Locate subshapes</translation>
+    </message>
+    <message>
+        <source>TOP_MERGE_FACES</source>
+        <translation>Merge faces</translation>
+    </message>
+    <message>
+        <source>MEN_MERGE_FACES</source>
+        <translation>Merge Faces</translation>
+    </message>
+    <message>
+        <source>STB_MERGE_FACES</source>
+        <translation>Merge faces</translation>
+    </message>
+    <message>
+        <source>TOP_UNION_EDGES</source>
+        <translation>Union edges</translation>
+    </message>
+    <message>
+        <source>MEN_UNION_EDGES</source>
+        <translation>Union Edges</translation>
+    </message>
+    <message>
+        <source>STB_UNION_EDGES</source>
+        <translation>Union edges</translation>
+    </message>
     <message>
         <source>TOP_INSPECT_OBJECT</source>
         <translation>Inspect Object</translation>

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index bb667ddd18a2ce7328ca41708d3b5548f0932c2f..7e2b3aa0f66e89434513966c673a1213be94239d 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -697,6 +697,9 @@ void GeometryGUI::OnGUIEvent( int id, const QVariant& theParam )
   case GEOMOp::OpRemoveExtraEdges:   // MENU REPAIR - REMOVE EXTRA EDGES
   case GEOMOp::OpFuseEdges:          // MENU REPAIR - FUSE COLLINEAR EDGES
   case GEOMOp::OpUnionFaces:         // MENU REPAIR - UNION FACES
+  case GEOMOp::OpLocateSubShapes:    // MENU REPAIR - ADVANCED - LOCATE SUBSHAPES
+  case GEOMOp::OpMergeFaces:         // MENU REPAIR - ADVANCED - MERGE FACES
+  case GEOMOp::OpUnionEdges:         // MENU REPAIR - ADVANCED - UNION EDGES
   case GEOMOp::OpInspectObj:         // MENU REPAIR - INSPECT OBJECT
     libName = "RepairGUI";
     break;
@@ -1095,6 +1098,9 @@ void GeometryGUI::initialize( CAM_Application* app )
   createGeomAction( GEOMOp::OpRemoveExtraEdges, "REMOVE_EXTRA_EDGES" );
   createGeomAction( GEOMOp::OpFuseEdges,        "FUSE_EDGES" );
   createGeomAction( GEOMOp::OpUnionFaces,       "UNION_FACES" );
+  createGeomAction( GEOMOp::OpLocateSubShapes,  "LOCATE_SUBSHAPES" );
+  createGeomAction( GEOMOp::OpMergeFaces,       "MERGE_FACES" );
+  createGeomAction( GEOMOp::OpUnionEdges,       "UNION_EDGES" );
   createGeomAction( GEOMOp::OpInspectObj,       "INSPECT_OBJECT" );
 
   createGeomAction( GEOMOp::OpPointCoordinates, "POINT_COORDS" );
@@ -1363,6 +1369,11 @@ void GeometryGUI::initialize( CAM_Application* app )
   createMenu( GEOMOp::OpFuseEdges,        repairId, -1 );
   createMenu( GEOMOp::OpUnionFaces,       repairId, -1 );
 
+  int advId = createMenu( tr( "MEN_ADVANCED" ), repairId, -1 );
+  createMenu( GEOMOp::OpLocateSubShapes,  advId, -1 );
+  createMenu( GEOMOp::OpMergeFaces,       advId, -1 );
+  createMenu( GEOMOp::OpUnionEdges,       advId, -1 );
+
   int measurId = createMenu( tr( "MEN_MEASURES" ), -1, -1, 10 );
   createMenu( GEOMOp::OpPointCoordinates, measurId, -1 );
   createMenu( GEOMOp::OpProperties,       measurId, -1 );

diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h
index 0dc3bb96503324f884d10f6e9451f0ff35ec2029..91966ff79497c60b7d7ee1fe8758e06ebd98a903 100644 (file)
--- a/src/GEOMGUI/GeometryGUI_Operations.h
+++ b/src/GEOMGUI/GeometryGUI_Operations.h
@@ -185,6 +185,9 @@ namespace GEOMOp {
     OpFuseEdges           = 4014,   // MENU REPAIR - FUSE COLLINEAR EDGES
     OpUnionFaces          = 4015,   // MENU REPAIR - UNION FACES
     OpRemoveWebs          = 4016,   // MENU REPAIR - REMOVE INTERNAL FACES
+    OpLocateSubShapes     = 4017,   // MENU REPAIR - ADVANCED - LOCATE SUB SHAPES
+    OpMergeFaces          = 4018,   // MENU REPAIR - ADVANCED - MERGE FACES
+    OpUnionEdges          = 4019,   // MENU REPAIR - ADVANCED - UNION EDGES
     // MeasureGUI ------------------//--------------------------------
     OpProperties          = 5000,   // MENU MEASURES - PROPERTIES
     OpCenterMass          = 5001,   // MENU MEASURES - CENTRE OF MASS

diff --git a/src/RepairGUI/RepairGUI.cxx b/src/RepairGUI/RepairGUI.cxx
index 82fa717d6d75d8e046d875b936c51b377ebd377b..d40ff4f15db089adc326358dab398e80a8ea2635 100644 (file)
--- a/src/RepairGUI/RepairGUI.cxx
+++ b/src/RepairGUI/RepairGUI.cxx
@@ -98,6 +98,9 @@ bool RepairGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
   case GEOMOp::OpRemoveExtraEdges: aDlg = new RepairGUI_RemoveExtraEdgesDlg  (getGeometryGUI(), parent); break;
   case GEOMOp::OpFuseEdges:        aDlg = new RepairGUI_FuseEdgesDlg         (getGeometryGUI(), parent); break;
   case GEOMOp::OpUnionFaces:       aDlg = new RepairGUI_UnionFacesDlg        (getGeometryGUI(), parent); break;
+  // case GEOMOp::OpLocateSubShapes:  /*to be implemented*/ break;
+  // case GEOMOp::OpMergeFaces:       /*to be implemented*/ break;
+  // case GEOMOp::OpUnionEdges:       /*to be implemented*/ break;
   case GEOMOp::OpInspectObj:       aDlg = new RepairGUI_InspectObjectDlg     (getGeometryGUI(), parent); break;
   default:
     app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));