NPAL17269: Performance pb. when creating a group with GUI.

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

diff --git a/src/GenerationGUI/GenerationGUI.cxx b/src/GenerationGUI/GenerationGUI.cxx
index b6ba761b3a0023dbc589f2173dc626d415d9ad6d..85832ed847ebfef0340beab530f101c56b51e7e2 100644 (file)
--- a/src/GenerationGUI/GenerationGUI.cxx
+++ b/src/GenerationGUI/GenerationGUI.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,40 +26,28 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "GenerationGUI.h"
 
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
-#include "QAD_Desktop.h"
+#include "SUIT_Session.h"
+#include "SUIT_Desktop.h"
+
+#include "SalomeApp_Application.h"
 
 #include "GenerationGUI_PrismDlg.h"     // Method PRISM
 #include "GenerationGUI_RevolDlg.h"     // Method REVOL
 #include "GenerationGUI_FillingDlg.h"   // Method FILLING
 #include "GenerationGUI_PipeDlg.h"      // Method PIPE
 
-GenerationGUI* GenerationGUI::myGUIObject = 0;
-
-//=======================================================================
-// function : GetGenerationGUI()
-// purpose  : Get the only GenerationGUI object [ static ]
-//=======================================================================
-GenerationGUI* GenerationGUI::GetGenerationGUI()
-{
-  if ( myGUIObject == 0 )
-    myGUIObject = new GenerationGUI();
-
-  return myGUIObject;
-}
+using namespace std;
 
 //=======================================================================
 // function : GenerationGUI()
 // purpose  : Constructor
 //=======================================================================
-GenerationGUI::GenerationGUI() : GEOMGUI()
+GenerationGUI::GenerationGUI(GeometryGUI* parent) : GEOMGUI(parent)
 {
 }
 
-
 //=======================================================================
 // function : ~GenerationGUI()
 // purpose  : Destructor
@@ -73,28 +61,28 @@ GenerationGUI::~GenerationGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool GenerationGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
+bool GenerationGUI::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 4031: aDlg = new GenerationGUI_PrismDlg   ( parent, "", Sel ); break;
-    case 4032: aDlg = new GenerationGUI_RevolDlg   ( parent, "", Sel ); break;
-    case 4033: aDlg = new GenerationGUI_FillingDlg ( parent, "", Sel ); break;
-    case 4034: aDlg = new GenerationGUI_PipeDlg    ( parent, "", Sel ); break;
+  switch (theCommandID)
+    {
+    case 4031: aDlg = new GenerationGUI_PrismDlg   ( getGeometryGUI(), parent, ""); break;
+    case 4032: aDlg = new GenerationGUI_RevolDlg   ( getGeometryGUI(), parent, ""); break;
+    case 4033: aDlg = new GenerationGUI_FillingDlg ( getGeometryGUI(), parent, ""); break;
+    case 4034: aDlg = new GenerationGUI_PipeDlg    ( getGeometryGUI(), parent, ""); break;
     
-    default: parent->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break;
+    default: app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break;
   }
 
-  if ( aDlg != NULL )
+  if (aDlg != NULL)
     aDlg->show();
-  
+
   return true;
 }
 
@@ -104,8 +92,9 @@ bool GenerationGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
-  GEOMGUI* GetLibGUI()
+GENERATIONGUI_EXPORT
+  GEOMGUI* GetLibGUI(GeometryGUI* parent)
   {
-    return GenerationGUI::GetGenerationGUI();
+    return new GenerationGUI(parent);
   }
 }