-// GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2010 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 : OperationGUI.cxx
-// Author : Damien COQUERET
-// Module : GEOM
-// $Header$
+// GEOM GEOMGUI : GUI for Geometry component
+// File : OperationGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
+//
#include "OperationGUI.h"
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
+#include <GeometryGUI.h>
+#include "GeometryGUI_Operations.h"
+
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SalomeApp_Application.h>
#include <TopTools_MapOfShape.hxx>
#include <TopExp_Explorer.hxx>
#include "OperationGUI_PartitionDlg.h" // Method PARTITION
#include "OperationGUI_ArchimedeDlg.h" // Method ARCHIMEDE
#include "OperationGUI_FilletDlg.h" // Method FILLET
+#include "OperationGUI_Fillet1d2dDlg.h" // Method FILLET 2D and FILLET 1D
#include "OperationGUI_ChamferDlg.h" // Method CHAMFER
-
-#include "OperationGUI_ClippingDlg.h"
-
-using namespace std;
-
-OperationGUI* OperationGUI::myGUIObject = 0;
-
-//=======================================================================
-// function : GetOperationGUI()
-// purpose : Get the only OperationGUI object [ static ]
-//=======================================================================
-OperationGUI* OperationGUI::GetOperationGUI( GeometryGUI* parent )
-{
- if ( myGUIObject == 0 ) {
- // init OperationGUI only once
- myGUIObject = new OperationGUI( parent );
- }
- return myGUIObject;
-}
+#include "OperationGUI_ClippingDlg.h" // Clipping dialog box
+#include "OperationGUI_GetShapesOnShapeDlg.h"
//=======================================================================
// function : OperationGUI()
// purpose : Constructor
//=======================================================================
-OperationGUI::OperationGUI(GeometryGUI* parent) : GEOMGUI(parent)
+OperationGUI::OperationGUI( GeometryGUI* parent ) :
+ GEOMGUI( parent )
{
}
-
//=======================================================================
// function : ~OperationGUI()
// purpose : Destructor
//=======================================================================
bool OperationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
{
+ SalomeApp_Application* app = getGeometryGUI()->getApp();
+ if ( !app ) return false;
+
getGeometryGUI()->EmitSignalDeactivateDialog();
-
- switch ( theCommandID )
- {
- case 503: // PARTITION
- ( new OperationGUI_PartitionDlg( parent, "" ) )->show();
- break;
- case 504: // ARCHIMEDE
- new OperationGUI_ArchimedeDlg( getGeometryGUI(), parent );
- break;
- case 505: // FILLET
- new OperationGUI_FilletDlg( parent );
- break;
- case 506: // CHAMFER
- new OperationGUI_ChamferDlg( parent );
- break;
- case 507: // CLIPPING RANGE
- ( new OperationGUI_ClippingDlg( parent, "" ) )->show();
- break;
- default:
- SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
- break;
+
+ switch ( theCommandID ) {
+ case GEOMOp::OpPartition: ( new OperationGUI_PartitionDlg ( getGeometryGUI(), parent ) )->show(); break;
+ case GEOMOp::OpArchimede: ( new OperationGUI_ArchimedeDlg ( getGeometryGUI(), parent ) )->show(); break;
+ case GEOMOp::OpFillet3d: ( new OperationGUI_FilletDlg ( getGeometryGUI(), parent ) )->show(); break;
+ case GEOMOp::OpChamfer: ( new OperationGUI_ChamferDlg ( getGeometryGUI(), parent ) )->show(); break;
+ case GEOMOp::OpClipping: ( new OperationGUI_ClippingDlg ( getGeometryGUI(), parent ) )->show(); break;
+ case GEOMOp::OpShapesOnShape: ( new OperationGUI_GetShapesOnShapeDlg( getGeometryGUI(), parent ) )->show(); break;
+ case GEOMOp::OpFillet1d: ( new OperationGUI_Fillet1d2dDlg ( getGeometryGUI(), parent, true ) )->show(); break;
+ case GEOMOp::OpFillet2d: ( new OperationGUI_Fillet1d2dDlg ( getGeometryGUI(), parent, false ) )->show(); break;
+ default:
+ app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
}
-
+
return true;
}
extern "C"
{
#ifdef WNT
- __declspec( dllexport )
+ __declspec( dllexport )
#endif
- GEOMGUI* GetLibGUI(GeometryGUI* parent)
+ GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
- return OperationGUI::GetOperationGUI(parent);
+ return new OperationGUI( parent );
}
}
