Changeset 3857 for issm/trunk

Timestamp:

05/19/10 16:43:43 (15 years ago)

Author:

seroussi

Message:

need to erase oldenum when changing enums

File:

• issm/trunk/src/c/DataSet/Inputs.cpp (modified) (2 diffs)

issm/trunk/src/c/DataSet/Inputs.cpp

@@ -486 +486 @@
 /*}}}*/
 /*FUNCTION Inputs::ChangeEnum{{{1*/
-void  Inputs::ChangeEnum(int enumtype,int newenumtype){
+void  Inputs::ChangeEnum(int oldenumtype,int newenumtype){
 
         /*Go through dataset of inputs and look for input with 
@@ -493 +493 @@
         Input* input=NULL;
 
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
-
-                input=(Input*)(*object); 
-
-                if (input->EnumType()==enumtype){
+        /*Delete existing input of newenumtype if it exists*/
+        for ( object=objects.begin() ; object < objects.end(); object++ ){
+                input=(Input*)(*object); 
+
+                if (input->EnumType()==newenumtype){
+                        this->DeleteObject(input);
+                        break;
+                }
+        }
+
+        /*Change enum_type of input of oldenumtype*/
+        for ( object=objects.begin() ; object < objects.end(); object++ ){
+
+                input=(Input*)(*object); 
+
+                if (input->EnumType()==oldenumtype){
                         input->ChangeEnum(newenumtype);
                         break;