Changeset 273
- Timestamp:
- 12/18/14 12:45:27 (10 years ago)
- Location:
- cpp/frams
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/model/model.h
r269 r273 394 394 void disturb(double amount); 395 395 396 /// build this model using new shapes, based on the provided model that uses old shapes. See also shapeconvert.cpp. 396 397 void buildUsingNewShapes(const Model& src_old_shapes, Part::Shape default_shape = Part::SHAPE_CYLINDER, float thickness = 0.2); 397 398 -
cpp/frams/param/param.cpp
r268 r273 263 263 if ((flags(i)&PARAM_DONTSAVE) && (!force)) return 0; 264 264 const char *typ = type(i); 265 if ( (*typ == 'p') || (*typ == 'o')) return 0;265 if (*typ == 'p') return 0; 266 266 267 267 const char *t, *w; … … 271 271 err |= (fputs(p, f) == EOF); fputc(':', f); 272 272 cr = 0; 273 if ( *typ == 'x')273 if ((*typ == 'x')||(*typ == 'o')) 274 274 { 275 275 ExtValue ex; … … 544 544 int ParamInterface::set(int i, const char *v) 545 545 { 546 switch (type(i)[0]) 546 char typ=type(i)[0]; 547 switch (typ) 547 548 { 548 549 case 'd': return setInt(i, v); 549 550 case 'f': return setDouble(i, v); 550 551 case 's': { SString t(v); return setString(i, t); } 551 case 'x': 552 case 'x': case 'o': 552 553 { 553 554 ExtValue e; … … 567 568 e.setString(SString(v)); 568 569 } 569 return setExtValue(i, e); 570 if (typ=='x') 571 return setExtValue(i, e); 572 else 573 return setObject(i, e.getObject()); 570 574 } 571 575 } -
cpp/frams/param/paramobj.cpp
r197 r273 57 57 t->type=maybedup(dupentries,pi->type(i)); 58 58 t->help=maybedup(dupentries,pi->help(i)); 59 t++; 60 n++; 59 t++; n++; offs++; 61 60 if (n>count) break; 62 61 } 63 offs++;64 62 } 65 63 } -
cpp/frams/util/extvalue.cpp
r257 r273 105 105 SString ExtObject::toString() const 106 106 { 107 if (isEmpty()) return SString(" <empty object>");107 if (isEmpty()) return SString("null"); 108 108 Param tmp_param; 109 109 ParamInterface *p=getParamInterface(tmp_param); … … 187 187 return SString::sprintf("^%d",ref); 188 188 189 if (isEmpty()) return SString( );189 if (isEmpty()) return SString("null"); 190 190 VectorObject *vec=VectorObject::fromObject(*this,false); 191 191 if (vec)
Note: See TracChangeset
for help on using the changeset viewer.