Changeset 1886:8b225c2935e7 in lemon-0.x

Timestamp:

01/09/06 12:55:47 (19 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Creation of algorithm dialog is even simpler by the usage of the newly created addMapSelector function.

Location:

gui

Files:

• algobox.cc (modified) (1 diff)
• algobox.h (modified) (1 diff)
• kruskalbox.cc (modified) (1 diff)

gui/algobox.cc

@@ -118 +118 @@
   pack_start(*label);
 
-  nodemapcbts.resize(NODE_INPUT_NUM);
-  for(int i=0;i<(int)nodemapcbts.size();i++)
+  for(int i=0;i<NODE_INPUT_NUM;i++)
     {
-      std::vector<std::string> empty_vector;
-
       std::ostringstream o;
       o << "NodeInput " << i+1 << ":";
 
-      nodemapcbts[i]=new MapSelector(empty_vector,"",o.str(),false, false);
-      nodemapcbts[i]->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &AlgoBox::emit_new_map_signal));
-
-      pack_start(*(nodemapcbts[i]));
+      addMapSelector(o.str(), false);
     }
 
   pack_start(*(new Gtk::HSeparator()));
 
-  edgemapcbts.resize(EDGE_INPUT_NUM);
-  for(int i=0;i<(int)edgemapcbts.size();i++)
+  for(int i=0;i<EDGE_INPUT_NUM;i++)
     {
-      std::vector<std::string> empty_vector;
 
       std::ostringstream o;
       o << "EdgeInput " << i+1 << ":";
 
-      edgemapcbts[i]=new MapSelector(empty_vector,"",o.str(),true, false);
-      edgemapcbts[i]->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &AlgoBox::emit_new_map_signal));
-
-      pack_start(*(edgemapcbts[i]));
+      addMapSelector(o.str(), true);
     }
 
   pack_start(*(new Gtk::HSeparator()));
+}
+
+void AlgoBox::addMapSelector(std::string inputname, bool itisedge)
+{
+  std::vector<std::string> empty_vector;
+
+  MapSelector * msp=new MapSelector(empty_vector,"",inputname,itisedge, false);
+
+  if(itisedge)
+    {
+      edgemapcbts.resize(edgemapcbts.size()+1);
+      edgemapcbts[edgemapcbts.size()-1]=msp;
+    }
+  else
+    {
+      nodemapcbts.resize(nodemapcbts.size()+1);
+      nodemapcbts[nodemapcbts.size()-1]=msp;
+    }
+
+  msp->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &AlgoBox::emit_new_map_signal));
+
+  pack_start(*msp);
 }
 

gui/algobox.h

@@ -47 +47 @@
 
   virtual void emit_new_map_signal(bool);
+
+  void addMapSelector(std::string, bool);
 };
 #endif //ALGOBOX_H

gui/kruskalbox.cc

@@ -54 +54 @@
   std::vector<std::string> empty_vector;
 
-  edgemapcbts.resize(MAP_NUM);
-
-  edgemapcbts[0]=new MapSelector(empty_vector,"","Edgecosts: ",true, false);
-  edgemapcbts[0]->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &AlgoBox::emit_new_map_signal));
-
-  pack_start(*(edgemapcbts[INPUT]));
-
-  edgemapcbts[1]=new MapSelector(empty_vector,"","Edges of tree here: ",true, false);
-  edgemapcbts[1]->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &AlgoBox::emit_new_map_signal));
-
-  pack_start(*(edgemapcbts[OUTPUT]));
+  addMapSelector("Edgecosts: ", true);
+  addMapSelector("Edges of tree here: ", true);
 
   resultlabel.set_text("Result: algorithm is not run yet.");