Mantis issue 0021835: EDF 2070 GEOM : Problem with detecting Self-intersections

diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index e677b0980f407d1abc180e9fe996c390f5185854..26c1f8b80f5389f4d9dac6ccb87f5a2af6f6e4a0 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -7,6 +7,10 @@
         <source>BRep_API: command not done</source>
         <translation>Error: can&apos;t build object</translation>
     </message>
+    <message>
+        <source>PAL_NOT_DONE_ERROR</source>
+        <translation>Operation aborted</translation>
+    </message>
     <message>
         <source>CHANGE_ORIENTATION_NEW_OBJ_NAME</source>
         <translation>Invert</translation>

diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
index df12686dd70485966f18143d96d28570036e0f52..e94f29d689e1dc32d1c2feb750300118b4764971 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
@@ -18,11 +18,9 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : MeasureGUI_CheckSelfIntersectionsDlg.cxx
-// Author : Vladimir KLYACHIN, Open CASCADE S.A.S. (vladimir.klyachin@opencascade.com)
 
 #include "MeasureGUI_CheckSelfIntersectionsDlg.h"
 #include "MeasureGUI_Widgets.h"
@@ -144,7 +142,13 @@ void MeasureGUI_CheckSelfIntersectionsDlg::processObject()
     SalomeApp_Tools::QtCatchCorbaException(e);
     isFailed = true;
   }
-  if (isFailed) {
+
+  if (!anOper->IsDone()) {
+    aMsg += tr(anOper->GetErrorCode());
+    myGrp->TextView1->setText(aMsg);
+    return;
+  }
+  else if (isFailed) {
     aMsg += tr("GEOM_CHECK_SELF_INTERSECTIONS_FAILED");
     myGrp->TextView1->setText(aMsg);
     return;