diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po index 5fa15d3ec..bfbed147b 100644 --- a/src/GEOMGUI/GEOM_msg_en.po +++ b/src/GEOMGUI/GEOM_msg_en.po @@ -625,6 +625,58 @@ msgstr "Vector_Normal" msgid "GEOM_PROPERTIES" msgstr "Basic Properties" +# +#============================================================================== +# + +#Kind of Shape +msgid "GEOM_KIND_OF_SHAPE" +msgstr "Kind of Shape :" + +#Kind of Shape +msgid "GEOM_CLOSED" +msgstr "Closed" + +#Kind of Shape +msgid "GEOM_UNCLOSED" +msgstr "Opened" + +#Kind of Shape +msgid "GEOM_CLOSEDUNCLOSED" +msgstr "Not defined, Closed or Opened. Possibly, error occured." + +#Kind of Shape +msgid "GEOM_DISK_CIRCLE" +msgstr "Disk" + +#Kind of Shape +msgid "GEOM_DISK_ELLIPSE" +msgstr "Elliptical face" + +#Kind of Shape +msgid "GEOM_PLANAR_FACE" +msgstr "Planar face" + +#Kind of Shape +msgid "GEOM_POLYGON" +msgstr "Polygon" + +#Kind of Shape +msgid "GEOM_POLYGON" +msgstr "Polygon" + +#Kind of Shape +msgid "GEOM_NORMAL" +msgstr "Normal direction" + +#Kind of Shape +msgid "GEOM_DIRECTION" +msgstr "Direction" + +# +#============================================================================== +# + #Multi-Translation msgid "GEOM_MULTITRANSLATION" msgstr "Multi-Translation" @@ -819,6 +871,18 @@ msgstr "Y :" msgid "GEOM_Z" msgstr "Z :" +#Xi +msgid "GEOM_X_I" +msgstr "X%1 :" + +#Yi +msgid "GEOM_Y_I" +msgstr "Y%1 :" + +#Zi +msgid "GEOM_Z_I" +msgstr "Z%1 :" + #DX msgid "GEOM_DX" msgstr "Dx :" diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx index 8820931dd..cad4e4539 100644 --- a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx @@ -27,9 +27,11 @@ // $Header$ #include "MeasureGUI_WhatisDlg.h" -#include "MeasureGUI_1Sel1TextView_QTD.h" +//#include "MeasureGUI_1Sel1TextView_QTD.h" #include "GEOMBase.h" +#include "DlgRef_SpinBox.h" + #include #include #include @@ -50,6 +52,75 @@ #include #include #include +#include + +//================================================================================= +// Constructs a MeasureGUI_Whatis_QTD which is a child of 'parent', with the +// name 'name' and widget flags set to 'f' +//================================================================================= +MeasureGUI_Whatis_QTD::MeasureGUI_Whatis_QTD (QWidget* parent, const char* name, WFlags fl) + : QWidget(parent, name, fl) +{ + if (!name) + setName("MeasureGUI_Whatis_QTD"); + //resize(130, 160); + MeasureGUI_Whatis_QTDLayout = new QGridLayout (this, 1, 1, 0, 6, "MeasureGUI_Whatis_QTDLayout"); + + GroupBox1 = new QGroupBox(this, "GroupBox1"); + GroupBox1->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, + 0, 0, GroupBox1->sizePolicy().hasHeightForWidth())); + GroupBox1->setColumnLayout(0, Qt::Vertical); + GroupBox1->layout()->setSpacing(6); + GroupBox1->layout()->setMargin(11); + GroupBox1Layout = new QGridLayout(GroupBox1->layout()); + GroupBox1Layout->setAlignment(Qt::AlignTop); + + Layout1 = new QGridLayout(0, 1, 1, 0, 6, "Layout1"); + + TextLabel1 = new QLabel (GroupBox1, "TextLabel1"); + TextLabel1->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, + 0, 0, TextLabel1->sizePolicy().hasHeightForWidth())); + + PushButton1 = new QPushButton (GroupBox1, "PushButton1"); + PushButton1->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, + 0, 0, PushButton1->sizePolicy().hasHeightForWidth())); + + LineEdit1 = new QLineEdit (GroupBox1, "LineEdit1"); + + Layout1->addWidget(TextLabel1 , 0, 0); + Layout1->addWidget(PushButton1, 0, 1); + Layout1->addWidget(LineEdit1 , 0, 2); + + TextEdit1 = new QTextEdit (GroupBox1, "TextEdit1"); + + Layout1->addMultiCellWidget(TextEdit1, 1, 1, 0, 2); + + TextLabel2 = new QLabel (GroupBox1, "TextLabel2"); + TextLabel2->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, + 0, 0, TextLabel1->sizePolicy().hasHeightForWidth())); + + LineEdit2 = new QLineEdit (GroupBox1, "LineEdit2"); + + PushButton2 = new QPushButton (GroupBox1, "PushButton2"); + PushButton2->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, + 0, 0, PushButton1->sizePolicy().hasHeightForWidth())); + + Layout1->addWidget(TextLabel2 , 2, 0); + Layout1->addWidget(LineEdit2 , 2, 1); + Layout1->addWidget(PushButton2, 2, 2); + + GroupBox1Layout->addLayout(Layout1, 0, 0); + + MeasureGUI_Whatis_QTDLayout->addWidget(GroupBox1, 0, 0); +} + +/* + * Destroys the object and frees any allocated resources + */ +MeasureGUI_Whatis_QTD::~MeasureGUI_Whatis_QTD() +{ + // no need to delete child widgets, Qt does it all for us +} //================================================================================= // class : MeasureGUI_WhatisDlg( ) @@ -73,9 +144,13 @@ MeasureGUI_WhatisDlg::MeasureGUI_WhatisDlg (GeometryGUI* GUI, QWidget* parent) GroupConstructors->setTitle( tr( "GEOM_WHATIS" ) ); RadioButton1->setPixmap( image0 ); - myGrp = new MeasureGUI_1Sel1TextView_QTD( this, "myGrp" ); + //myGrp = new MeasureGUI_1Sel1TextView_QTD( this, "myGrp" ); + myGrp = new MeasureGUI_Whatis_QTD( this, "myGrp" ); myGrp->GroupBox1->setTitle( tr( "GEOM_WHATIS_OBJECT" ) ); + myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) ); + myGrp->PushButton1->setPixmap( image1 ); + myGrp->LineEdit1->setReadOnly( true ); myGrp->TextEdit1->setReadOnly( TRUE ); // fix height to fit all text @@ -86,11 +161,17 @@ MeasureGUI_WhatisDlg::MeasureGUI_WhatisDlg (GeometryGUI* GUI, QWidget* parent) int sbHeight = myGrp->TextEdit1->horizontalScrollBar()->height(); myGrp->TextEdit1->setFixedHeight(myGrp->TextEdit1->contentsHeight() + sbHeight); - myGrp->PushButton1->setPixmap( image1 ); - myGrp->LineEdit1->setReadOnly( true ); + myGrp->TextLabel2->setText(tr("GEOM_KIND_OF_SHAPE")); + myGrp->LineEdit2->setReadOnly(true); + myGrp->PushButton2->setText(tr("GEOM_PROPERTIES")); Layout1->addWidget( myGrp, 1, 0 ); + // Properties dialog + //myParamsDlg = new MeasureGUI_Params_Dlg; + myParamsDlg = new QMessageBox ("", "", QMessageBox::Information, + QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton, this); + /***************************************************************/ myHelpFileName = "using_measurement_tools_page.html#whatis_anchor"; @@ -99,7 +180,6 @@ MeasureGUI_WhatisDlg::MeasureGUI_WhatisDlg (GeometryGUI* GUI, QWidget* parent) Init(); } - //================================================================================= // function : ~MeasureGUI_WhatisDlg() // purpose : Destroys the object and frees any allocated resources @@ -108,7 +188,6 @@ MeasureGUI_WhatisDlg::~MeasureGUI_WhatisDlg() { } - //================================================================================= // function : Init() // purpose : @@ -117,10 +196,12 @@ void MeasureGUI_WhatisDlg::Init() { mySelBtn = myGrp->PushButton1; mySelEdit = myGrp->LineEdit1; + + connect(myGrp->PushButton2, SIGNAL(clicked()), this, SLOT(ClickOnProperties())); + MeasureGUI_Skeleton::Init(); } - //================================================================================= // function : processObject // purpose : @@ -129,8 +210,24 @@ void MeasureGUI_WhatisDlg::processObject() { QString aText; myGrp->TextEdit1->setText( getParameters( aText ) ? aText : QString("") ); + + QString aParameters; + QString aKind = getKindOfShape(aParameters); + myGrp->LineEdit2->setText(aKind); + myGrp->PushButton2->setEnabled(!aParameters.isEmpty()); + myParamsDlg->setCaption(aKind + " " + tr("GEOM_PROPERTIES")); + myParamsDlg->setText(aParameters); + myParamsDlg->adjustSize(); } +//================================================================================= +// function : ClickOnProperties() +// purpose : +//================================================================================= +void MeasureGUI_WhatisDlg::ClickOnProperties() +{ + myParamsDlg->show(); +} //================================================================================= // function : getParameters @@ -140,18 +237,388 @@ bool MeasureGUI_WhatisDlg::getParameters( QString& theText ) { if ( myObj->_is_nil() ) return false; - else - { - try - { - theText = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->WhatIs( myObj ); - } - catch( const SALOME::SALOME_Exception& e ) - { - SalomeApp_Tools::QtCatchCorbaException( e ); - return false; - } - return getOperation()->IsDone(); + try + { + theText = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->WhatIs( myObj ); } + catch( const SALOME::SALOME_Exception& e ) + { + SalomeApp_Tools::QtCatchCorbaException( e ); + return false; + } + + return getOperation()->IsDone(); +} + +//================================================================================= +// function : getKindOfShape +// purpose : +//================================================================================= +QString MeasureGUI_WhatisDlg::getKindOfShape (QString& theParameters) +{ + QString aKindStr (""); + theParameters = ""; + + if ( myObj->_is_nil() ) + return aKindStr; + + GEOM::GEOM_IKindOfShape::shape_kind aKind; + GEOM::ListOfLong_var anInts; + GEOM::ListOfDouble_var aDbls; + + GEOM::GEOM_IMeasureOperations_var anOp = GEOM::GEOM_IMeasureOperations::_narrow(getOperation()); + + try + { + aKind = anOp->KindOfShape(myObj, anInts, aDbls); + } + catch( const SALOME::SALOME_Exception& e ) + { + SalomeApp_Tools::QtCatchCorbaException( e ); + return false; + } + + if (!anOp->IsDone()) + return aKindStr; + + switch (aKind) + { + case GEOM::GEOM_IKindOfShape::COMPOUND: + aKindStr = tr("GEOM_COMPOUND"); + break; + case GEOM::GEOM_IKindOfShape::COMPSOLID: + aKindStr = tr("GEOM_COMPOUNDSOLID"); + break; + case GEOM::GEOM_IKindOfShape::SHELL: + aKindStr = tr("GEOM_SHELL"); + if (anInts[0] == 1) + theParameters = tr("GEOM_CLOSED"); + else if (anInts[0] == 2) + theParameters = tr("GEOM_UNCLOSED"); + else + theParameters = tr("GEOM_CLOSEDUNCLOSED"); + break; + case GEOM::GEOM_IKindOfShape::WIRE: + aKindStr = tr("GEOM_WIRE"); + if (anInts[0] == 1) + theParameters = tr("GEOM_CLOSED"); + else if (anInts[0] == 2) + theParameters = tr("GEOM_UNCLOSED"); + else + theParameters = tr("GEOM_CLOSEDUNCLOSED"); + break; + // SOLIDs + case GEOM::GEOM_IKindOfShape::SPHERE: + aKindStr = tr("GEOM_SPHERE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]); + break; + case GEOM::GEOM_IKindOfShape::CYLINDER: + aKindStr = tr("GEOM_CYLINDER"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_AXIS") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS") + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_HEIGHT") + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]); + break; + case GEOM::GEOM_IKindOfShape::BOX: + aKindStr = tr("GEOM_BOX"); + theParameters = tr("GEOM_CENTER") + ":" + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + "Ax: " + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + "Ay: " + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + "Az: " + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]); + break; + case GEOM::GEOM_IKindOfShape::ROTATED_BOX: + aKindStr = tr("GEOM_BOX"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\nZ Axis:" + + "\n" + "Zx: " + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + "Zy: " + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + "Zz: " + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\nX Axis:" + + "\n" + tr("GEOM_X_I").arg("x") + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_X_I").arg("y") + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]) + + "\n" + tr("GEOM_X_I").arg("z") + DlgRef_SpinBox::PrintDoubleValue(aDbls[8]) + + "\nDimensions along local axes:" + + "\n" + "Ax: " + DlgRef_SpinBox::PrintDoubleValue(aDbls[9]) + + "\n" + "Ay: " + DlgRef_SpinBox::PrintDoubleValue(aDbls[10]) + + "\n" + "Az: " + DlgRef_SpinBox::PrintDoubleValue(aDbls[11]); + break; + case GEOM::GEOM_IKindOfShape::TORUS: + aKindStr = tr("GEOM_TORUS"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_AXIS") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_RADIUS_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]); + break; + case GEOM::GEOM_IKindOfShape::CONE: + aKindStr = tr("GEOM_CONE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_AXIS") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_RADIUS_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]) + + "\n" + tr("GEOM_HEIGHT") + DlgRef_SpinBox::PrintDoubleValue(aDbls[8]); + break; + case GEOM::GEOM_IKindOfShape::POLYHEDRON: + aKindStr = tr("GEOM_POLYHEDRON"); + break; + case GEOM::GEOM_IKindOfShape::SOLID: + aKindStr = tr("GEOM_SOLID"); + break; + // FACEs + case GEOM::GEOM_IKindOfShape::SPHERE2D: + aKindStr = tr("GEOM_SURFSPHERE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]); + break; + case GEOM::GEOM_IKindOfShape::CYLINDER2D: + aKindStr = tr("GEOM_SURFCYLINDER"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_AXIS") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS") + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_HEIGHT") + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]); + break; + case GEOM::GEOM_IKindOfShape::TORUS2D: + aKindStr = tr("GEOM_SURFTORUS"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_AXIS") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_RADIUS_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]); + break; + case GEOM::GEOM_IKindOfShape::CONE2D: + aKindStr = tr("GEOM_SURFCONE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_AXIS") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_RADIUS_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]) + + "\n" + tr("GEOM_HEIGHT") + DlgRef_SpinBox::PrintDoubleValue(aDbls[8]); + break; + case GEOM::GEOM_IKindOfShape::DISK_CIRCLE: + aKindStr = tr("GEOM_DISK_CIRCLE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_NORMAL") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS") + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]); + break; + case GEOM::GEOM_IKindOfShape::DISK_ELLIPSE: + aKindStr = tr("GEOM_DISK_ELLIPSE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_NORMAL") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS_MAJOR") + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_RADIUS_MINOR") + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]); + break; + case GEOM::GEOM_IKindOfShape::POLYGON: + aKindStr = tr("GEOM_POLYGON"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_NORMAL") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]); + break; + case GEOM::GEOM_IKindOfShape::PLANE: + aKindStr = tr("GEOM_PLANE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_NORMAL") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]); + break; + case GEOM::GEOM_IKindOfShape::PLANAR: + aKindStr = tr("GEOM_PLANAR_FACE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_NORMAL") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]); + break; + case GEOM::GEOM_IKindOfShape::FACE: + aKindStr = tr("GEOM_FACE"); + break; + // EDGEs + case GEOM::GEOM_IKindOfShape::CIRCLE: + aKindStr = tr("GEOM_CIRCLE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_NORMAL") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS") + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]); + break; + case GEOM::GEOM_IKindOfShape::ARC_CIRCLE: + aKindStr = tr("GEOM_ARC"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_NORMAL") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS") + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_POINT_I").arg(1) + + "\n" + tr("GEOM_X_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]) + + "\n" + tr("GEOM_Y_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[8]) + + "\n" + tr("GEOM_Z_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[9]) + + "\n" + tr("GEOM_POINT_I").arg(2) + + "\n" + tr("GEOM_X_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[10]) + + "\n" + tr("GEOM_Y_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[11]) + + "\n" + tr("GEOM_Z_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[12]); + break; + case GEOM::GEOM_IKindOfShape::ELLIPSE: + aKindStr = tr("GEOM_ELLIPSE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_NORMAL") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS_MAJOR") + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_RADIUS_MINOR") + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]); + break; + case GEOM::GEOM_IKindOfShape::ARC_ELLIPSE: + aKindStr = tr("GEOM_ARC_ELLIPSE"); + theParameters = tr("GEOM_CENTER") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_NORMAL") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]) + + "\n" + tr("GEOM_DIMENSIONS") + + "\n" + tr("GEOM_RADIUS_MAJOR") + DlgRef_SpinBox::PrintDoubleValue(aDbls[6]) + + "\n" + tr("GEOM_RADIUS_MINOR") + DlgRef_SpinBox::PrintDoubleValue(aDbls[7]) + + "\n" + tr("GEOM_POINT_I").arg(1) + + "\n" + tr("GEOM_X_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[8]) + + "\n" + tr("GEOM_Y_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[9]) + + "\n" + tr("GEOM_Z_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[10]) + + "\n" + tr("GEOM_POINT_I").arg(2) + + "\n" + tr("GEOM_X_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[11]) + + "\n" + tr("GEOM_Y_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[12]) + + "\n" + tr("GEOM_Z_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[13]); + break; + case GEOM::GEOM_IKindOfShape::LINE: + aKindStr = tr("GEOM_LINE"); + theParameters = tr("GEOM_POSITION") + + "\n" + tr("GEOM_X_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(0) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_DIRECTION") + + "\n" + tr("GEOM_DX") + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_DY") + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_DZ") + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]); + break; + case GEOM::GEOM_IKindOfShape::SEGMENT: + aKindStr = tr("GEOM_SEGMENT"); + theParameters = tr("GEOM_POINT_I").arg(1) + + "\n" + tr("GEOM_X_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z_I").arg(1) + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]) + + "\n" + tr("GEOM_POINT_I").arg(2) + + "\n" + tr("GEOM_X_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[3]) + + "\n" + tr("GEOM_Y_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[4]) + + "\n" + tr("GEOM_Z_I").arg(2) + DlgRef_SpinBox::PrintDoubleValue(aDbls[5]); + break; + case GEOM::GEOM_IKindOfShape::EDGE: + aKindStr = tr("GEOM_EDGE"); + break; + case GEOM::GEOM_IKindOfShape::VERTEX: + aKindStr = tr("GEOM_VERTEX"); + theParameters = tr("GEOM_COORDINATES") + + "\n" + tr("GEOM_X") + DlgRef_SpinBox::PrintDoubleValue(aDbls[0]) + + "\n" + tr("GEOM_Y") + DlgRef_SpinBox::PrintDoubleValue(aDbls[1]) + + "\n" + tr("GEOM_Z") + DlgRef_SpinBox::PrintDoubleValue(aDbls[2]); + break; + default: + ; + } + + return aKindStr; } diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.h b/src/MeasureGUI/MeasureGUI_WhatisDlg.h index 10f3ccf71..330c90bba 100644 --- a/src/MeasureGUI/MeasureGUI_WhatisDlg.h +++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.h @@ -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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -33,10 +33,49 @@ #include "MeasureGUI_Skeleton.h" -class MeasureGUI_1Sel1TextView_QTD; +//class MeasureGUI_1Sel1TextView_QTD; + +#include +#include +class QVBoxLayout; +class QHBoxLayout; +class QGridLayout; +class QGroupBox; +class QLabel; +class QLineEdit; +class QPushButton; +class QTextEdit; +class QMessageBox; + +class GEOM_MEASUREGUI_EXPORT MeasureGUI_Whatis_QTD : public QWidget +{ + Q_OBJECT + +public: + MeasureGUI_Whatis_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ~MeasureGUI_Whatis_QTD(); + + QGroupBox* GroupBox1; + + QLabel* TextLabel1; + QPushButton* PushButton1; + QLineEdit* LineEdit1; + + QTextEdit* TextEdit1; + + QLabel* TextLabel2; + QLineEdit* LineEdit2; + QPushButton* PushButton2; + +protected: + QGridLayout* MeasureGUI_Whatis_QTDLayout; + QGridLayout* GroupBox1Layout; + QGridLayout* Layout1; +}; + //================================================================================= -// class : DialogBox_PROPERTIES +// class : MeasureGUI_WhatisDlg // purpose : //================================================================================= class GEOM_MEASUREGUI_EXPORT MeasureGUI_WhatisDlg : public MeasureGUI_Skeleton @@ -44,24 +83,26 @@ class GEOM_MEASUREGUI_EXPORT MeasureGUI_WhatisDlg : public MeasureGUI_Skeleton Q_OBJECT public: - MeasureGUI_WhatisDlg( GeometryGUI* GUI, - QWidget* parent ); - ~MeasureGUI_WhatisDlg(); + MeasureGUI_WhatisDlg (GeometryGUI* GUI, QWidget* parent); + ~MeasureGUI_WhatisDlg(); protected: - // redefined from GEOMBase_Helper and MeasureGUI_Skeleton - virtual void processObject(); + virtual void processObject(); + +protected slots: + virtual void ClickOnProperties(); private: - - void Init(); - bool getParameters( QString& ); + void Init(); + bool getParameters( QString& ); + QString getKindOfShape( QString& ); private: - - MeasureGUI_1Sel1TextView_QTD* myGrp; - + //MeasureGUI_1Sel1TextView_QTD* myGrp; + MeasureGUI_Whatis_QTD* myGrp; + //MeasureGUI_Params_Dlg* myParamsDlg; + QMessageBox* myParamsDlg; }; #endif // DIALOGBOX_WHATIS_H