X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBuildGUI%2FBuildGUI.cxx;h=c28fddd4b98c04763ed2bb2c5aa0072e517b06db;hb=f43bdeb895071d4bbaabb94d401da24f5973ba6e;hp=d361dde5eec3da4e9d3241dd03bde4401942b6e1;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git

diff --git a/src/BuildGUI/BuildGUI.cxx b/src/BuildGUI/BuildGUI.cxx
index d361dde5e..c28fddd4b 100644
--- a/src/BuildGUI/BuildGUI.cxx
+++ b/src/BuildGUI/BuildGUI.cxx
@@ -1,35 +1,33 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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 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 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  File   : BooleanGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
 
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BooleanGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
+//
 #include "BuildGUI.h"
 
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
-#include "QAD_Desktop.h"
+#include <SUIT_Desktop.h>
+#include <SalomeApp_Application.h>
 
 #include "BuildGUI_EdgeDlg.h"       // Method EDGE
 #include "BuildGUI_WireDlg.h"       // Method WIRE
@@ -38,30 +36,18 @@
 #include "BuildGUI_SolidDlg.h"      // Method SOLID
 #include "BuildGUI_CompoundDlg.h"   // Method COMPOUND
 
-BuildGUI* BuildGUI::myGUIObject = 0;
-
-//=======================================================================
-// function : GetBuildGUI()
-// purpose  : Get the only BuildGUI object [ static ]
-//=======================================================================
-BuildGUI* BuildGUI::GetBuildGUI()
-{
-  if ( myGUIObject == 0 ) 
-    myGUIObject = new BuildGUI();
-
-  return myGUIObject;
-}
+#include <GeometryGUI.h>
+#include "GeometryGUI_Operations.h"
 
 //=======================================================================
 // function : BuildGUI()
 // purpose  : Constructor
 //=======================================================================
-BuildGUI::BuildGUI()
-: GEOMGUI()
+BuildGUI::BuildGUI( GeometryGUI* parent )
+  : GEOMGUI( parent )
 {
 }
 
-
 //=======================================================================
 // function : ~BuildGUI()
 // purpose  : Destructor
@@ -75,30 +61,30 @@ BuildGUI::~BuildGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool BuildGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
+bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
-  GeometryGUI::GetGeomGUI()->EmitSignalDeactivateDialog();
-  
-  SALOME_Selection* Sel = SALOME_Selection::Selection(
-    QAD_Application::getDesktop()->getActiveStudy()->getSelection() );
+  getGeometryGUI()->EmitSignalDeactivateDialog();
 
-  QDialog* aDlg = NULL;
+  QDialog* aDlg = 0;
 
-  switch ( theCommandID )
-  {
-    case 4081: aDlg = new BuildGUI_EdgeDlg    ( parent, "", Sel ); break;
-    case 4082: aDlg = new BuildGUI_WireDlg    ( parent, "", Sel ); break;
-    case 4083: aDlg = new BuildGUI_FaceDlg    ( parent, "", Sel ); break;
-    case 4084: aDlg = new BuildGUI_ShellDlg   ( parent, "", Sel ); break;
-    case 4085: aDlg = new BuildGUI_SolidDlg   ( parent, "", Sel ); break;
-    case 4086: aDlg = new BuildGUI_CompoundDlg( parent, "", Sel ); break;
-    
-    default: parent->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break;
+  switch ( theCommandID ) {
+  case GEOMOp::OpEdge:     aDlg = new BuildGUI_EdgeDlg    ( getGeometryGUI(), parent ); break;
+  case GEOMOp::OpWire:     aDlg = new BuildGUI_WireDlg    ( getGeometryGUI(), parent ); break;
+  case GEOMOp::OpFace:     aDlg = new BuildGUI_FaceDlg    ( getGeometryGUI(), parent ); break;
+  case GEOMOp::OpShell:    aDlg = new BuildGUI_ShellDlg   ( getGeometryGUI(), parent ); break;
+  case GEOMOp::OpSolid:    aDlg = new BuildGUI_SolidDlg   ( getGeometryGUI(), parent ); break;
+  case GEOMOp::OpCompound: aDlg = new BuildGUI_CompoundDlg( 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;
 }
 
@@ -107,8 +93,11 @@ bool BuildGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
-  GEOMGUI* GetLibGUI()
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
+  GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
-    return BuildGUI::GetBuildGUI();
+    return new BuildGUI( parent );
   }
 }