Changeset 273 for cpp/frams

Timestamp:

12/18/14 12:45:27 (10 years ago)

Author:

Maciej Komosinski

Message:

• 'o'-type fields are no longer ignored when saving (serialization like 'x')
• fixed incorrect paramtab offset generation in ParamObject::makeParamTab()

Location:

cpp/frams

Files:

• model/model.h (modified) (1 diff)
• param/param.cpp (modified) (4 diffs)
• param/paramobj.cpp (modified) (1 diff)
• util/extvalue.cpp (modified) (2 diffs)

cpp/frams/model/model.h

@@ -394 +394 @@
 void disturb(double amount);
 
+/// build this model using new shapes, based on the provided model that uses old shapes. See also shapeconvert.cpp.
 void buildUsingNewShapes(const Model& src_old_shapes, Part::Shape default_shape = Part::SHAPE_CYLINDER, float thickness = 0.2);
 

cpp/frams/param/param.cpp

@@ -263 +263 @@
         if ((flags(i)&PARAM_DONTSAVE) && (!force)) return 0;
         const char *typ = type(i);
-        if ((*typ == 'p') || (*typ == 'o')) return 0;
+        if (*typ == 'p') return 0;
 
         const char *t, *w;
@@ -271 +271 @@
         err |= (fputs(p, f) == EOF); fputc(':', f);
         cr = 0;
-        if (*typ == 'x')
+        if ((*typ == 'x')||(*typ == 'o'))
         {
                 ExtValue ex;
@@ -544 +544 @@
 int ParamInterface::set(int i, const char *v)
 {
-        switch (type(i)[0])
+        char typ=type(i)[0];
+        switch (typ)
         {
         case 'd': return setInt(i, v);
         case 'f': return setDouble(i, v);
         case 's': { SString t(v); return setString(i, t); }
-        case 'x':
+        case 'x': case 'o':
         {
                 ExtValue e;
@@ -567 +568 @@
                         e.setString(SString(v));
                 }
-                return setExtValue(i, e);
+                if (typ=='x')
+                        return setExtValue(i, e);
+                else
+                        return setObject(i, e.getObject());
         }
         }

cpp/frams/param/paramobj.cpp

@@ -57 +57 @@
                         t->type=maybedup(dupentries,pi->type(i));
                         t->help=maybedup(dupentries,pi->help(i));
-                        t++;
-                        n++;
+                        t++; n++; offs++;
                         if (n>count) break;
                         }
-                offs++;
                 }
         }

cpp/frams/util/extvalue.cpp

@@ -105 +105 @@
 SString ExtObject::toString() const
 {
-if (isEmpty()) return SString("<empty object>");
+if (isEmpty()) return SString("null");
 Param tmp_param;
 ParamInterface *p=getParamInterface(tmp_param);
@@ -187 +187 @@
         return SString::sprintf("^%d",ref);
 
-if (isEmpty()) return SString();
+if (isEmpty()) return SString("null");
 VectorObject *vec=VectorObject::fromObject(*this,false);
 if (vec)