Changeset 1596:44897b1ba4e2 in lemon-0.x for gui/graph_displayer_canvas-edge.cc

Timestamp:

07/27/05 13:19:35 (20 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2100

Message:

Sorry for the previous commit, it was not ready yet, but that damned up arrow... So in this new revision string-double and double-string conversion is corrected to a more C++ way.

File:

• gui/graph_displayer_canvas-edge.cc (modified) (2 diffs)

gui/graph_displayer_canvas-edge.cc

@@ -120 +120 @@
               edgemap_to_edit=mapname;
               double number=(*(mapstorage.edgemap_storage)[mapname])[i];
-//            int length=1;
-//            //if number is smaller than one, length would be negative, or invalid
-//            if(number>=1)
-//              {
-//                length=(int)(floor(log(number)/log(10)))+1;
-//              }
-//            int maxpos=(int)(pow(10,length-1));
-//            int strl=length+1+RANGE;
-//            char * str=new char[strl];
-//            str[length]='.';
-//            str[strl]='\0';
-      
-//            for(int j=0;j<strl;j++)
-//              {
-//                if(j!=length)
-//                  {
-//                    if((number-(int)number)>ALMOST_ONE)
-//                      {
-//                        number=round(number);
-//                      }
-//                    int digit=(int)(number/maxpos);
-//                    str[j]=(digit+'0');
-//                    number-=digit*maxpos;
-//                    number*=10;
-//                  }
-//              }
-//                    edgetextmap[i]->property_text().set_value(str);
 
               std::ostringstream ostr;
               ostr << number;
-
+              
               edgetextmap[i]->property_text().set_value(ostr.str());
             }
@@ -166 +139 @@
         {
           double number=(*(mapstorage.edgemap_storage)[mapname])[edge];
-          int length=1;
-          //if number is smaller than one, length would be negative, or invalid
-          if(number>=1)
-            {
-              length=(int)(floor(log(number)/log(10)))+1;
-            }
-          int maxpos=(int)(pow(10,length-1));
-          int strl=length+1+RANGE;
-          char * str=new char[strl];
-          str[length]='.';
-          str[strl]='\0';
-      
-          for(int j=0;j<strl;j++)
-            {
-              if(j!=length)
-                {
-                  if((number-(int)number)>ALMOST_ONE)
-                    {
-                      number=round(number);
-                    }
-                  int digit=(int)(number/maxpos);
-                  str[j]=(digit+'0');
-                  number-=digit*maxpos;
-                  number*=10;
-                }
-            }
-      
-          edgetextmap[edge]->property_text().set_value(str);
+
+          std::ostringstream ostr;
+          ostr << number;
+          
+          edgetextmap[edge]->property_text().set_value(ostr.str());
         }
       else