Add level of check (no implementation)

diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index dfdf40c7e42b96bcbfcc0e5a962dc166ac0287dd..29fd2251d47f0bdc8b44ed9fb44a7bb47a3d008d 100644 (file)
--- 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</translation>
         <source>GEOM_CHECK_SELF_INTERSECTIONS</source>
         <translation>Detect Self-intersections</translation>
     </message>
-    <message>
-        <source>GEOM_CHECK_SELF_INTERSECTIONS_FAILED</source>
-        <translation>Detection of self-intersections failed</translation>
-    </message>
-    <message>
-        <source>GEOM_NO_SELF_INTERSECTIONS</source>
-        <translation>There are no self-intersections in the shape</translation>
-    </message>
-    <message>
-        <source>GEOM_SELF_INTERSECTIONS_FOUND</source>
-        <translation>Some self-intersections detected</translation>
-    </message>
-    <message>
-        <source>GEOM_SELF_INTERSECTION_NAME</source>
-        <translation>Self_intersection</translation>
-    </message>
-    <message>
-        <source>GEOM_CHECK_SELF_INTERSECTIONS_ERRORS</source>
-        <translation>Warning: there were errors during the operation, so the list may be incomplete.</translation>
-    </message>
     <message>
         <source>GEOM_CIRCLE</source>
         <translation>Circle</translation>
@@ -6955,4 +6935,47 @@ Do you want to create new material?</translation>
         <translation>V-Isoline</translation>
     </message>
 </context>
+<context>
+    <name>MeasureGUI_CheckSelfIntersectionsDlg</name>
+    <message>
+        <source>GEOM_CHECK_INTE_INTERSECTIONS</source>
+        <translation>Self-intersections</translation>
+    </message>
+    <message>
+        <source>GEOM_CHECK_INTE_SUBSHAPES</source>
+        <translation>Sub-shapes</translation>
+    </message>
+    <message>
+        <source>GEOM_CHECK_INTE_CHECK_LEVEL</source>
+        <translation>Level of check</translation>
+    </message>
+    <message>
+        <source>GEOM_CHECK_INTE_SUMMARY</source>
+        <translation>Summary</translation>
+    </message>
+    <message>
+        <source>GEOM_CHECK_INTE_COMPUTE</source>
+        <translation>Compute self-intersections</translation>
+    </message>
+    <message>
+        <source>GEOM_SELF_INTERSECTION_NAME</source>
+        <translation>Self_intersection</translation>
+    </message>
+    <message>
+        <source>GEOM_NO_SELF_INTERSECTIONS</source>
+        <translation>There are no self-intersections in the shape</translation>
+    </message>
+    <message>
+        <source>GEOM_SELF_INTERSECTIONS_FOUND</source>
+        <translation>Some self-intersections detected</translation>
+    </message>
+    <message>
+        <source>GEOM_CHECK_SELF_INTERSECTIONS_FAILED</source>
+        <translation>Detection of self-intersections failed</translation>
+    </message>
+    <message>
+        <source>GEOM_CHECK_SELF_INTERSECTIONS_ERRORS</source>
+        <translation>Warning: there were errors during the operation, so the list may be incomplete.</translation>
+    </message>
+</context>
 </TS>

diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
index 5d42e11c857647f8d018ceae5cd6fb0bb2a656a9..10227dc04ba73f50fbb768105d4f3daf21db5b98 100644 (file)
--- 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 886caec9bdb6f20e30cd8f86830d0b1a9c4c3689..0e268137425e29c82f1e7292083fd47e664f6e36 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h
+++ b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h
@@ -28,8 +28,9 @@
 
 #include <GEOMBase_Skeleton.h>
 
-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;