X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTransformationGUI%2FTransformationGUI.cxx;h=917f18b75b10d169ed549cb1247b1e732a411353;hb=2bd6b8908ecce0ff295eede38a1b3abd474c603e;hp=2c8b97a73082f59bcc7d625bfc059cb04613a840;hpb=e22560c4dc95da9e877275ed2b8a30dba569712d;p=modules%2Fgeom.git

diff --git a/src/TransformationGUI/TransformationGUI.cxx b/src/TransformationGUI/TransformationGUI.cxx
index 2c8b97a73..917f18b75 100644
--- a/src/TransformationGUI/TransformationGUI.cxx
+++ b/src/TransformationGUI/TransformationGUI.cxx
@@ -1,36 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// GEOM GEOMGUI : GUI for Geometry component
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
 // 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
+// This library is free software; you can redistribute it and/or 
+// modify it under the terms of the GNU Lesser General Public 
+// License as published by the Free Software Foundation; either 
+// version 2.1 of the License. 
 // 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
+// This library is distributed in the hope that it will be useful, 
+// but WITHOUT ANY WARRANTY; without even the implied warranty of 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// Lesser General Public License for more details. 
 // 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// You should have received a copy of the GNU Lesser General Public 
+// 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
 //
+// File   : TransformationGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//
-//  File   : TransformationGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
 
 #include "TransformationGUI.h"
-#include "GeometryGUI.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
+#include <GeometryGUI.h>
+
+#include <SUIT_Desktop.h>
+#include <SalomeApp_Application.h>
 
 #include "TransformationGUI_MultiTranslationDlg.h"   // Method MULTI TRANSLATION
 #include "TransformationGUI_MultiRotationDlg.h"      // Method MULTI ROTATION
@@ -41,32 +39,15 @@
 #include "TransformationGUI_OffsetDlg.h"             // Method OFFSET
 #include "TransformationGUI_PositionDlg.h"           // Method POSITION
 
-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
 //=======================================================================
-TransformationGUI::TransformationGUI(GeometryGUI* parent) : GEOMGUI(parent)
+TransformationGUI::TransformationGUI( GeometryGUI* parent )
+  : GEOMGUI( parent )
 {
 }
 
-
 //=======================================================================
 // function : ~TransformationGUI()
 // purpose  : Destructor
@@ -80,59 +61,43 @@ TransformationGUI::~TransformationGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool TransformationGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+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;
-      }
-    }
+  switch ( theCommandID ) {
+  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 )
     aDlg->show();
@@ -146,8 +111,11 @@ bool TransformationGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
 //=====================================================================================
 extern "C"
 {
+#ifdef WNT
+  __declspec( dllexport )
+#endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
-    return TransformationGUI::GetTransformationGUI( parent );
+    return new TransformationGUI( parent );
   }
 }