From: skv Date: Wed, 15 Oct 2014 08:54:41 +0000 (+0400) Subject: Add level of check (no implementation) X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=892b6633c2c3db6bc3688d5f84632273ee67952a;p=modules%2Fgeom.git Add level of check (no implementation) --- diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index dfdf40c7e..29fd2251d 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -415,26 +415,6 @@ Please, select face, shell or solid and try again GEOM_CHECK_SELF_INTERSECTIONS Detect Self-intersections - - GEOM_CHECK_SELF_INTERSECTIONS_FAILED - Detection of self-intersections failed - - - GEOM_NO_SELF_INTERSECTIONS - There are no self-intersections in the shape - - - GEOM_SELF_INTERSECTIONS_FOUND - Some self-intersections detected - - - GEOM_SELF_INTERSECTION_NAME - Self_intersection - - - GEOM_CHECK_SELF_INTERSECTIONS_ERRORS - Warning: there were errors during the operation, so the list may be incomplete. - GEOM_CIRCLE Circle @@ -6955,4 +6935,47 @@ Do you want to create new material? V-Isoline + + MeasureGUI_CheckSelfIntersectionsDlg + + GEOM_CHECK_INTE_INTERSECTIONS + Self-intersections + + + GEOM_CHECK_INTE_SUBSHAPES + Sub-shapes + + + GEOM_CHECK_INTE_CHECK_LEVEL + Level of check + + + GEOM_CHECK_INTE_SUMMARY + Summary + + + GEOM_CHECK_INTE_COMPUTE + Compute self-intersections + + + GEOM_SELF_INTERSECTION_NAME + Self_intersection + + + GEOM_NO_SELF_INTERSECTIONS + There are no self-intersections in the shape + + + GEOM_SELF_INTERSECTIONS_FOUND + Some self-intersections detected + + + GEOM_CHECK_SELF_INTERSECTIONS_FAILED + Detection of self-intersections failed + + + GEOM_CHECK_SELF_INTERSECTIONS_ERRORS + Warning: there were errors during the operation, so the list may be incomplete. + + diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx index 5d42e11c8..10227dc04 100644 --- a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx @@ -60,6 +60,8 @@ MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (Geom myTextView (0), mySelButton (0), myEditObjName (0), + myLevelBox (0), + myComputeButton (0), myInteList (0), myShapeList (0) { @@ -79,8 +81,10 @@ MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (Geom QGroupBox *aGrp = new QGroupBox(tr("GEOM_CHECK_INFOS")); QLabel *anObjLbl = new QLabel(tr("GEOM_OBJECT")); - QLabel *anInteLbl = new QLabel(tr("GEOM_CHECK_BLOCKS_COMPOUND_ERRORS")); - QLabel *aShapeLbl = new QLabel(tr("GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES")); + QLabel *anInteLbl = new QLabel(tr("GEOM_CHECK_INTE_INTERSECTIONS")); + QLabel *aShapeLbl = new QLabel(tr("GEOM_CHECK_INTE_SUBSHAPES")); + QLabel *aLevelLbl = new QLabel(tr("GEOM_CHECK_INTE_CHECK_LEVEL")); + QLabel *aSummaryLbl = new QLabel(tr("GEOM_CHECK_INTE_SUMMARY")); QFont aFont (TEXTEDIT_FONT_FAMILY, TEXTEDIT_FONT_SIZE); aFont.setStyleHint(QFont::TypeWriter, QFont::PreferAntialias); @@ -95,6 +99,11 @@ MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (Geom myEditObjName = new QLineEdit; myEditObjName->setReadOnly(true); + myLevelBox = new QComboBox; + + myComputeButton = new QPushButton(tr("GEOM_CHECK_INTE_COMPUTE")); + + myInteList = new QListWidget; myShapeList = new QListWidget; myShapeList->setSelectionMode(QAbstractItemView::ExtendedSelection); @@ -103,14 +112,18 @@ MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (Geom aGrpLayout->setMargin(9); aGrpLayout->setSpacing(6); - aGrpLayout->addWidget(anObjLbl, 0, 0); - aGrpLayout->addWidget(anInteLbl, 2, 0); - aGrpLayout->addWidget(aShapeLbl, 2, 2); - aGrpLayout->addWidget(myTextView, 1, 0, 1, 3); - aGrpLayout->addWidget(mySelButton, 0, 1); - aGrpLayout->addWidget(myEditObjName, 0, 2); - aGrpLayout->addWidget(myInteList, 3, 0, 1, 2); - aGrpLayout->addWidget(myShapeList, 3, 2); + aGrpLayout->addWidget(anObjLbl, 0, 0); + aGrpLayout->addWidget(anInteLbl, 5, 0); + aGrpLayout->addWidget(aShapeLbl, 5, 2); + aGrpLayout->addWidget(aLevelLbl, 1, 0); + aGrpLayout->addWidget(myLevelBox, 1, 1, 1, 2); + aGrpLayout->addWidget(myComputeButton, 2, 0, 1, 3); + aGrpLayout->addWidget(aSummaryLbl, 3, 0); + aGrpLayout->addWidget(myTextView, 4, 0, 1, 3); + aGrpLayout->addWidget(mySelButton, 0, 1); + aGrpLayout->addWidget(myEditObjName, 0, 2); + aGrpLayout->addWidget(myInteList, 6, 0, 1, 2); + aGrpLayout->addWidget(myShapeList, 6, 2); QVBoxLayout* layout = new QVBoxLayout (centralWidget()); layout->setMargin(0); layout->setSpacing(6); @@ -157,8 +170,9 @@ void MeasureGUI_CheckSelfIntersectionsDlg::Init() this, SLOT(SelectionIntoArgument())); initName( tr( "GEOM_SELF_INTERSECTION_NAME") ); - buttonOk()->setEnabled( false ); - buttonApply()->setEnabled( false ); + buttonOk()->setEnabled(false); + buttonApply()->setEnabled(false); + myComputeButton->setEnabled(false); activateSelection(); SelectionIntoArgument(); } diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h index 886caec9b..0e2681374 100644 --- a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h +++ b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h @@ -28,8 +28,9 @@ #include -class QTextBrowser; +class QComboBox; class QListWidget; +class QTextBrowser; //================================================================================= @@ -81,6 +82,8 @@ private: QTextBrowser *myTextView; QPushButton *mySelButton; QLineEdit *myEditObjName; + QComboBox *myLevelBox; + QPushButton *myComputeButton; QListWidget *myInteList; QListWidget *myShapeList; GEOM::GEOM_Object_var myObj;