Changeset 16792

Timestamp:

11/15/13 16:17:59 (11 years ago)

Author:

Eric.Larour

Message:

CHG: making a new SetParam functionality in Parameters for DataSetParam type objects.

Location:

issm/trunk-jpl/src/c/classes/Params

Files:

• DataSetParam.h (modified) (1 diff)
• Parameters.cpp (modified) (2 diffs)
• Parameters.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Params/DataSetParam.h

@@ -22 +22 @@
         private: 
                 int   enum_type;
+
+        public:
                 DataSet* value;
 
-        public:
                 /*DataSetParam constructors, destructors: {{{*/
                 DataSetParam();

issm/trunk-jpl/src/c/classes/Params/Parameters.cpp

@@ -21 +21 @@
 #include "./BoolParam.h"
 #include "./DoubleMatParam.h"
+#include "./DataSetParam.h"
 #include "./DoubleParam.h"
 #include "./DoubleVecParam.h"
@@ -472 +473 @@
         if(param) param->SetValue(fid); //already exists, just set it.
         else this->AddObject(new FileParam(enum_type,fid)); //just add the new parameter.
+}
+/*}}}*/
+/*FUNCTION Parameters::SetParam(DataSet* dataset, int enum_type);{{{*/
+void   Parameters::SetParam(DataSet* dataset,int enum_type){
+
+        Param* param=NULL;
+
+        /*first, figure out if the param has already been created: */
+        param=dynamic_cast<Param*>(this->FindParamObject(enum_type));
+
+        if(param) param->SetValue(dataset); //already exists, just set it.
+        else this->AddObject(new DataSetParam(enum_type,dataset)); //just add the new parameter.
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Params/Parameters.h

@@ -52 +52 @@
                 void  SetParam(Matrix<IssmDouble>* mat,int enum_type);
                 void  SetParam(FILE* fid,int enum_type);
+                void  SetParam(DataSet* dataset,int enum_type);
 
                 Object* FindParamObject(int enum_type);