Changeset 639 for cpp/frams

Timestamp:

12/05/16 02:29:50 (8 years ago)

Author:

Maciej Komosinski

Message:

Introduced separate functions for formatting time.

Location:

cpp/frams

Files:

• _demos/genotypeloader.cpp (modified) (1 diff)
• util/extvalue.cpp (modified) (3 diffs)
• util/extvalue.h (modified) (1 diff)

cpp/frams/_demos/genotypeloader.cpp

@@ -13 +13 @@
         { "genotype", 0, 0, "Genotype", "s 1", FIELD(genotype), "Genes as a string of characters.", },
 
-        { "info_timestamp", 1, 0, "Creation time", "fd 0 -1 0", FIELD(info_timestamp), },
+        { "info_timestamp", 1, 0, "Last modified", "ft 0 -1 0", FIELD(info_timestamp), },
         { "info_author", 1, 0, "Author name", "s 0 100", FIELD(info_author), },
         { "info_author_ispublic", 1, 0, "Author name is public", "d 0 1 1", FIELD(info_author_ispublic), },

cpp/frams/util/extvalue.cpp

@@ -746 +746 @@
 }
 
-SString ExtValue::format(SString& fmt, const ExtValue **values, int count)
+SString ExtValue::formatTime(char fmt, double value)
+{
+if (fmt=='i')
+        { //could be Convert::ctime()
+        int d,h,m,ti=value;
+        int ms=1000*(value-ti);
+        d=ti/86400; ti-=d*86400;
+        h=ti/3600; ti-=h*3600;
+        m=ti/60; ti-=m*60;
+        SString ret;
+        if (d>0) ret+=SString::sprintf("%dd ",d);
+        if (h>0) ret+=SString::sprintf("%d:",h);
+        ret+=SString::sprintf("%02d:%02d.%03d", m,ti,ms);
+        return ret;
+        }
+time_t ti = value;
+struct tm tm = Convert::localtime(ti);
+switch(fmt)
+        {
+        case 'T': return SString::sprintf("%04d-%02d-%02d %02d:%02d:%02d", 1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
+        case 't': return SString(Convert::asctime(tm).c_str());
+        case 'y': return SString::sprintf("%04d-%02d-%02d", 1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday);
+        case 'm': return SString::sprintf("%04d-%02d-%02d %02d:%02d:%02d.%03d", 1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, int(1000*(value-(double)ti)));
+        }
+return SString();
+}
+
+SString ExtValue::format(const SString& fmt, const ExtValue **values, int count)
 {
         SString ret;
@@ -788 +815 @@
                                 case 'f': case 'g': case 'e': type = 'f'; t = next; break;
                                 case 's': type = 's'; t = next; break;
-                                case 't': case 'T': type = *t; t = next; break;
+                                case 't': case 'T': case 'y': case 'i': case 'm': type = *t; t = next; break;
                                 case '%': if (t > begin) { type = *t; t = next; } break;
                         }
@@ -805 +832 @@
                 case 'f': a = args.getNext(); ret += SString::sprintf(sub.c_str(), a ? a->getDouble() : 0); break;
                 case 's': {a = args.getNext(); SString tmp; if (a) tmp = a->getString(); ret += SString::sprintf(sub.c_str(), tmp.c_str()); } break;
-                case 't': case 'T':
-                {
+                case 't': case 'T': case 'i': case 'y': case 'm':
                         a = args.getNext();
-                        time_t ti = a ? a->getInt() : 0;
-                        struct tm tm = Convert::localtime(ti);
-                        SString timtxt;
-                        if (type == 'T')
-                                timtxt = SString::sprintf("%04d-%02d-%02d %02d:%02d:%02d", 1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
-                        else
-                                timtxt = Convert::asctime(tm).c_str();
-                        ret += timtxt;
+                        ret += formatTime(type,a ? a->getDouble() : 0);
                         ret += sub.substr(2);
-                }
                         break;
                 case '%': ret += '%'; ret += sub.substr(2); break;

cpp/frams/util/extvalue.h

@@ -219 +219 @@
         };
 
-        static SString format(SString& fmt, const ExtValue **values, int count);
+        static SString formatTime(char fmt, double value);
+        static SString format(const SString& fmt, const ExtValue **values, int count);
 
         ExtValue getExtType();