Changeset 1917

Timestamp:

06/16/12 22:06:02 (11 months ago)

Author:

philmoz

Message:

Merged revision(s) 1916 from trunk:
Update for script '@range' parameter option to support signed and unsigned ranges.

Location:

branches/release-1_0

Files:

• . (modified) (1 prop)
• core/gui.c (modified) (1 diff)
• core/script.c (modified) (2 diffs)
• include/script.h (modified) (1 diff)

branches/release-1_0/core/gui.c

@@ -1383 +1383 @@
             if (script_range_values[n] != 0)
             {
-                if (script_range_values[n] == MENU_MINMAX(0,1))
-                {
-                    script_submenu_items[p].type = MENUITEM_BOOL;
-                }
-                else
-                {
-                    script_submenu_items[p].type |= MENUITEM_F_MINMAX;
-                    script_submenu_items[p].arg = script_range_values[n];
-                }
+                script_submenu_items[p].type = script_range_types[n];
+                script_submenu_items[p].arg = script_range_values[n];
             }
             else if (script_named_counts[n] != 0)

branches/release-1_0/core/script.c

@@ -105 +105 @@
 
 char script_params[SCRIPT_NUM_PARAMS][28];                  // Parameter title
-int script_param_order[SCRIPT_NUM_PARAMS];                  // Ordered as_in_script list of variables ( [idx] = id_of_var )
+short script_param_order[SCRIPT_NUM_PARAMS];                // Ordered as_in_script list of variables ( [idx] = id_of_var )
                                                             // to display in same order in script
 int script_range_values[SCRIPT_NUM_PARAMS];                 // Min/Max values for param validation
+short script_range_types[SCRIPT_NUM_PARAMS];                // Specifies if range values is signed (-9999-32767) or unsigned (0-65535)
+                                                            // Note: -9999 limit on negative values is due to current gui_menu code (and because menu only displays chars)
 const char **script_named_values[SCRIPT_NUM_PARAMS];        // Array of list values for named parameters
 int script_named_counts[SCRIPT_NUM_PARAMS];                 // Count of # of entries in each script_list_values array
@@ -211 +213 @@
         if (!update || script_params_update[n])
         {
-            short min = strtol(ptr,NULL,0);
+            int min = strtol(ptr,NULL,0);
             ptr = skip_whitespace(skip_token(ptr));
-            short max = strtol(ptr,NULL,0);
+            int max = strtol(ptr,NULL,0);
             script_range_values[n] = MENU_MINMAX(min,max);
+            if ((min == 0) && (max == 1))
+                script_range_types[n] = MENUITEM_BOOL;
+            else if ((min >= 0) && (max >= 0)) 
+                script_range_types[n] = MENUITEM_INT|MENUITEM_F_MINMAX|MENUITEM_F_UNSIGNED;
+            else
+                script_range_types[n] = MENUITEM_INT|MENUITEM_F_MINMAX;
         }
     } // ??? else produce error message

branches/release-1_0/include/script.h

@@ -21 +21 @@
 extern char script_params[SCRIPT_NUM_PARAMS][28];
 extern int script_range_values[SCRIPT_NUM_PARAMS];
-extern int script_param_order[SCRIPT_NUM_PARAMS];
+extern short script_range_types[SCRIPT_NUM_PARAMS];
+extern short script_param_order[SCRIPT_NUM_PARAMS];
 extern const char **script_named_values[SCRIPT_NUM_PARAMS];
 extern int script_named_counts[SCRIPT_NUM_PARAMS];