Changeset 1581 for trunk/src/objects/RpNumber.h

Timestamp:

Oct 17, 2009, 9:01:23 PM (15 years ago)

Author:

dkearney

Message:

updates for the rappture objects, object examples, and object apis. small fix for rpunits c interface to check string length. there should probably be more of these checks in the c interface, but units should also be rewritten. added folders to separate out octave2 and octave3 app-fermi examples

File:

• trunk/src/objects/RpNumber.h (modified) (4 diffs)

trunk/src/objects/RpNumber.h

@@ -39 +39 @@
         void units(const char *p);
 
+        int minset() const;
+        int maxset() const;
+        int defset() const;
+        int curset() const;
+
         // convert the value stored in this object to specified units
         // does not return the converted value
         // error code is returned
-        int convert(const char *to);
+        Outcome& convert(const char *to);
 
         // get the value of this object converted to specified units
         // does not change the value of the object
         // error code is returned
-        int value(const char *units, double *value) const;
+        double value(const char *units) const;
+        void vvalue(void *storage, size_t numHints, va_list arg) const;
 
         Number& addPreset(const char *label, const char *desc,
@@ -57 +63 @@
         Number& delPreset(const char *label);
 
-
-        void configure(size_t as, ClientData c);
-        void dump(size_t as, ClientData c);
 
         const int is() const;
@@ -73 +76 @@
         int _minSet;
         int _maxSet;
+        int _defSet;
+        int _curSet;
 
         // hash or linked list of preset values
@@ -84 +89 @@
         };
 
-        void __configureFromXml(ClientData c);
         void __configureFromTree(ClientData c);
-        void __dumpToXml(ClientData c);
         void __dumpToTree(ClientData c);
+
+        void __convertFromString(const char *val, double *ret);
+        void __valUnitsSplit( const char *inStr, double *val,
+                const char **units);
 };