Changeset 804
- Timestamp:
- 06/07/18 17:43:19 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/genetics/f4/f4_conv.cpp
r783 r804 30 30 f4_Model *model = new f4_Model(); 31 31 res = model->buildFromF4(in, using_checkpoints); 32 if (GENOPER_OK != res) return SString(); // oops 32 if (GENOPER_OK != res) 33 { 34 delete model; 35 return SString(); // oops 36 } 33 37 if (NULL != map) 34 38 // generate to-f0 conversion map … … 54 58 f4_Model *model = new f4_Model(); 55 59 res = model->buildFromF4(in, using_checkpoints); 56 if (GENOPER_OK != res) return SString(); // oops 60 if (GENOPER_OK != res) 61 { 62 delete model; 63 return SString(); // oops 64 } 57 65 SString out; 58 66 model->toF1Geno(out); … … 302 310 if (C->links[j]->t == "*" || C->links[j]->t == "S" || C->links[j]->t == "T") 303 311 { 312 partno = C->dadlink->p2_refno; 304 313 sprintf(tmpLine, "p=%d,d=\"%s\"", partno, nclass); 305 314 } … … 315 324 else if (sensortest->getPreferredLocation() == 1) 316 325 { 326 partno = C->dadlink->p2_refno; 317 327 sprintf(tmpLine, "p=%d,d=\"%s\"", partno, nclass); 318 328 }
Note: See TracChangeset
for help on using the changeset viewer.