Changeset 1884:9c061834b33b in lemon-0.x

Timestamp:

01/06/06 17:07:08 (19 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

In algorithm window maps can be selected and reated through MapSelector? widget.

Location:

gui

Files:

• algobox.cc (modified) (5 diffs)
• algobox.h (modified) (4 diffs)
• algowin.cc (modified) (1 diff)
• algowin.h (modified) (2 diffs)
• kruskalbox.cc (modified) (1 diff)
• main_win.cc (modified) (2 diffs)
• main_win.h (modified) (1 diff)
• map_win.cc (modified) (2 diffs)
• mapselector.cc (modified) (3 diffs)
• new_map_win.cc (modified) (2 diffs)

gui/algobox.cc

@@ -74 +74 @@
   for(int i=0;i<(int)nodemapcbts.size();i++)
     {
-      update_cbt(nml, *(nodemapcbts[i]));
+      (nodemapcbts[i])->update_list(nml);
+      //update_cbt(nml, *(nodemapcbts[i]));
     }
   for(int i=0;i<(int)edgemapcbts.size();i++)
     {
-      update_cbt(eml, *(edgemapcbts[i]));
+      (edgemapcbts[i])->update_list(eml);
+      //update_cbt(eml, *(edgemapcbts[i]));
     }
 }
@@ -107 +109 @@
   pack_start(*(new Gtk::HSeparator()));
 
-  label=new Gtk::Label("Specific part for each algorithm.");
+  Gtk::Label * label=new Gtk::Label("Specific part for each algorithm.");
       
   pack_start(*label);
@@ -119 +121 @@
   for(int i=0;i<(int)nodemapcbts.size();i++)
     {
-      Gtk::HBox * hbox=new Gtk::HBox();
+      std::vector<std::string> empty_vector;
 
       std::ostringstream o;
       o << "NodeInput " << i+1 << ":";
-      label=new Gtk::Label(o.str());
 
-      nodemapcbts[i]=new Gtk::ComboBoxText();
+      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));
 
-      hbox->pack_start(*label);
-      hbox->pack_start(*(nodemapcbts[i]));
-      pack_start(*hbox);
+      pack_start(*(nodemapcbts[i]));
     }
 
@@ -137 +137 @@
   for(int i=0;i<(int)edgemapcbts.size();i++)
     {
-      Gtk::HBox * hbox=new Gtk::HBox();
+      std::vector<std::string> empty_vector;
 
       std::ostringstream o;
       o << "EdgeInput " << i+1 << ":";
-      label=new Gtk::Label(o.str());
 
-      edgemapcbts[i]=new Gtk::ComboBoxText();
+      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));
 
-      hbox->pack_start(*label);
-      hbox->pack_start(*(edgemapcbts[i]));
-      pack_start(*hbox);
+      pack_start(*(edgemapcbts[i]));
     }
 
@@ -171 +169 @@
     }
 }
+
+void AlgoBox::emit_new_map_signal(bool itisedge)
+{
+  signal_newmapwin_need.emit(tabcbt.get_active_text(), itisedge);
+}

gui/algobox.h

@@ -8 +8 @@
 #include <all_include.h>
 #include <mapstorage.h>
+#include <mapselector.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
@@ -14 +15 @@
 {
   sigc::signal<void, std::string> signal_maplist_need;  
-  
-  Gtk::ComboBoxText tabcbt;
+  sigc::signal<void, std::string, bool> signal_newmapwin_need;  
 
 protected:
-  Gtk::Label * label;
-  std::vector<Gtk::ComboBoxText *> nodemapcbts;
-  std::vector<Gtk::ComboBoxText *> edgemapcbts;
+  Gtk::ComboBoxText tabcbt;
+  std::vector<MapSelector *> nodemapcbts;
+  std::vector<MapSelector *> edgemapcbts;
 
   MapStorage * mapstorage;
@@ -31 +31 @@
 
   sigc::signal<void, std::string> signal_maplist_needed();  
+  sigc::signal<void, std::string, bool> signal_newmapwin_needed(){return signal_newmapwin_need;};  
   void emit_tab_change();
 
@@ -44 +45 @@
   
   virtual void build_box();
+
+  virtual void emit_new_map_signal(bool);
 };
 #endif //ALGOBOX_H

gui/algowin.cc

@@ -44 +44 @@
     }
   ab->signal_maplist_needed().connect(sigc::mem_fun(*this, &AlgoWin::emit_tab_change));
+  ab->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &AlgoWin::emit_new_map_signal));
 
   runbutton=new Gtk::Button("Run");

gui/algowin.h

@@ -26 +26 @@
   sigc::signal<void, AlgoWin *> signal_closed;  
   sigc::signal<void, AlgoWin *, std::string> signal_maplist_need;  
+  sigc::signal<void, std::string, bool> signal_newmapwin_need;  
 
 public:
@@ -32 +33 @@
   sigc::signal<void, AlgoWin *> signal_closing();
   sigc::signal<void, AlgoWin *, std::string> signal_maplist_needed();
+  sigc::signal<void, std::string, bool> signal_newmapwin_needed(){return signal_newmapwin_need;};  
 
   void emit_tab_change(std::string);
+  void emit_new_map_signal(std::string tabname, bool itisedge){signal_newmapwin_need.emit(tabname, itisedge);};
 
   AlgoWin(int, std::vector<std::string>);

gui/kruskalbox.cc

@@ -10 +10 @@
 void KruskalBox::run()
 {
-  Graph g=mapstorage->graph;
-  Graph::EdgeMap<double> * inputmap=
-    ((mapstorage->edgemap_storage)[(edgemapcbts[INPUT])->get_active_text()]);
-  Graph::EdgeMap<bool> outputmap(g);
-  double res=kruskal(g, *inputmap, outputmap);
+  if(
+     tabcbt.get_active_text()!="" &&
+     (edgemapcbts[INPUT])->get_active_text()!="" &&
+     (edgemapcbts[OUTPUT])->get_active_text()!=""
+     )
+    {
 
-  for (EdgeIt i(g); i!=INVALID; ++i)
-  {
-    if(outputmap[i])
-      {
-        (*((mapstorage->edgemap_storage)[(edgemapcbts[OUTPUT])->
-                                         get_active_text()]))[i]=1;
-      }
-    else
-      {
-        (*((mapstorage->edgemap_storage)[(edgemapcbts[OUTPUT])->
-                                         get_active_text()]))[i]=0;
-      }
-  }
+      Graph g=mapstorage->graph;
+      Graph::EdgeMap<double> * inputmap=
+        ((mapstorage->edgemap_storage)[(edgemapcbts[INPUT])->get_active_text()]);
+      Graph::EdgeMap<bool> outputmap(g);
+      double res=kruskal(g, *inputmap, outputmap);
 
-  std::ostringstream o;
-  o << "Result: " << res;
-  resultlabel.set_text(o.str());
+      for (EdgeIt i(g); i!=INVALID; ++i)
+        {
+          if(outputmap[i])
+            {
+              (*((mapstorage->edgemap_storage)[(edgemapcbts[OUTPUT])->
+                                               get_active_text()]))[i]=1;
+            }
+          else
+            {
+              (*((mapstorage->edgemap_storage)[(edgemapcbts[OUTPUT])->
+                                               get_active_text()]))[i]=0;
+            }
+        }
 
-  mapstorage->mapChanged(true, (edgemapcbts[OUTPUT])->get_active_text());
-  //   mapstorage->changeActiveMap(true, E_COLOR,
-  //                          (edgemapcbts[OUTPUT])->get_active_text());
-  //   mapstorage->changeActiveMap(true, E_TEXT,
-  //                          (edgemapcbts[INPUT])->get_active_text());
+      std::ostringstream o;
+      o << "Result: " << res;
+      resultlabel.set_text(o.str());
+
+      mapstorage->mapChanged(true, (edgemapcbts[OUTPUT])->get_active_text());
+      //   mapstorage->changeActiveMap(true, E_COLOR,
+      //                              (edgemapcbts[OUTPUT])->get_active_text());
+      //   mapstorage->changeActiveMap(true, E_TEXT,
+      //                              (edgemapcbts[INPUT])->get_active_text());
   
+    }
 }
     
 void KruskalBox::build_box()
 {
+  std::vector<std::string> empty_vector;
+
   edgemapcbts.resize(MAP_NUM);
-  Gtk::HBox * hbox;
 
-  hbox=new Gtk::HBox();
+  edgemapcbts[0]=new MapSelector(empty_vector,"","Edgecosts: ",true, false);
+  edgemapcbts[0]->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &AlgoBox::emit_new_map_signal));
 
-  label=new Gtk::Label("Edgecosts: ");
+  pack_start(*(edgemapcbts[INPUT]));
 
-  edgemapcbts[0]=new Gtk::ComboBoxText();
+  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));
 
-  hbox->pack_start(*label);
-  hbox->pack_start(*(edgemapcbts[INPUT]));
-  pack_start(*hbox);
-
-  hbox=new Gtk::HBox();
-
-  label=new Gtk::Label("Edges of tree here: ");
-
-  edgemapcbts[1]=new Gtk::ComboBoxText();
-
-  hbox->pack_start(*label);
-  hbox->pack_start(*(edgemapcbts[OUTPUT]));
-  pack_start(*hbox);
+  pack_start(*(edgemapcbts[OUTPUT]));
 
   resultlabel.set_text("Result: algorithm is not run yet.");

gui/main_win.cc

@@ -413 +413 @@
   aw->signal_closing().connect(sigc::mem_fun(*this, &MainWin::deRegisterAlgoWin));
   aw->signal_maplist_needed().connect(sigc::mem_fun(*this, &MainWin::updateAlgoWinMaps));
+  aw->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &MainWin::createNewMapWinTabString));
   aws.insert(aw);
   aw->show();
@@ -457 +458 @@
       nmw->show();
     }
+}
+
+void MainWin::createNewMapWinTabString(std::string tabname, bool itisedge)
+{
+  int i=0;
+  for(;((i<tabnames.size())&&(tabnames[i]!=tabname));i++)
+    {
+    }
+  createNewMapWinAfterSignal(tabs[i], itisedge);
 }
 

gui/main_win.h

@@ -80 +80 @@
 
   virtual void createNewMapWinAfterSignal(NoteBookTab *, bool);
+  virtual void createNewMapWinTabString(std::string, bool);
   virtual void createNewMapWin();
 

gui/map_win.cc

@@ -25 +25 @@
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-    e_combo_array[i]=new MapSelector(eml, mytab.getActiveEdgeMap(i), i, true);
+    e_combo_array[i]=new MapSelector(eml, mytab.getActiveEdgeMap(i), edge_property_strings[i], true);
 
     (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -45 +45 @@
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-    n_combo_array[i]=new MapSelector(nml, mytab.getActiveNodeMap(i), i, false);
+    n_combo_array[i]=new MapSelector(nml, mytab.getActiveNodeMap(i), node_property_strings[i], false);
 
     (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);

gui/mapselector.cc

@@ -1 +1 @@
 #include "mapselector.h"
 
-MapSelector::MapSelector(std::vector<std::string> ml, std::string act, int identifier, bool edge):id(identifier),itisedge(edge),set_new_map(false)
+MapSelector::MapSelector(std::vector<std::string> ml, std::string act, std::string labeltext, bool edge, bool d):def(d),itisedge(edge),set_new_map(false)
 {
   update_list(ml);
@@ -23 +23 @@
      );
   
-  if(itisedge)
-    {
-      label=new Gtk::Label(edge_property_strings[id]);
-    }
-  else
-    {
-      label=new Gtk::Label(node_property_strings[id]);
-    }
+  label=new Gtk::Label(labeltext);
 
   label->set_width_chars(longest_property_string_length);
@@ -72 +65 @@
       cbt.append_text(*emsi);
     }
-  cbt.prepend_text("Default values");
+  if(def)
+    {
+      cbt.prepend_text("Default values");
+    }
   if(prev_act!=-1)
     {

gui/new_map_win.cc

@@ -115 +115 @@
                           else
                             {
-                              char * def_val_ch=new char [(int)(ch2var[ polishform[i] ].length())];
-                              for(int j=0;j<(int)(ch2var[ polishform[i] ].length());j++)
-                                {
-                                  def_val_ch[j]=ch2var[ polishform[i] ][j];
-                                }
-                              polishstack.push(atof(def_val_ch));
-                              delete def_val_ch;
+                              polishstack.push(atof(ch2var[ polishform[i] ].c_str()));
                             }
                           operation=false;
@@ -202 +196 @@
                           else
                             {
-                              char * def_val_ch=new char [(int)(ch2var[ polishform[i] ].length())];
-                              for(int j=0;j<(int)(ch2var[ polishform[i] ].length());j++)
-                                {
-                                  def_val_ch[j]=ch2var[ polishform[i] ][j];
-                                }
-                              polishstack.push(atof(def_val_ch));
-                              delete def_val_ch;
+                              polishstack.push(atof(ch2var[ polishform[i] ].c_str()));
                             }
                           operation=false;