Changeset 704

Timestamp:

09/27/17 12:17:31 (7 years ago)

Author:

Maciej Komosinski

Message:

ParamInterface::getText() improved: removed pointless iteration when no ~enum is present (caused major performance hit for big integer values)

File:

• cpp/frams/param/param.cpp (modified) (3 diffs)

cpp/frams/param/param.cpp

@@ -702 +702 @@
 }
 
-SString ParamInterface::getText(int i)
+SString ParamInterface::getText(int i) //find the current enum text or call get(i) if not enum
 {
         const char *t;
-        if ((*(t = type(i))) == 'd')
+        if (((*(t = type(i))) == 'd') && (strchr(t, '~')!=NULL)) //type is int and contains enum labels
         {
                 paInt mn, mx, def;
@@ -712 +712 @@
                 {
                         if (value > mx)
-                                return get(i);
+                                return get(i);//unexpected value of out bounds (should never happen) -> fallback
                         value -= mn;
                 }
-                if (value < 0) return get(i);
-                for (; value >= 0; value--) if (t) t = strchr(t + 1, '~');
-                if (t)
+                if (value < 0) return get(i); //unexpected value of out bounds (should never happen) -> fallback
+                // now value is 0-based index of ~text
+                for (; value >= 0; value--) if (t) t = strchr(t + 1, '~'); else break;
+                if (t) // found n-th ~text in type description (else: not enough ~texts in type description)
                 {
                         t++;
@@ -725 +726 @@
                 }
         }
-        return get(i);
+        return get(i); //fallback - return int value as string
 }