Fix bug 15567: MakeFuse() for compounds of faces raises error.

[modules/geom.git] / src / RepairGUI / RepairGUI.cxx

diff --git a/src/RepairGUI/RepairGUI.cxx b/src/RepairGUI/RepairGUI.cxx
index 18bcd8bba636ab4eb4780b2871edb0339f9fe0a5..3631415bcf0beac917a5dab48bb9319c28e4472a 100644 (file)
--- a/src/RepairGUI/RepairGUI.cxx
+++ b/src/RepairGUI/RepairGUI.cxx
@@ -17,7 +17,7 @@
 //  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -28,10 +28,10 @@
 
 #include "RepairGUI.h"
 
-#include "QAD_RightFrame.h"
-#include "QAD_Desktop.h"
-#include "OCCViewer_Viewer3d.h"
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
+#include "SUIT_Desktop.h"
+#include "SUIT_Session.h"
+
+#include "SalomeApp_Application.h"
 
 #include "RepairGUI_SewingDlg.h"        // Method SEWING
 #include "RepairGUI_SuppressFacesDlg.h" // Method SUPPRESS FACES
@@ -43,35 +43,20 @@
 #include "RepairGUI_FreeBoundDlg.h"     // Method FREE BOUNDARIES
 #include "RepairGUI_FreeFacesDlg.h"     // Method FREE FACES
 #include "RepairGUI_GlueDlg.h"          // Method GLUE FACES
+#include "RepairGUI_ChangeOrientationDlg.h" // Method CHANGE ORIENTATION
 
 #include "utilities.h"
 
 using namespace std;
 
-RepairGUI* RepairGUI::myGUIObject = 0;
-
-//=======================================================================
-// function : GetRepairGUI()
-// purpose  : Get the only RepairGUI object [ static ]
-//=======================================================================
-RepairGUI* RepairGUI::GetRepairGUI()
-{
-  if ( myGUIObject == 0 ) {
-    // init RepairGUI only once
-    myGUIObject = new RepairGUI();
-  }
-  return myGUIObject;
-}
-
 //=======================================================================
 // function : RepairGUI()
 // purpose  : Constructor
 //=======================================================================
-RepairGUI::RepairGUI() : GEOMGUI()
+RepairGUI::RepairGUI( GeometryGUI* parent ) : GEOMGUI( parent )
 {
 }
 
-
 //=======================================================================
 // function : ~RepairGUI()
 // purpose  : Destructor
@@ -85,51 +70,34 @@ RepairGUI::~RepairGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool RepairGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
+bool RepairGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
 {
-  GeometryGUI::GetGeomGUI()->EmitSignalDeactivateDialog();
-  SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection());
+  SalomeApp_Application* app = getGeometryGUI()->getApp();
+  if (!app) return false;
+
+  getGeometryGUI()->EmitSignalDeactivateDialog();
 
   QDialog* aDlg = NULL;
   switch (theCommandID) {
-    case 601: // SEWING
-      aDlg = new RepairGUI_SewingDlg( parent, "", Sel );
-      break;
-    case 602: // GLUE FACES
-      aDlg = new RepairGUI_GlueDlg( parent, "", Sel );
-      break;
-    case 603: // SUPPRESS FACES
-      aDlg = new RepairGUI_SuppressFacesDlg( parent, "", Sel);
-      break;
-    case 604: // SUPPRESS HOLES
-      aDlg = new RepairGUI_RemoveHolesDlg( parent, "", Sel );
-      break;
-    case 605: // SHAPE PROCESSING
-      aDlg = new RepairGUI_ShapeProcessDlg( parent, "", Sel );
-      break;
-    case 606: // CLOSE CONTOUR
-      aDlg = new RepairGUI_CloseContourDlg( parent, "", Sel );
-      break;
-    case 607: // REMOVE INTERNAL WIRES
-      aDlg = new RepairGUI_RemoveIntWiresDlg( parent, "", Sel );
-      break;
-    case 608: // ADD POINT ON EDGE
-      aDlg = new RepairGUI_DivideEdgeDlg( parent, "", Sel );
-      break;
-    case 609: // FREE BOUNDARIES
-      aDlg = new RepairGUI_FreeBoundDlg( parent, Sel );
-      break;    
-    case 610: // FREE FACES
-      aDlg = new RepairGUI_FreeFacesDlg( parent, "", Sel );
-      break;    
+    case 601: aDlg = new RepairGUI_SewingDlg        (getGeometryGUI(), parent, ""); break;
+    case 602: aDlg = new RepairGUI_GlueDlg          (getGeometryGUI(), parent, ""); break;
+    case 603: aDlg = new RepairGUI_SuppressFacesDlg (getGeometryGUI(), parent, ""); break;
+    case 604: aDlg = new RepairGUI_RemoveHolesDlg   (getGeometryGUI(), parent, ""); break;
+    case 605: aDlg = new RepairGUI_ShapeProcessDlg  (getGeometryGUI(), parent, ""); break;
+    case 606: aDlg = new RepairGUI_CloseContourDlg  (getGeometryGUI(), parent, ""); break;
+    case 607: aDlg = new RepairGUI_RemoveIntWiresDlg(getGeometryGUI(), parent, ""); break;
+    case 608: aDlg = new RepairGUI_DivideEdgeDlg    (getGeometryGUI(), parent, ""); break;
+    case 609: aDlg = new RepairGUI_FreeBoundDlg     (getGeometryGUI(), parent, ""); break;
+    case 610: aDlg = new RepairGUI_FreeFacesDlg     (getGeometryGUI(), parent, ""); break;
+    case 611: aDlg = new RepairGUI_ChangeOrientationDlg (getGeometryGUI(), parent, ""); break;
     default:
-      parent->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
+      app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
       break;
   }
 
   if ( aDlg )
     aDlg->show();
-    
+
   return true;
 }
 
@@ -139,8 +107,11 @@ bool RepairGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
 //=====================================================================================
 extern "C"
 {
-  GEOMGUI* GetLibGUI()
+#ifdef WNT
+       __declspec( dllexport )
+#endif
+  GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
-    return RepairGUI::GetRepairGUI();
+    return new RepairGUI( parent );
   }
 }