Changeset 467

Timestamp:

02/07/16 23:21:55 (9 years ago)

Author:

Maciej Komosinski

Message:

GenMan? interface uses STL std::string instead of SString

Location:

cpp/frams/genetics

Files:

• genman.cpp (modified) (3 diffs)
• genman.h (modified) (2 diffs)

cpp/frams/genetics/genman.cpp

@@ -395 +395 @@
 }
 
-SString GenMan::HTMLize(const char *g) { return HTMLize(g, false); }
-
-SString GenMan::HTMLizeShort(const char *g) { return HTMLize(g, true); }
-
-SString GenMan::HTMLize(const char *g, bool shorten)
+string GenMan::HTMLize(const char *g) { return HTMLize(g, false); }
+
+string GenMan::HTMLizeShort(const char *g) { return HTMLize(g, true); }
+
+string GenMan::HTMLize(const char *g, bool shorten)
 {
         char buf[50];
@@ -407 +407 @@
         uint32_t *styletab = new uint32_t[len];
         GetFullStyle(g, styletab);
-        SString html = "\n<div style=\"background:white;padding:0.2em;font-family:arial,helvetica,sans-serif;font-size:90%\">";
+        string html = "\n<div style=\"background:white;padding:0.2em;font-family:arial,helvetica,sans-serif;font-size:90%\">";
         uint32_t prevstyle, prevcolor, style = 0, color = 0;
         for (int i = 0; i<len; i++)
@@ -448 +448 @@
 void GenMan::p_htmlize(ExtValue *args, ExtValue *ret)
 {
-        ret->setString(HTMLize(args->getString().c_str()));
+        ret->setString(HTMLize(args->getString().c_str()).c_str());
 }
 
 void GenMan::p_htmlizeshort(ExtValue *args, ExtValue *ret)
 {
-        ret->setString(HTMLizeShort(args->getString().c_str()));
+        ret->setString(HTMLizeShort(args->getString().c_str()).c_str());
 }
 

cpp/frams/genetics/genman.h

@@ -48 +48 @@
         uint32_t Style(const char* g, int pos); //returns Style (and validity) of a genotype char.
         void GetFullStyle(const char *g, uint32_t *styletab); //optimized. Fills styletab with styles for all genotype chars. sizeof(*styletab) must be at least strlen(g).
-        SString HTMLize(const char *g); //returns colored genotype in HTML.
-        SString HTMLizeShort(const char *g); //returns colored genotype (abbreviated if needed) in HTML.
+        string HTMLize(const char *g); //returns colored genotype in HTML.
+        string HTMLizeShort(const char *g); //returns colored genotype (abbreviated if needed) in HTML.
         Geno GetSimplest(char format); ///<returns pointer to the simplest genotype of \e format or empty Geno()
         const char *GetOpName(char format); ///<returns pointer to the active operator set for \e format
@@ -57 +57 @@
         void saveLink(const string parent1, const string parent2, const string child, const float chg);
         GenoOperators* getOper_f(char format);
-        SString HTMLize(const char *g, bool shorten);
+        string HTMLize(const char *g, bool shorten);
 public:
         vector<GenoLink> GenoLinkList;