X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMeasureGUI%2FMeasureGUI_MaxToleranceDlg.cxx;h=ed42f21265069660191f81e75d99b4a9743c2d0a;hb=9caf5aba46053fce9214d64e4fb3d45ec46576c9;hp=7fb4de9f6be945e6649d67ccbda45243739b47fa;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git diff --git a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx index 7fb4de9f6..ed42f2126 100644 --- a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx @@ -17,7 +17,7 @@ // 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 // // // @@ -28,12 +28,13 @@ #include "MeasureGUI_MaxToleranceDlg.h" #include "MeasureGUI_1Sel6LineEdit_QTD.h" -#include "SALOMEGUI_QtCatchCorbaException.hxx" #include "utilities.h" -#include "QAD_Desktop.h" +#include "SUIT_Session.h" +#include "SalomeApp_Tools.h" #include +#include #include #include #include @@ -46,12 +47,12 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -MeasureGUI_MaxToleranceDlg::MeasureGUI_MaxToleranceDlg( QWidget* parent, SALOME_Selection* Sel ) -: MeasureGUI_Skeleton( parent, "MeasureGUI_MaxToleranceDlg", Sel ) +MeasureGUI_MaxToleranceDlg::MeasureGUI_MaxToleranceDlg( GeometryGUI* GUI, QWidget* parent ) +: MeasureGUI_Skeleton( GUI, parent, "MeasureGUI_MaxToleranceDlg" ) { - QPixmap image0( QAD_Desktop::getResourceManager()->loadPixmap( + QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr( "ICON_DLG_TOLERANCE" ) ) ); - QPixmap image1( QAD_Desktop::getResourceManager()->loadPixmap( + QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr( "ICON_SELECT" ) ) ); setCaption( tr( "GEOM_TOLERANCE_TITLE" ) ); @@ -82,8 +83,10 @@ MeasureGUI_MaxToleranceDlg::MeasureGUI_MaxToleranceDlg( QWidget* parent, SALOME_ /***************************************************************/ + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#Tolerance"; + /* Initialisation */ - Init( Sel ); + Init(); } @@ -100,11 +103,11 @@ MeasureGUI_MaxToleranceDlg::~MeasureGUI_MaxToleranceDlg() // function : Init() // purpose : //================================================================================= -void MeasureGUI_MaxToleranceDlg::Init( SALOME_Selection* Sel ) +void MeasureGUI_MaxToleranceDlg::Init() { mySelBtn = myGrp->PushButton1; mySelEdit = myGrp->LineEdit1; - MeasureGUI_Skeleton::Init( Sel ); + MeasureGUI_Skeleton::Init(); } //================================================================================= @@ -171,7 +174,7 @@ bool MeasureGUI_MaxToleranceDlg::getParameters( double& theMinFaceToler, } catch( const SALOME::SALOME_Exception& e ) { - QtCatchCorbaException( e ); + SalomeApp_Tools::QtCatchCorbaException( e ); return false; }