Updated for PAL14857.

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

diff --git a/src/TransformationGUI/TransformationGUI.cxx b/src/TransformationGUI/TransformationGUI.cxx
index 84c79078f87a6613027b6628fc923f36293d40e2..eb69c9037a216077a410643b9c9ee1d3a2e6476b 100644 (file)
--- a/src/TransformationGUI/TransformationGUI.cxx
+++ b/src/TransformationGUI/TransformationGUI.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
 //
 //
 //
@@ -32,6 +32,8 @@
 #include "SUIT_Session.h"
 #include "SUIT_Desktop.h"
 
+#include "SalomeApp_Application.h"
+
 #include "TransformationGUI_MultiTranslationDlg.h"   // Method MULTI TRANSLATION
 #include "TransformationGUI_MultiRotationDlg.h"      // Method MULTI ROTATION
 #include "TransformationGUI_TranslationDlg.h"        // Method TRANSLATION
@@ -43,21 +45,6 @@
 
 using namespace std;
 
-TransformationGUI* TransformationGUI::myGUIObject = 0;
-
-//=======================================================================
-// function : GetTransformationGUI()
-// purpose  : Get the only TransformationGUI object [ static ]
-//=======================================================================
-TransformationGUI* TransformationGUI::GetTransformationGUI( GeometryGUI* parent )
-{
-  if ( myGUIObject == 0 ) {
-    // init TransformationGUI only once
-    myGUIObject = new TransformationGUI( parent );
-  }
-  return myGUIObject;
-}
-
 //=======================================================================
 // function : TransformationGUI()
 // purpose  : Constructor
@@ -66,7 +53,6 @@ TransformationGUI::TransformationGUI(GeometryGUI* parent) : GEOMGUI(parent)
 {
 }
 
-
 //=======================================================================
 // function : ~TransformationGUI()
 // purpose  : Destructor
@@ -82,59 +68,44 @@ TransformationGUI::~TransformationGUI()
 //=======================================================================
 bool TransformationGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
 {
+  SalomeApp_Application* app = getGeometryGUI()->getApp();
+  if (!app) return false;
+
   getGeometryGUI()->EmitSignalDeactivateDialog();
   QDialog* aDlg = NULL;
 
   switch (theCommandID)
-    {
-    case 5021: // TRANSLATION
-      {        
-       aDlg = new TransformationGUI_TranslationDlg( getGeometryGUI(), parent, "" );
-       break;
-      }
-    case 5022: // ROTATION
-      {        
-       aDlg = new TransformationGUI_RotationDlg( parent, "" );
-       break;
-      }
-    case 5023: // POSITION
-      {        
-       aDlg = new TransformationGUI_PositionDlg( parent, "" );
-       break;
-      }
-    case 5024: // MIRROR
-      {        
-       aDlg = new TransformationGUI_MirrorDlg( parent, "" );
-       break;
-      }
-    case 5025: // SCALE
-      {        
-       aDlg = new TransformationGUI_ScaleDlg( getGeometryGUI(), parent, "" );
-       break;
-      }
-    case 5026: // OFFSET
-      {        
-       aDlg = new TransformationGUI_OffsetDlg( parent, "" );
-       break;
-      }  
-    case 5027: // MULTI TRANSLATION
-      {        
-       aDlg = new TransformationGUI_MultiTranslationDlg( getGeometryGUI(), parent, "" );
-       break;
-      }
-    case 5028: // MULTI ROTATION
-      {        
-       aDlg = new TransformationGUI_MultiRotationDlg( getGeometryGUI(), parent, "" );
-       break;
-      }
-    default:
-      {
-       SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
-       break;
-      }
-    }
+  {
+  case 5021: // TRANSLATION
+    aDlg = new TransformationGUI_TranslationDlg( getGeometryGUI(), parent, "" );
+    break;
+  case 5022: // ROTATION
+    aDlg = new TransformationGUI_RotationDlg( getGeometryGUI(), parent, "" );
+    break;
+  case 5023: // POSITION
+    aDlg = new TransformationGUI_PositionDlg( getGeometryGUI(), parent, "" );
+    break;
+  case 5024: // MIRROR
+    aDlg = new TransformationGUI_MirrorDlg( getGeometryGUI(), parent, "" );
+    break;
+  case 5025: // SCALE
+    aDlg = new TransformationGUI_ScaleDlg( getGeometryGUI(), parent, "" );
+    break;
+  case 5026: // OFFSET
+    aDlg = new TransformationGUI_OffsetDlg( getGeometryGUI(), parent, "" );
+    break;
+  case 5027: // MULTI TRANSLATION
+    aDlg = new TransformationGUI_MultiTranslationDlg( getGeometryGUI(), parent, "" );
+    break;
+  case 5028: // MULTI ROTATION
+    aDlg = new TransformationGUI_MultiRotationDlg( getGeometryGUI(), parent, "" );
+    break;
+  default:
+    app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
+    break;
+  }
 
-  if ( aDlg != NULL )
+  if (aDlg != NULL)
     aDlg->show();
 
   return true;
@@ -151,6 +122,6 @@ extern "C"
 #endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
-    return TransformationGUI::GetTransformationGUI( parent );
+    return new TransformationGUI( parent );
   }
 }