ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-09 00:07:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed:

Browse Source 
Bug IPAL9938
Strange "ERROR" message appears in terminal during curve creation.
This commit is contained in:
enk 2005-09-12 08:01:11 +00:00
parent e27a43895a
commit 01adc22141
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BasicGUI/BasicGUI_CurveDlg.cxx
View File

@ -224,7 +224,7 @@ static int isPointInList(list<GEOM::GEOM_Object_var>& thePoints,
} }
//================================================================================= //=================================================================================
/*! function : removeUnnecessaryPnt() /*! function : removeUnnecessaryPnt()
* purpose : Remove unnecessary point from list \a theOldPoints * purpose : Remove unnecessary points from list \a theOldPoints
* \author enk * \author enk
* \li \a theOldPoints - ordered sequence with unnecessary point * \li \a theOldPoints - ordered sequence with unnecessary point
* \li \a theNewPoints - not ordered sequence with necessary points * \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, static void removeUnnecessaryPnt(list<GEOM::GEOM_Object_var>& theOldPoints,
GEOM::ListOfGO_var& theNewPoints) 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++){ for(list<GEOM::GEOM_Object_var>::iterator i=theOldPoints.begin();i!=theOldPoints.end();i++){
bool found = false; bool found = false;
for (int j=0;j<theNewPoints->length() && !found ; j++){ for (int j=0;j<theNewPoints->length() && !found ; j++){
@ -241,10 +242,13 @@ static void removeUnnecessaryPnt(list<GEOM::GEOM_Object_var>& theOldPoints,
} }
} }
if(!found){ if(!found){
theOldPoints.remove(*i); objs_to_remove.push_back(*i);
return; //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++) for (list<GEOM::GEOM_Object_var>::iterator j=myOrderedSel.begin();j!=myOrderedSel.end();j++)
myPoints[k++] = *j; myPoints[k++] = *j;
} else { } 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 ) if ( i )
GroupPoints->LineEdit1->setText( QString::number( i ) + "_" + tr( "GEOM_POINT" ) + tr( "_S_" ) ); GroupPoints->LineEdit1->setText( QString::number( i ) + "_" + tr( "GEOM_POINT" ) + tr( "_S_" ) );