- Timestamp:
- 08/02/12 09:52:47 (13 years ago)
- Location:
- issm/branches/trunk-jpl-damage
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/branches/trunk-jpl-damage
- Property svn:mergeinfo changed
/issm/trunk-jpl merged: 12260-12273
- Property svn:mergeinfo changed
-
issm/branches/trunk-jpl-damage/src/c/objects/Inputs/ControlInput.cpp
r12285 r12872 25 25 minvalues = NULL; 26 26 maxvalues = NULL; 27 threshvalues = NULL;28 27 gradient = NULL; 29 28 } 30 29 /*}}}*/ 31 /*FUNCTION ControlInput::ControlInput(int enum_type,int enum_input,double* pvalues,double* pmin,double* pmax, double* pthresh,int id){{{1*/32 ControlInput::ControlInput(int in_enum_type,int enum_input,double* pvalues,double* pmin,double* pmax, double* pthresh,int id){30 /*FUNCTION ControlInput::ControlInput(int enum_type,int enum_input,double* pvalues,double* pmin,double* pmax,int id){{{1*/ 31 ControlInput::ControlInput(int in_enum_type,int enum_input,double* pvalues,double* pmin,double* pmax,int id){ 33 32 34 33 control_id=id; … … 41 40 minvalues =new TriaP1Input(enum_type,pmin); 42 41 maxvalues =new TriaP1Input(enum_type,pmax); 43 threshvalues =new TriaP1Input(enum_type,pthresh);44 42 break; 45 43 case PentaP1InputEnum: … … 48 46 minvalues =new PentaP1Input(enum_type,pmin); 49 47 maxvalues =new PentaP1Input(enum_type,pmax); 50 threshvalues =new TriaP1Input(enum_type,pthresh);51 48 break; 52 49 default: … … 62 59 delete minvalues; 63 60 delete maxvalues; 64 delete threshvalues;65 61 delete gradient; 66 62 } … … 82 78 printf("---minvalues: \n"); if (minvalues) minvalues->Echo(); 83 79 printf("---maxvalues: \n"); if (maxvalues) maxvalues->Echo(); 84 printf("---threshvalues: \n"); if (threshvalues) threshvalues->Echo();85 80 printf("---gradient: \n"); if (gradient) gradient->Echo(); 86 81 } … … 160 155 } 161 156 162 /*marshal threshvalues*/163 if(!threshvalues){164 flag=0;165 memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag);166 }167 else{168 flag=1;169 memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag);170 this->threshvalues->Marshall(&marshalled_dataset);171 }172 173 157 /*marshal gradient*/ 174 158 if(!gradient){ … … 200 184 if(minvalues)size+=minvalues->MarshallSize(); 201 185 if(maxvalues)size+=maxvalues->MarshallSize(); 202 if(threshvalues)size+=threshvalues->MarshallSize();203 186 if(gradient) size+=gradient->MarshallSize(); 204 187 return size; … … 291 274 } 292 275 293 /*Demarshal threshvalues*/294 memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int);295 if(flag){296 memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int);297 if(input_enum_type==PentaP1InputEnum){298 threshvalues=new PentaP1Input();299 threshvalues->Demarshall(&marshalled_dataset);300 }301 else if(input_enum_type==TriaP1InputEnum){302 threshvalues=new TriaP1Input();303 threshvalues->Demarshall(&marshalled_dataset);304 }305 else _error_("Not supported yet");306 }307 else{308 threshvalues=NULL;309 }310 311 276 /*Demarshal gradient*/ 312 277 memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); … … 353 318 if(minvalues) output->minvalues=(Input*)this->minvalues->copy(); 354 319 if(maxvalues) output->maxvalues=(Input*)this->maxvalues->copy(); 355 if(threshvalues) output->threshvalues=(Input*)this->threshvalues->copy();356 320 if(gradient) output->gradient=(Input*)this->gradient->copy(); 357 321 … … 379 343 newvalues=this->values->PointwiseMax(minvalues); 380 344 delete values; this->values=newvalues; 381 newvalues=this->values->PointwiseThresh(threshvalues,minvalues); 382 delete values; this->values=newvalues; 383 }/*}}}*/ 384 /*FUNCTION ControlInput::Constrain(double min, double max, double thresh){{{1*/ 385 void ControlInput::Constrain(double min, double max, double thresh){ 386 values->Constrain(min,max,thresh); 345 }/*}}}*/ 346 /*FUNCTION ControlInput::Constrain(double min, double max){{{1*/ 347 void ControlInput::Constrain(double min, double max){ 348 values->Constrain(min,max); 387 349 }/*}}}*/ 388 350 /*FUNCTION ControlInput::Extrude{{{1*/
Note:
See TracChangeset
for help on using the changeset viewer.