Changeset 311 for cpp

Timestamp:

01/26/15 07:31:30 (10 years ago)

Author:

Maciej Komosinski

Message:

More fields and test cases

Location:

cpp/frams/_demos

Files:

• loader_test_param.cpp (modified) (4 diffs)
• loader_test_param.in (modified) (3 diffs)

cpp/frams/_demos/loader_test_param.cpp

@@ -21 +21 @@
 {
 public:
-        SString text, longtext;
+        SString text, longtext, deftext;
         int i1, i2, i3;
         float f1, f2, f3;
         ExtValue x;
+        int notchanged,notloaded,notsaved;
 };
 
@@ -30 +31 @@
 ParamEntry data_paramtab[] =
 {
-        { "Data", 1, 8, "data", },
+        { "Data", 1, 12, "data", },
         { "text", 0, 0, "Text", "s 0 10", FIELD(text), }, // 10 = length limit
         { "longtext", 0, 0, "Long text", "s 1", FIELD(longtext), }, // 1 = multiline, 0 = unlimited
+        { "deftext", 0, 0, "Text with default value", "s 0 0 some text", FIELD(deftext), },
         { "i1", 0, 0, "Integer 1", "d", FIELD(i1), },          // unrestricted integer
         { "i2", 0, 0, "Integer 2", "d -5 5 1", FIELD(i2), }, // [-5..5] integer, default=1
-        { "i3", 0, 0, "Integer 3", "d 0 3 0 ~Zero~One~Two~Three", FIELD(i3), }, // [0..3] + text labels (Param::getText())
+        { "i3", 0, 0, "Integer 3", "d -1 3 0 ~Minus~Zero~One~Two~Three", FIELD(i3), }, // [0..3] + text labels (Param::getText())
         { "f1", 0, 0, "Float 1", "d", FIELD(f1), },          // unrestricted float
         { "f2", 0, 0, "Float 2", "f -100 100 -100", FIELD(f2), }, // [-100..100] float, default=-100
         { "x", 0, 0, "Untyped", "x", FIELD(x), }, // any type (class ExtValue)
+        { "notchanged", 0, PARAM_READONLY, "Read only field", "d", FIELD(notchanged), }, // neither load() nor setDefault() can change this
+        { "notloaded", 0, PARAM_DONTLOAD, "Unloadable field", "d", FIELD(notloaded), }, // load() does not change this
+        { "notsaved", 0, PARAM_DONTSAVE, "Unsaveable field", "d", FIELD(notsaved), }, // save() skips this field
         { 0, 0, 0, },
 };
@@ -59 +64 @@
         Data data;
         Param param(data_paramtab, &data);
+
+        data.notchanged=100;
+        data.notloaded=200;
 
         loader.addObject(&param);
@@ -82 +90 @@
                 case MultiParamLoader::BeforeObject:
                         fprintf(stderr, "----- object found, loading...\n");
+                        data.notchanged++;
                         param.setDefault(); //reset (initialize) struct contents
                         break;

cpp/frams/_demos/loader_test_param.in

@@ -9 +9 @@
 333\ \\
 4444~
+deftext:other
 i1:-12345
 i2:10
@@ -15 +16 @@
 f2:222
 x:3.14
+notloaded:44
+unchanged:444
+notsaved:4444
 
 #all fields except x will have default values
@@ -25 +29 @@
 i2:-99999
 i3:99999
+x:@Serialized:[1,2,3,1.00000,2e0,3.0,"x","]","\""]
 
+data:
+i1:0x100
+i2:1e2
+i3:-10
+x:@Serialized:{"a":[1,2,3],"b":"abc","c":1.23}