// 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
//
//
//
// $Header$
#include "MeasureGUI.h"
-#include "QAD_Desktop.h"
+#include "SUIT_Desktop.h"
+#include "SUIT_Session.h"
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
+#include "SalomeApp_Tools.h"
+#include "SalomeApp_Application.h"
#include "MeasureGUI_PropertiesDlg.h" // Method PROPERTIES
#include "MeasureGUI_CenterMassDlg.h" // Method CENTER MASS
#include "MeasureGUI_InertiaDlg.h" // Method INERTIA
#include "MeasureGUI_BndBoxDlg.h" // Method BNDBOX
#include "MeasureGUI_DistanceDlg.h" // Method DISTANCE
+#include "MeasureGUI_AngleDlg.h" // Method ANGLE
#include "MeasureGUI_MaxToleranceDlg.h" // Method MAXTOLERANCE
#include "MeasureGUI_WhatisDlg.h" // Method WHATIS
#include "MeasureGUI_CheckShapeDlg.h" // Method CHECKSHAPE
+#include "MeasureGUI_CheckCompoundOfBlocksDlg.h" // Method CHECKCOMPOUND
#include "MeasureGUI_PointDlg.h" // Method POINTCOORDINATES
-MeasureGUI* MeasureGUI::myGUIObject = 0;
-
-//=======================================================================
-// function : GetMeasureGUI()
-// purpose : Get the only MeasureGUI object [ static ]
-//=======================================================================
-MeasureGUI* MeasureGUI::GetMeasureGUI()
-{
- if ( myGUIObject == 0 ) {
- // init MeasureGUI only once
- myGUIObject = new MeasureGUI();
- }
- return myGUIObject;
-}
-
//=======================================================================
// function : MeasureGUI()
// purpose : Constructor
//=======================================================================
-MeasureGUI::MeasureGUI() : GEOMGUI()
+MeasureGUI::MeasureGUI( GeometryGUI* parent ) : GEOMGUI( parent )
{
}
-
//=======================================================================
// function : ~MeasureGUI()
// purpose : Destructor
// function : OnGUIEvent()
// purpose :
//=======================================================================
-bool MeasureGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
+bool MeasureGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
{
- MeasureGUI* myMeasureGUI = GetMeasureGUI();
- GeometryGUI::GetGeomGUI()->EmitSignalDeactivateDialog();
- SALOME_Selection* Sel = SALOME_Selection::Selection(
- QAD_Application::getDesktop()->getActiveStudy()->getSelection() );
+ SalomeApp_Application* app = getGeometryGUI()->getApp();
+ if ( !app ) return false;
+
+ getGeometryGUI()->EmitSignalDeactivateDialog();
switch ( theCommandID )
{
- case 701 : new MeasureGUI_PropertiesDlg ( parent, Sel ); break; // LENGTH, AREA AND VOLUME
- case 702 : new MeasureGUI_CenterMassDlg ( parent, Sel ); break; // CENTER MASS
- case 703 : new MeasureGUI_InertiaDlg ( parent, Sel ); break; // INERTIA
- case 7041: new MeasureGUI_BndBoxDlg ( parent, Sel ); break; // BOUNDING BOX
- case 7042: new MeasureGUI_DistanceDlg ( parent, Sel ); break; // MIN DISTANCE
- case 705 : new MeasureGUI_MaxToleranceDlg( parent, Sel ); break; // MAXTOLERANCE
- case 706 : new MeasureGUI_WhatisDlg ( parent, Sel ); break; // WHATIS
- case 707 : new MeasureGUI_CheckShapeDlg ( parent, Sel ); break; // CHECKSHAPE
- case 708 : new MeasureGUI_PointDlg ( parent, Sel ); break; // POINT COORDINATES
-
- default: parent->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break;
+ case 701 : new MeasureGUI_PropertiesDlg (getGeometryGUI(), parent); break; // LENGTH, AREA AND VOLUME
+ case 702 : new MeasureGUI_CenterMassDlg (getGeometryGUI(), parent); break; // CENTER MASS
+ case 703 : new MeasureGUI_InertiaDlg (getGeometryGUI(), parent); break; // INERTIA
+ case 7041: new MeasureGUI_BndBoxDlg (getGeometryGUI(), parent); break; // BOUNDING BOX
+ case 7042: new MeasureGUI_DistanceDlg (getGeometryGUI(), parent); break; // MIN DISTANCE
+ case 7043: new MeasureGUI_AngleDlg (getGeometryGUI(), parent); break; // ANGLE
+ case 705 : new MeasureGUI_MaxToleranceDlg(getGeometryGUI(), parent); break; // MAXTOLERANCE
+ case 706 : new MeasureGUI_WhatisDlg (getGeometryGUI(), parent); break; // WHATIS
+ case 707 : new MeasureGUI_CheckShapeDlg (getGeometryGUI(), parent); break; // CHECKSHAPE
+ case 7072: new MeasureGUI_CheckCompoundOfBlocksDlg (getGeometryGUI(), parent); break; // CHECKCOMPOUND
+ case 708 : new MeasureGUI_PointDlg (getGeometryGUI(), parent); break; // POINT COORDINATES
+
+ default:
+ app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
+ break;
}
return true;
}
-//=====================================================================================
-// function : MakeCDGAndDisplay()
-// purpose :
-//=====================================================================================
-/*void MeasureGUI::MakeCDGAndDisplay(GEOM::GEOM_Shape_ptr Shape)
-{
- QAD_Application::getDesktop()->putInfo("MakeCDGAndDisplay method from MeasureGUI should be reimplemented ...");
-
- try {
- GEOM::GEOM_Shape_var result = myGeom->MakeCDG(Shape);
- if(result->_is_nil()) {
- QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_ABORT"));
- return;
- }
- result->NameType(tr("GEOM_POINT"));
- if(myGeomBase->Display(result))
- QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_DONE"));
- }
- catch(const SALOME::SALOME_Exception& S_ex) {
- QtCatchCorbaException(S_ex);
- }
-
- return;
-}
-*/
-
-
//=====================================================================================
// EXPORTED METHODS
//=====================================================================================
extern "C"
{
- GEOMGUI* GetLibGUI()
+GEOM_MEASUREGUI_EXPORT
+ GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
- return MeasureGUI::GetMeasureGUI();
+ return new MeasureGUI( parent );
}
}
