X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBlocksGUI%2FBlocksGUI.cxx;h=4713ca7b763aaf790ce7175ec81a9804674908f5;hb=25a3dc91508bb59688142bc616b10facc61dfc3d;hp=e2707c163aaa952fb7dbc686ef6ff764be1380d8;hpb=ca429d817a18d6acc571443f6a596575dee03c2f;p=modules%2Fgeom.git

diff --git a/src/BlocksGUI/BlocksGUI.cxx b/src/BlocksGUI/BlocksGUI.cxx
index e2707c163..4713ca7b7 100644
--- a/src/BlocksGUI/BlocksGUI.cxx
+++ b/src/BlocksGUI/BlocksGUI.cxx
@@ -1,64 +1,51 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+// Copyright (C) 2003-2007  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, or (at your option) any later version.
 //
-//  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.salome-platform.org or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//
-//
-//  File   : BooleanGUI.cxx
-//  Author : Julia DOOVSKIKH
-//  Module : GEOM
-//  $Header$
 
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BooleanGUI.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
+//
 #include "BlocksGUI.h"
 
 #include "BlocksGUI_QuadFaceDlg.h"
 #include "BlocksGUI_BlockDlg.h"
 #include "BlocksGUI_TrsfDlg.h"
-//#include "BlocksGUI_CheckMultiBlockDlg.h"
 #include "BlocksGUI_ExplodeDlg.h"
 #include "BlocksGUI_PropagateDlg.h"
 
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
-
-#include "QAD_Desktop.h"
-#include "QAD_MessageBox.h"
-
-BlocksGUI* BlocksGUI::myGUIObject = 0;
+#include <GeometryGUI.h>
+#include "GeometryGUI_Operations.h"
 
-//=======================================================================
-// function : GetBlocksGUI()
-// purpose  : Get the only BlocksGUI object [ static ]
-//=======================================================================
-BlocksGUI* BlocksGUI::GetBlocksGUI()
-{
-  if ( myGUIObject == 0 )
-    myGUIObject = new BlocksGUI();
-
-  return myGUIObject;
-}
+#include <SUIT_Desktop.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
 
 //=======================================================================
 // function : BlocksGUI()
 // purpose  : Constructor
 //=======================================================================
-BlocksGUI::BlocksGUI()
-     : GEOMGUI()
+BlocksGUI::BlocksGUI( GeometryGUI* parent )
+  : GEOMGUI( parent )
 {
 }
 
@@ -74,51 +61,28 @@ BlocksGUI::~BlocksGUI()
 // function : OnGUIEvent()
 // purpose  :
 //=======================================================================
-bool BlocksGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
+bool BlocksGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
-  GeometryGUI::GetGeomGUI()->EmitSignalDeactivateDialog();
-
-  SALOME_Selection* Sel = SALOME_Selection::Selection
-    (QAD_Application::getDesktop()->getActiveStudy()->getSelection());
-
-  QDialog* aDlg = NULL;
-
-  switch (theCommandID)
-  {
-    case 9999:
-      aDlg = new BlocksGUI_BlockDlg (parent, Sel);
-      break;
-
-    case 9998:
-      aDlg = new BlocksGUI_TrsfDlg (parent, Sel);
-      break;
-
-    case 9997:
-      aDlg = new BlocksGUI_QuadFaceDlg (parent, Sel);
-      break;
-
-    case 9996:
-//      aDlg = new BlocksGUI_CheckMultiBlockDlg (parent, Sel);
-      QAD_MessageBox::warn1 (parent,
-                             QObject::tr("WRN_WARNING"), 
-                             QObject::tr("WRN_NOT_IMPLEMENTED"),
-                             QObject::tr("BUT_OK"));
-      break;
-
-    case 9995:
-      aDlg = new BlocksGUI_ExplodeDlg (parent, Sel);
-      break;
-    case 99991:
-      aDlg = new BlocksGUI_PropagateDlg (parent, "", Sel);
-      break;
-
-    default:
-      parent->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
-      break;
+  getGeometryGUI()->EmitSignalDeactivateDialog();
+
+  QDialog* aDlg = 0;
+
+  switch ( theCommandID ) {
+  case GEOMOp::OpHexaSolid:      aDlg = new BlocksGUI_BlockDlg    ( getGeometryGUI(), parent ); break;
+  case GEOMOp::OpMultiTransform: aDlg = new BlocksGUI_TrsfDlg     ( getGeometryGUI(), parent ); break;
+  case GEOMOp::OpQuadFace:       aDlg = new BlocksGUI_QuadFaceDlg ( getGeometryGUI(), parent ); break;
+  case GEOMOp::OpExplodeBlock:   aDlg = new BlocksGUI_ExplodeDlg  ( getGeometryGUI(), parent ); break;
+  case GEOMOp::OpPropagate:      aDlg = new BlocksGUI_PropagateDlg( getGeometryGUI(), parent ); break;
+  default:
+    getGeometryGUI()->getApp()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
+    break;
   }
 
-  if (aDlg != NULL)
+  if ( aDlg ) {
+    aDlg->updateGeometry();
+    aDlg->resize( aDlg->minimumSizeHint() );
     aDlg->show();
+  }
 
   return true;
 }
@@ -128,8 +92,11 @@ bool BlocksGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
-  GEOMGUI* GetLibGUI()
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
+  GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
-    return BlocksGUI::GetBlocksGUI();
+    return new BlocksGUI( parent );
   }
 }