From: enk <enk@opencascade.com>
Date: Mon, 12 Sep 2005 08:01:11 +0000 (+0000)
Subject: Fixed:
X-Git-Tag: V3_1_0a1~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=01adc22141c7a712de3fe506fbb7753d4ba06389;p=modules%2Fgeom.git

Fixed:
Bug IPAL9938
Strange "ERROR" message appears in terminal during curve creation.
---

diff --git a/src/BasicGUI/BasicGUI_CurveDlg.cxx b/src/BasicGUI/BasicGUI_CurveDlg.cxx
index 598c5f47b..8fba90e2f 100644
--- a/src/BasicGUI/BasicGUI_CurveDlg.cxx
+++ b/src/BasicGUI/BasicGUI_CurveDlg.cxx
@@ -224,7 +224,7 @@ static int isPointInList(list<GEOM::GEOM_Object_var>& thePoints,
 }
 //=================================================================================
 /*! function : removeUnnecessaryPnt()
- *  purpose  : Remove unnecessary point from list \a theOldPoints
+ *  purpose  : Remove unnecessary points from list \a theOldPoints
  * \author enk
  * \li \a theOldPoints - ordered sequence with unnecessary point
  * \li \a theNewPoints - not ordered sequence with necessary points
@@ -233,6 +233,7 @@ static int isPointInList(list<GEOM::GEOM_Object_var>& thePoints,
 static void removeUnnecessaryPnt(list<GEOM::GEOM_Object_var>& theOldPoints,
 				 GEOM::ListOfGO_var& theNewPoints)
 {
+  list<GEOM::GEOM_Object_var> objs_to_remove;
   for(list<GEOM::GEOM_Object_var>::iterator i=theOldPoints.begin();i!=theOldPoints.end();i++){
     bool found = false;
     for (int j=0;j<theNewPoints->length() && !found ; j++){
@@ -241,10 +242,13 @@ static void removeUnnecessaryPnt(list<GEOM::GEOM_Object_var>& theOldPoints,
       }
     }
     if(!found){
-      theOldPoints.remove(*i);
-      return;
+      objs_to_remove.push_back(*i);
+      //cout << "removed: " << (*i)->GetEntry() << endl;
     }
   }
+  for(list<GEOM::GEOM_Object_var>::iterator i=objs_to_remove.begin();i!=objs_to_remove.end();i++){
+    theOldPoints.remove(*i);
+  }
 }
 
 //=================================================================================
@@ -286,7 +290,7 @@ void BasicGUI_CurveDlg::SelectionIntoArgument()
     for (list<GEOM::GEOM_Object_var>::iterator j=myOrderedSel.begin();j!=myOrderedSel.end();j++)
       myPoints[k++] = *j;
   } else {
-    cout << "ERROR: Ordered sequence size != selection sequence size! ("<<myOrderedSel.size()<<"!="<<myPoints->length()<<")"<<endl;
+    //cout << "ERROR: Ordered sequence size != selection sequence size! ("<<myOrderedSel.size()<<"!="<<myPoints->length()<<")"<<endl;
   }
   if ( i )
     GroupPoints->LineEdit1->setText( QString::number( i ) + "_" + tr( "GEOM_POINT" ) + tr( "_S_" ) );