Changeset 118:cfd49e5c8723 in glemon-0.x for new_map_win.cc

Timestamp:

01/10/06 16:15:57 (18 years ago)

Author:

Hegyi Péter

Branch:

gui

Phase:

public

Convert:

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

Message:

If default value of a new map is constant, the newly created elements will get that value as well. Documentation is added to BrokenEdge?, MapStorage? and GraphDisplazCanvas? classes.

File:

• new_map_win.cc (modified) (3 diffs)

new_map_win.cc

@@ -73 +73 @@
       //get and formulate text
       std::string def_val_str=default_value.get_text();
-      std::string polishform=string2Polishform(def_val_str,edge.get_active());
+
+      bool only_nums=true;
+      for(int i=0;i<(int)def_val_str.size() && only_nums;i++)
+        {
+          if( def_val_str[i]<'0' || def_val_str[i]>'9' )
+            {
+              only_nums=false;
+            }
+        }
+      std::string polishform;
+
+      if(only_nums)
+        {
+          def_val=atof(def_val_str.c_str());
+        }
+      else
+        {
+          polishform=string2Polishform(def_val_str,edge.get_active());
+        }
 
       //get name of text
       std::string mapname=name.get_text();
-
-      if(!mapname.empty()&&!polishform.empty())
+      
+      if(!mapname.empty()&&(!polishform.empty()||only_nums))
         {
           int abortion=0;
@@ -84 +102 @@
             {
               //create the new map
-              Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (mytab.mapstorage.graph);
-
-              std::stack<double> polishstack;
-  
-              for(EdgeIt k(mytab.mapstorage.graph); k!=INVALID; ++k)
-                {
-                  for(int i=0;i<(int)polishform.size();i++)
+              Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (mytab.mapstorage.graph, def_val);
+              
+              if(!only_nums)
+                {
+                  std::stack<double> polishstack;
+                  
+                  for(EdgeIt k(mytab.mapstorage.graph); k!=INVALID; ++k)
                     {
-                      double op1, op2;
-                      bool operation=true;
-                      switch(polishform[i])
+                      for(int i=0;i<(int)polishform.size();i++)
                         {
-                        case '+':
-                        case '-':
-                        case '/':
-                        case '*':
-                          op1=polishstack.top();
-                          polishstack.pop();
-                          op2=polishstack.top();
-                          polishstack.pop();
-                          break;
-                        default:
-                          //substitute variable
-                          std::map< std::string,Graph::EdgeMap<double> * > ems=mytab.mapstorage.edgemap_storage;
-                          bool itisvar=(ems.find(ch2var[ polishform[i] ])!=ems.end());
-                          if(itisvar)
-                            {
-                              polishstack.push( (*(mytab.mapstorage.edgemap_storage[ ch2var[ polishform[i] ] ]))[k]);
-                            }
-                          else
-                            {
-                              polishstack.push(atof(ch2var[ polishform[i] ].c_str()));
-                            }
-                          operation=false;
-                          break;
-                        }
-                      if(operation)
-                        {
-                          double res;
+                          double op1=0, op2=0;
+                          bool operation=true;
                           switch(polishform[i])
                             {
                             case '+':
-                              res=op1+op2;
-                              break;
                             case '-':
-                              res=op2-op1;
-                              break;
                             case '/':
-                              res=op2/op1;
-                              break;
                             case '*':
-                              res=op1*op2;
+                              op1=polishstack.top();
+                              polishstack.pop();
+                              op2=polishstack.top();
+                              polishstack.pop();
                               break;
                             default:
-                              std::cout << "How could we get here?" << std::endl;
+                              //substitute variable
+                              std::map< std::string,Graph::EdgeMap<double> * > ems=mytab.mapstorage.edgemap_storage;
+                              bool itisvar=(ems.find(ch2var[ polishform[i] ])!=ems.end());
+                              if(itisvar)
+                                {
+                                  polishstack.push( (*(mytab.mapstorage.edgemap_storage[ ch2var[ polishform[i] ] ]))[k]);
+                                }
+                              else
+                                {
+                                  polishstack.push(atof(ch2var[ polishform[i] ].c_str()));
+                                }
+                              operation=false;
                               break;
                             }
-                          polishstack.push(res);
-                        }
-                    }
-                  (*emptr)[k]=polishstack.top(); 
-                }
+                          if(operation)
+                            {
+                              double res;
+                              switch(polishform[i])
+                                {
+                                case '+':
+                                  res=op1+op2;
+                                  break;
+                                case '-':
+                                  res=op2-op1;
+                                  break;
+                                case '/':
+                                  res=op2/op1;
+                                  break;
+                                case '*':
+                                  res=op1*op2;
+                                  break;
+                                default:
+                                  std::cout << "How could we get here?" << std::endl;
+                                  break;
+                                }
+                              polishstack.push(res);
+                            }
+                        }//foreach letter in polishform
+                      (*emptr)[k]=polishstack.top(); 
+                    }//foreach edge
+                }//!only_nums
 
               //if addition was not successful addEdgeMap returns one.
@@ -164 +185 @@
             {
               //create the new map
-              Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (mytab.mapstorage.graph);
-
-              std::stack<double> polishstack;
+              Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (mytab.mapstorage.graph, def_val);
+
+              if(!only_nums)
+                {
+                  std::stack<double> polishstack;
   
-              for(NodeIt k(mytab.mapstorage.graph); k!=INVALID; ++k)
-                {
-                  for(int i=0;i<(int)polishform.size();i++)
+                  for(NodeIt k(mytab.mapstorage.graph); k!=INVALID; ++k)
                     {
-                      double op1, op2;
-                      bool operation=true;
-                      switch(polishform[i])
+                      for(int i=0;i<(int)polishform.size();i++)
                         {
-                        case '+':
-                        case '-':
-                        case '/':
-                        case '*':
-                          op1=polishstack.top();
-                          polishstack.pop();
-                          op2=polishstack.top();
-                          polishstack.pop();
-                          break;
-                        default:
-                          std::map< std::string,Graph::NodeMap<double> * > nms=mytab.mapstorage.nodemap_storage;
-                          bool itisvar=(nms.find(ch2var[ polishform[i] ])!=nms.end());
-                          if(itisvar)
-                            {
-                              polishstack.push( (*(mytab.mapstorage.nodemap_storage[ ch2var[ polishform[i] ] ]))[k]);
-                            }
-                          else
-                            {
-                              polishstack.push(atof(ch2var[ polishform[i] ].c_str()));
-                            }
-                          operation=false;
-                          break;
-                        }
-                      if(operation)
-                        {
-                          double res;
+                          double op1=0, op2=0;
+                          bool operation=true;
                           switch(polishform[i])
                             {
                             case '+':
-                              res=op1+op2;
-                              break;
                             case '-':
-                              res=op2-op1;
-                              break;
                             case '/':
-                              res=op2/op1;
-                              break;
                             case '*':
-                              res=op1*op2;
+                              op1=polishstack.top();
+                              polishstack.pop();
+                              op2=polishstack.top();
+                              polishstack.pop();
                               break;
                             default:
-                              std::cout << "How could we get here?" << std::endl;
+                              std::map< std::string,Graph::NodeMap<double> * > nms=mytab.mapstorage.nodemap_storage;
+                              bool itisvar=(nms.find(ch2var[ polishform[i] ])!=nms.end());
+                              if(itisvar)
+                                {
+                                  polishstack.push( (*(mytab.mapstorage.nodemap_storage[ ch2var[ polishform[i] ] ]))[k]);
+                                }
+                              else
+                                {
+                                  polishstack.push(atof(ch2var[ polishform[i] ].c_str()));
+                                }
+                              operation=false;
                               break;
                             }
-                          polishstack.push(res);
+                          if(operation)
+                            {
+                              double res;
+                              switch(polishform[i])
+                                {
+                                case '+':
+                                  res=op1+op2;
+                                  break;
+                                case '-':
+                                  res=op2-op1;
+                                  break;
+                                case '/':
+                                  res=op2/op1;
+                                  break;
+                                case '*':
+                                  res=op1*op2;
+                                  break;
+                                default:
+                                  std::cout << "How could we get here?" << std::endl;
+                                  break;
+                                }
+                              polishstack.push(res);
+                            }
                         }
+                      (*emptr)[k]=polishstack.top(); 
                     }
-                  (*emptr)[k]=polishstack.top(); 
-                }
-
+                }
               //if addition was not successful addNodeMap returns one.
               //cause can be that there is already a map named like the new one