Fix for bug 0019870(Import/Export should show current directory).

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

diff --git a/src/OperationGUI/OperationGUI.cxx b/src/OperationGUI/OperationGUI.cxx
index e784ac282ab9498fc83ba57c8b25b605465366da..63c6de0f1e462ee9319bbd98cd03ff110cf11bad 100644 (file)
--- a/src/OperationGUI/OperationGUI.cxx
+++ b/src/OperationGUI/OperationGUI.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
 //
 //
 //
@@ -26,14 +26,11 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "OperationGUI.h"
 
-#include "QAD_RightFrame.h"
-#include "QAD_Desktop.h"
-#include "OCCViewer_Viewer3d.h"
-#include "OCCViewer_ViewFrame.h"
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
+#include "SUIT_Session.h"
+#include "SUIT_Desktop.h"
+#include "SalomeApp_Application.h"
 
 #include <TopTools_MapOfShape.hxx>
 #include <TopExp_Explorer.hxx>
@@ -43,33 +40,19 @@ using namespace std;
 #include "OperationGUI_ArchimedeDlg.h"   // Method ARCHIMEDE
 #include "OperationGUI_FilletDlg.h"      // Method FILLET
 #include "OperationGUI_ChamferDlg.h"     // Method CHAMFER
-
 #include "OperationGUI_ClippingDlg.h"
+#include "OperationGUI_GetShapesOnShapeDlg.h"
 
-OperationGUI* OperationGUI::myGUIObject = 0;
-
-//=======================================================================
-// function : GetOperationGUI()
-// purpose  : Get the only OperationGUI object [ static ]
-//=======================================================================
-OperationGUI* OperationGUI::GetOperationGUI()
-{
-  if ( myGUIObject == 0 ) {
-    // init OperationGUI only once
-    myGUIObject = new OperationGUI();
-  }
-  return myGUIObject;
-}
+using namespace std;
 
 //=======================================================================
 // function : OperationGUI()
 // purpose  : Constructor
 //=======================================================================
-OperationGUI::OperationGUI() : GEOMGUI()
+OperationGUI::OperationGUI(GeometryGUI* parent) : GEOMGUI(parent)
 {
 }
 
-
 //=======================================================================
 // function : ~OperationGUI()
 // purpose  : Destructor
@@ -83,35 +66,25 @@ OperationGUI::~OperationGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool OperationGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
+bool OperationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
-  OperationGUI* myOperationGUI = GetOperationGUI();
-  GeometryGUI::GetGeomGUI()->EmitSignalDeactivateDialog();
-  SALOME_Selection* Sel = SALOME_Selection::Selection(
-    QAD_Application::getDesktop()->getActiveStudy()->getSelection() );
-  
-  switch ( theCommandID )
+  SalomeApp_Application* app = getGeometryGUI()->getApp();
+  if (!app) return false;
+
+  getGeometryGUI()->EmitSignalDeactivateDialog();
+
+  switch (theCommandID)
   {
-    case 503: // PARTITION
-      ( new OperationGUI_PartitionDlg( parent, "", Sel ) )->show();
-    break;
-    case 504: // ARCHIMEDE
-      new OperationGUI_ArchimedeDlg( parent, Sel );
-    break;
-    case 505: // FILLET
-      new OperationGUI_FilletDlg( parent, Sel );       
-    break;
-    case 506: // CHAMFER
-      new OperationGUI_ChamferDlg( parent, Sel );
-    break;
-    case 507: // CLIPPING RANGE
-      ( new OperationGUI_ClippingDlg( parent, "" ) )->show();
-    break;
-    default:
-      parent->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
-    break;
+  case 503: (new OperationGUI_PartitionDlg(getGeometryGUI(), parent))->show(); break;
+  case 504: (new OperationGUI_ArchimedeDlg(getGeometryGUI(), parent))->show(); break;
+  case 505: (new OperationGUI_FilletDlg   (getGeometryGUI(), parent))->show(); break;
+  case 506: (new OperationGUI_ChamferDlg  (getGeometryGUI(), parent))->show(); break;
+  case 507: (new OperationGUI_ClippingDlg (getGeometryGUI(), parent))->show(); break;
+  case 508: (new OperationGUI_GetShapesOnShapeDlg (getGeometryGUI(), parent))->show(); break;
+  default:
+    app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
   }
-  
+
   return true;
 }
 
@@ -120,8 +93,11 @@ bool OperationGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
-  GEOMGUI* GetLibGUI()
+#ifdef WNT
+       __declspec( dllexport )
+#endif
+  GEOMGUI* GetLibGUI(GeometryGUI* parent)
   {
-    return OperationGUI::GetOperationGUI();
+    return new OperationGUI(parent);
   }
 }