X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMeasureGUI%2FMeasureGUI_PropertiesDlg.cxx;h=861658e28a5eb187e82d80343051cb06eb122630;hb=32e56a241f21859130edcfcc7a9d9c452c8d00d4;hp=b2648870417d59d17541d1f1f31d1d923e8797c1;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git diff --git a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx index b26488704..861658e28 100644 --- a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx @@ -1,88 +1,86 @@ -// 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 : MeasureGUI_PropertiesDlg.cxx -// Author : Lucien PIGNOLONI -// Module : GEOM -// $Header$ +// GEOM GEOMGUI : GUI for Geometry component +// File : MeasureGUI_PropertiesDlg.cxx +// Author : Lucien PIGNOLONI, Open CASCADE S.A.S. +// #include "MeasureGUI_PropertiesDlg.h" -#include "MeasureGUI_1Sel3LineEdit_QTD.h" -#include "SALOMEGUI_QtCatchCorbaException.hxx" -#include "GEOM_Displayer.h" -#include "utilities.h" -#include "QAD_Desktop.h" -#include "GEOMImpl_Types.hxx" -#include "GEOMBase.h" +#include "MeasureGUI_Widgets.h" -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include + +#include //================================================================================= // class : MeasureGUI_PropertiesDlg() // purpose : Constructs a MeasureGUI_PropertiesDlg which is a child of 'parent', with the // name 'name' and widget flags set to 'f'. // The dialog will by default be modeless, unless you set 'modal' to -// TRUE to construct a modal dialog. +// true to construct a modal dialog. //================================================================================= -MeasureGUI_PropertiesDlg::MeasureGUI_PropertiesDlg( QWidget* parent, SALOME_Selection* Sel ) -: MeasureGUI_Skeleton( parent, "MeasureGUI_PropertiesDlg", Sel ) +MeasureGUI_PropertiesDlg::MeasureGUI_PropertiesDlg( GeometryGUI* GUI, QWidget* parent ) + : MeasureGUI_Skeleton( GUI, parent ) { - QPixmap image0( QAD_Desktop::getResourceManager()->loadPixmap( - "GEOM",tr( "ICON_DLG_BASICPROPERTIES" ) ) ); - QPixmap image1( QAD_Desktop::getResourceManager()->loadPixmap( - "GEOM",tr( "ICON_SELECT" ) ) ); + QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( + "GEOM", tr( "ICON_DLG_BASICPROPERTIES" ) ) ); + QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( + "GEOM", tr( "ICON_SELECT" ) ) ); - setCaption( tr( "GEOM_PROPERTIES_TITLE" ) ); + setWindowTitle( tr( "GEOM_PROPERTIES_TITLE" ) ); /***************************************************************/ - GroupConstructors->setTitle( tr( "GEOM_PROPERTIES" ) ); - RadioButton1->setPixmap( image0 ); + mainFrame()->GroupConstructors->setTitle( tr( "GEOM_PROPERTIES" ) ); + mainFrame()->RadioButton1->setIcon( image0 ); - myGrp = new MeasureGUI_1Sel3LineEdit_QTD( this, "myGrp" ); + myGrp = new MeasureGUI_1Sel3LineEdit( centralWidget() ); myGrp->GroupBox1->setTitle( tr( "GEOM_PROPERTIES_CONSTR" ) ); myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) ); myGrp->TextLabel2->setText( tr( "GEOM_LENGTH" ) ); myGrp->TextLabel3->setText( tr( "GEOM_PROPERTIES_SURFACE" ) ); myGrp->TextLabel4->setText( tr( "GEOM_PROPERTIES_VOLUME" ) ); - myGrp->LineEdit2->setReadOnly( TRUE ); - myGrp->LineEdit3->setReadOnly( TRUE ); - myGrp->LineEdit4->setReadOnly( TRUE ); - myGrp->PushButton1->setPixmap( image1 ); myGrp->LineEdit1->setReadOnly( true ); - - Layout1->addWidget( myGrp, 1, 0 ); + myGrp->PushButton1->setIcon( image1 ); + myGrp->LineEdit2->setReadOnly( true ); + myGrp->LineEdit3->setReadOnly( true ); + myGrp->LineEdit4->setReadOnly( true ); + + QVBoxLayout* layout = new QVBoxLayout( centralWidget() ); + layout->setMargin( 0 ); layout->setSpacing( 6 ); + layout->addWidget( myGrp ); /***************************************************************/ + myHelpFileName = "using_measurement_tools_page.html#basic_prop_anchor"; + /* Initialisation */ - Init( Sel ); + Init(); } @@ -99,11 +97,11 @@ MeasureGUI_PropertiesDlg::~MeasureGUI_PropertiesDlg() // function : Init() // purpose : //================================================================================= -void MeasureGUI_PropertiesDlg::Init( SALOME_Selection* Sel ) +void MeasureGUI_PropertiesDlg::Init() { mySelBtn = myGrp->PushButton1; mySelEdit = myGrp->LineEdit1; - MeasureGUI_Skeleton::Init( Sel ); + MeasureGUI_Skeleton::Init(); } //================================================================================= @@ -113,10 +111,9 @@ void MeasureGUI_PropertiesDlg::Init( SALOME_Selection* Sel ) void MeasureGUI_PropertiesDlg::activateSelection() { static TColStd_MapOfInteger aTypes; - if ( aTypes.IsEmpty() ) - { + if ( aTypes.IsEmpty() ) { aTypes.Add( GEOM_COMPOUND ); -// aTypes.Add( TopAbs_COMPSOLID ); + // aTypes.Add( TopAbs_COMPSOLID ); aTypes.Add( GEOM_SOLID ); aTypes.Add( GEOM_SHELL ); aTypes.Add( GEOM_FACE ); @@ -135,18 +132,16 @@ void MeasureGUI_PropertiesDlg::processObject() { double aLength, anArea, aVolume; - if ( !getParameters( aLength, anArea, aVolume ) ) - { + if ( !getParameters( aLength, anArea, aVolume ) ) { mySelEdit->setText( "" ); myGrp->LineEdit2->setText( "" ); myGrp->LineEdit3->setText( "" ); myGrp->LineEdit4->setText( "" ); } - else - { - myGrp->LineEdit2->setText( QString( "%1" ).arg( aLength ) ); - myGrp->LineEdit3->setText( QString( "%1" ).arg( anArea ) ); - myGrp->LineEdit4->setText( QString( "%1" ).arg( aVolume ) ); + else { + myGrp->LineEdit2->setText( DlgRef::PrintDoubleValue( aLength ) ); + myGrp->LineEdit3->setText( DlgRef::PrintDoubleValue( anArea ) ); + myGrp->LineEdit4->setText( DlgRef::PrintDoubleValue( aVolume ) ); } } @@ -160,20 +155,17 @@ bool MeasureGUI_PropertiesDlg::getParameters( double& theLength, { if ( myObj->_is_nil() ) return false; - else - { - try - { - GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->GetBasicProperties( - myObj, theLength, theArea, theVolume ); + else { + GEOM::GEOM_IMeasureOperations_var anOper = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() ); + try { + anOper->GetBasicProperties( myObj, theLength, theArea, theVolume ); } - catch( const SALOME::SALOME_Exception& e ) - { - QtCatchCorbaException( e ); + catch( const SALOME::SALOME_Exception& e ) { + SalomeApp_Tools::QtCatchCorbaException( e ); return false; } - return getOperation()->IsDone(); + return anOper->IsDone(); } } @@ -186,7 +178,7 @@ SALOME_Prs* MeasureGUI_PropertiesDlg::buildPrs() TopoDS_Shape aShape, aResult; if ( myObj->_is_nil() || - !GEOMBase::GetShape( myObj, aShape )|| + !GEOMBase::GetShape( myObj, aShape ) || aShape.IsNull() || aShape.ShapeType() != TopAbs_EDGE || !GEOMBase::CreateArrowForLinearEdge( aShape, aResult ) || @@ -196,24 +188,3 @@ SALOME_Prs* MeasureGUI_PropertiesDlg::buildPrs() return getDisplayer()->BuildPrs( aResult ); } - - - - - - - - - - - - - - - - - - - - -