WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom/Tools/tools.cpp

  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "tools.h"
+string niceTime()
+{
+    string result;
+    struct tm tmStruct;
+    time_t t = time(NULL);
+    gmtime_r(&t, &tmStruct);
+    result += lpad(itos(tmStruct.tm_hour), 2, '0');
+    result += ":";
+    result += lpad(itos(tmStruct.tm_min), 2, '0');
+    result += ":";
+    result += lpad(itos(tmStruct.tm_sec), 2, '0');
+    return result;
+}
 unsigned int bin2uint(string bin)
+{
     unsigned int num = 0;
+}
 string bin2hex(string bin)
+{
     string hex;
     while (bin.size() > 0)
+    {
         string part = bin.substr(0, 4);
         bin.erase(0, part.size());
     return hex;
+}
 string float2bin(float num, int length)
 {
     string bin;
     ///FIXME
     while (bin.size() < length)
         bin = "0" + bin;
     return bin;
 }
 string hex2bin(string hex)
+{
     hex = strtolower(hex);
             case 'c': bin += "1100"; break;
             case 'd': bin += "1101"; break;
             case 'e': bin += "1110"; break;
             case 'f': bin += "1111"; break;
+        }
     }
     return bin;
 }
 string uint2bin(unsigned int num, int length)
 {
     string bin;
     while (num)
+    {
         bin = char((num&1)+'0') + bin;
         num >>= 1;
     }
     while (bin.size() < length)
         bin = "0" + bin;
     return bin;
 }
+string uint2hex(unsigned int num, int length)
+{
+    return bin2hex(uint2bin(num, length));
+}
 vector<string> explode(string delimiter, string str)
+{
     vector<string> parts;
     string::size_type startPos = 0;
     string::size_type endPos = 0;
     while ((endPos = str.find(delimiter, startPos)) != string::npos)
+    {
         parts.push_back(str.substr(startPos, endPos-startPos));
         startPos = endPos+delimiter.length();
     }
     if (startPos < str.length())
+    {
         parts.push_back(str.substr(startPos, str.length()-startPos));
     }
     return parts;
 }
 string strtoupper(string s)
 {
     for (unsigned int n = 0; n < s.size(); n++)
         s[n] = (char)toupper(s[n]);
     return s;
+}
 string strtolower(string s)
+{
     for (unsigned int n = 0; n < s.size(); n++)
         s[n] = (char)tolower(s[n]);
     return s;
+}
 string trim(string s)
 {
     return trim(s, ' ');
 }
 string trim(string s, char c)
+{
     while (s[0] == c)
         s.erase(0, 1);
     while (s[s.length()-1] == c)
         s.erase(s.length()-1, 1);
     return s;
 }
 int stoi(const string s)
+{
     istringstream in(s);
     int i;
+    in >> i;
+    return i;
+}
+string itos(int i)
+{
+    ostringstream out;
+    out << i;
+    return out.str();
+}
+unsigned int stou(const string s)
+{
+    istringstream in(s);
+    unsigned int i;
     in >> i;
     return i;
+}
-string itos(int i)
+string utos(unsigned int i)
+{
     ostringstream out;
     out << i;
     return out.str();
+}

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom/Tools/tools.cpp @ 989 – Rev 976 → 981