Changed UserBreak message

BOPAlgo_ArgumentAnalyzer processes only UserBreak

diff --git a/src/BOPAlgo/BOPAlgo_Alerts.hxx b/src/BOPAlgo/BOPAlgo_Alerts.hxx
index 8b9a2e37da941f72d9cf3254c22c679f3f0369a3..7a77adee1fe12ee2810d1fe5e408595cb82cbec4 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_Alerts.hxx
+++ b/src/BOPAlgo/BOPAlgo_Alerts.hxx
@@ -19,7 +19,7 @@
 #include <TopoDS_AlertWithShape.hxx>
 
 //! Boolean operation was stoped by user
-DEFINE_SIMPLE_ALERT(BOPAlgo_AlertBOPUserBreak)
+DEFINE_SIMPLE_ALERT(BOPAlgo_AlertUserBreak)
 
 //! Boolean operation of given type is not allowed on the given inputs
 DEFINE_SIMPLE_ALERT(BOPAlgo_AlertBOPNotAllowed)

diff --git a/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx b/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx
index 76f2c5dd9c143403852247b396aaff7609c0368b..d2385156f15fcc5a7404ffd22bb79822355c4484 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx
+++ b/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx
@@ -175,7 +175,7 @@ void BOPAlgo_ArgumentAnalyzer::Perform(const Message_ProgressRange& theRange)
     //
     // 3. Test self-interference
     if(mySelfInterMode) {
-      TestSelfInterferences(aPS.Next());
+      TestSelfInterferences();
       if (UserBreak(aPS))
       {
         return;
@@ -350,11 +350,10 @@ void BOPAlgo_ArgumentAnalyzer::TestTypes()
 //function : TestSelfInterferences
 //purpose  : 
 //=======================================================================
-void BOPAlgo_ArgumentAnalyzer::TestSelfInterferences(const Message_ProgressRange& theRange)
+void BOPAlgo_ArgumentAnalyzer::TestSelfInterferences()
 {
   Standard_Integer ii;
   //
-  Message_ProgressScope aPS(theRange, NULL, 2);
   for(ii = 0; ii < 2; ii++) {
     const TopoDS_Shape& aS = (ii == 0) ? myShape1 : myShape2;
     if(aS.IsNull()) {
@@ -377,11 +376,8 @@ void BOPAlgo_ArgumentAnalyzer::TestSelfInterferences(const Message_ProgressRange
     aChecker.SetRunParallel(myRunParallel);
     aChecker.SetFuzzyValue(myFuzzyValue);
     //
-    aChecker.Perform(aPS.Next());
-    if (UserBreak(aPS))
-    {
-      return;
-    }
+    aChecker.Perform();
+   
     Standard_Boolean hasError = aChecker.HasErrors();
     //
     const BOPDS_DS& aDS=*(aChecker.PDS());

diff --git a/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.hxx b/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.hxx
index 2c127cf55ebd37ed6a38f76f2d5584322d1c2166..fa2f528da44c00b9da2a838dfdd2307a8ea9e35c 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.hxx
+++ b/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.hxx
@@ -114,7 +114,7 @@ protected:
   
   Standard_EXPORT void TestTypes();
   
-  Standard_EXPORT void TestSelfInterferences(const Message_ProgressRange& theRange);
+  Standard_EXPORT void TestSelfInterferences();
   
   Standard_EXPORT void TestSmallEdge();
   

diff --git a/src/BOPAlgo/BOPAlgo_Options.cxx b/src/BOPAlgo/BOPAlgo_Options.cxx
index 5beda282059c1c40325077f8b0e3123aec3d617a..7dbc488c1f74e53281056c29ee1fe017ca47825c 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_Options.cxx
+++ b/src/BOPAlgo/BOPAlgo_Options.cxx
@@ -132,7 +132,7 @@ Standard_EXPORT Standard_Boolean BOPAlgo_Options::UserBreak(const Message_Progre
 {
   if (aPS.UserBreak())
   {
-    AddError(new BOPAlgo_AlertBOPUserBreak);
+    AddError(new BOPAlgo_AlertUserBreak);
     return Standard_True;
   }
   else