Changeset 172:fc1e478697d3 in glemon-0.x

Timestamp:

10/25/06 15:21:24 (18 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@3017

Message:

Currently visualized map can be saved and loaded from file.

Files:

• design_win.cc (modified) (2 diffs)
• design_win.h (modified) (4 diffs)
• graph_displayer_canvas.cc (modified) (5 diffs)
• graph_displayer_canvas.h (modified) (1 diff)
• gui_reader.cc (modified) (1 diff)
• gui_writer.cc (modified) (1 diff)
• map_win.cc (modified) (3 diffs)
• map_win.h (modified) (1 diff)
• mapselector.cc (modified) (3 diffs)
• mapselector.h (modified) (1 diff)
• mapstorage.cc (modified) (3 diffs)
• mapstorage.h (modified) (3 diffs)
• nbtab.cc (modified) (4 diffs)
• nbtab.h (modified) (1 diff)

design_win.cc

@@ -10 +10 @@
 }
 
-DesignWin::DesignWin(const std::string& title, double attraction_v, double propulsation_v, int iterations_v)
+DesignWin::DesignWin(const std::string& title, double attraction_v, double propulsation_v, int iterations_v, NoteBookTab & mw):mytab(mw)
 {
   set_title(title);
+
+  mytab.signal_title_ch().connect(sigc::mem_fun(*this, &DesignWin::set_title));
 
   signal_key_press_event().connect(sigc::mem_fun(*this, &DesignWin::closeIfEscapeIsPressed));
@@ -65 +67 @@
   signal_iteration_ch.emit((int)iteration->get_value());
 }
+
+void DesignWin::set_title(std::string tabname)
+{
+  Gtk::Window::set_title("Design Setup - "+tabname);
+}

design_win.h

@@ -4 +4 @@
 #define DESWIN_H
 
+class DesignWin;
+
 #include <all_include.h>
+#include <nbtab.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
@@ -11 +14 @@
 {
 private:
+  ///\ref NoteBookTab to that the \ref MapWin belongs to.
+  NoteBookTab & mytab;
+
   Gtk::SpinButton * attraction;
   Gtk::SpinButton * propulsation;
@@ -34 +40 @@
 
   ///It builds the window.
-  DesignWin(const std::string&, double, double, int);
+  DesignWin(const std::string&, double, double, int, NoteBookTab & mw);
 
   sigc::signal<void, double> signal_attraction(){return signal_attraction_ch;};
@@ -40 +46 @@
   sigc::signal<void, int> signal_iteration(){return signal_iteration_ch;};
   sigc::signal<void> close_run(){return close_run_pr;};
+
+  void set_title(std::string);
 };
 #endif //DESWIN_H

graph_displayer_canvas.cc

@@ -8 +8 @@
   isbutton(0), active_item(NULL), target_item(NULL), nodemap_to_edit(""),
   edgemap_to_edit(""), autoscale(true), zoomtrack(false), radius_size(20), edge_width(10),
-  iterations(20), attraction(0.05), propulsation(40000), was_redesigned(false), mytab(mainw)
+  iterations(20), attraction(0.05), propulsation(40000), was_redesigned(false), is_drawn(false), mytab(mainw)
 {
   //base event handler is move tool
@@ -64 +64 @@
 void GraphDisplayerCanvas::propertyUpdate(Node node, int prop)
 {
-  //dummy=dummy;
-
   std::string mapname=mytab.getActiveNodeMap(prop);
 
-  if(mapname!="")
-    {
-      if( ( ((mytab.mapstorage).nodemap_storage).find(mapname) != ((mytab.mapstorage).nodemap_storage).end() ) )
-        {
+  if(is_drawn)
+    {
+      if(mapname!="")
+        {
+          if( ( ((mytab.mapstorage).nodemap_storage).find(mapname) != ((mytab.mapstorage).nodemap_storage).end() ) )
+            {
+              switch(prop)
+                {
+                case N_RADIUS:
+                  changeNodeRadius(mapname, node);
+                  break;
+                case N_COLOR:
+                  changeNodeColor(mapname, node);
+                  break;
+                case N_TEXT:
+                  changeNodeText(mapname, node);
+                  break;
+                default:
+                  std::cerr<<"Error\n";
+                }
+            }
+        }
+      else //mapname==""
+        {
+          Node node=INVALID;    
           switch(prop)
             {
             case N_RADIUS:
-              changeNodeRadius(mapname, node);
+              resetNodeRadius(node);
               break;
             case N_COLOR:
-              changeNodeColor(mapname, node);
+              resetNodeColor(node);
               break;
             case N_TEXT:
-              changeNodeText(mapname, node);
+              resetNodeText(node);
               break;
             default:
@@ -88 +107 @@
         }
     }
-  else //mapname==""
-    {
-      Node node=INVALID;        
-      switch(prop)
-        {
-        case N_RADIUS:
-          resetNodeRadius(node);
-          break;
-        case N_COLOR:
-          resetNodeColor(node);
-          break;
-        case N_TEXT:
-          resetNodeText(node);
-          break;
-        default:
-          std::cerr<<"Error\n";
-        }
-    }
-
 }
 
 void GraphDisplayerCanvas::propertyUpdate(Edge edge, int prop)
 {
-  //dummy=dummy;
-
   std::string mapname=mytab.getActiveEdgeMap(prop);
 
-  if(mapname!="")
-    {
-      if( ( ((mytab.mapstorage).edgemap_storage).find(mapname) != ((mytab.mapstorage).edgemap_storage).end() ) )
+  if(is_drawn)
+    {
+      if(mapname!="")
+        {
+          if( ( ((mytab.mapstorage).edgemap_storage).find(mapname) != ((mytab.mapstorage).edgemap_storage).end() ) )
+            {
+              switch(prop)
+                {
+                case E_WIDTH:
+                  changeEdgeWidth(mapname, edge);
+                  break;
+                case E_COLOR:
+                  changeEdgeColor(mapname, edge);
+                  break;
+                case E_TEXT:
+                  changeEdgeText(mapname, edge);
+                  break;
+                default:
+                  std::cerr<<"Error\n";
+                }
+            }
+        }
+      else //mapname==""
         {
           switch(prop)
             {
             case E_WIDTH:
-              changeEdgeWidth(mapname, edge);
+              resetEdgeWidth(edge);
               break;
             case E_COLOR:
-              changeEdgeColor(mapname, edge);
+              resetEdgeColor(edge);
               break;
             case E_TEXT:
-              changeEdgeText(mapname, edge);
+              resetEdgeText(edge);
               break;
             default:
               std::cerr<<"Error\n";
             }
-        }
-    }
-  else //mapname==""
-    {
-      switch(prop)
-        {
-        case E_WIDTH:
-          resetEdgeWidth(edge);
-          break;
-        case E_COLOR:
-          resetEdgeColor(edge);
-          break;
-        case E_TEXT:
-          resetEdgeText(edge);
-          break;
-        default:
-          std::cerr<<"Error\n";
         }
     }
@@ -208 +209 @@
   }
 
+  is_drawn=true;
+
+  //upon drawing graph
+  //properties have to
+  //be set in as well
+  for(int i=0;i<NODE_PROPERTY_NUM;i++)
+    {
+      propertyUpdate(Node(INVALID), i);
+    }
+
+  for(int i=0;i<EDGE_PROPERTY_NUM;i++)
+    {
+      propertyUpdate(Edge(INVALID), i);
+    }
+
   updateScrollRegion();
 }
@@ -228 +244 @@
     delete edgetextmap[e];
   }
+
+  is_drawn=false;
 }
 

graph_displayer_canvas.h

@@ -326 +326 @@
   void set_iteration(int);
 
+  ///Show whether the graph is already drawn.
+  bool is_drawn;
+
 private:
   ///Deletes the given element.

gui_reader.cc

@@ -27 +27 @@
   }
   mapstorage->ArrowPosReadOK();
+
+  std::map<int, std::string> nm;
+  x("active_nodemaps", nm);
+
+  for(int i=0;i<NODE_PROPERTY_NUM;i++)
+    {
+      mapstorage->changeActiveMap(false, i, nm[i]);
+    }
+
+  std::map<int, std::string> em;
+  x("active_edgemaps", em);
+  for(int i=0;i<EDGE_PROPERTY_NUM;i++)
+    {
+      mapstorage->changeActiveMap(true, i, em[i]);
+    }
 }
 

gui_writer.cc

@@ -20 +20 @@
   }
   x("arrow_pos", m);
+
+  std::map<int, std::string> nm;
+  for(int i=0;i<NODE_PROPERTY_NUM;i++)
+    {
+      nm[i]=mapstorage->active_nodemaps[i];
+    }
+  x("active_nodemaps", nm);
+
+  std::map<int, std::string> em;
+  for(int i=0;i<EDGE_PROPERTY_NUM;i++)
+    {
+      em[i]=mapstorage->active_edgemaps[i];
+    }
+  x("active_edgemaps", em);
 }
 

map_win.cc

@@ -20 +20 @@
 
   signal_key_press_event().connect(sigc::mem_fun(*this, &MapWin::closeIfEscapeIsPressed));
+
+  mytab.signal_title_ch().connect(sigc::mem_fun(*this, &MapWin::set_title));
 
   e_combo_array=new MapSelector * [EDGE_PROPERTY_NUM];
@@ -91 +93 @@
     n_combo_array[i]->update_list(nml);
   }
+
+  mytab.active_maps_needed();
 }
 
@@ -117 +121 @@
   return true;
 }
+
+void MapWin::changeEntry(bool isitedge, int prop, std::string mapname)
+{
+  if(isitedge)
+    {
+      e_combo_array[prop]->set_active_text(mapname);
+    }
+  else
+    {
+      n_combo_array[prop]->set_active_text(mapname);
+    }
+}
+
+void MapWin::set_title(std::string tabname)
+{
+  Gtk::Window::set_title("Map Setup - "+tabname);
+}

map_win.h

@@ -113 +113 @@
   ///\param nml node map list
   void update(std::vector<std::string> eml, std::vector<std::string> nml);
+
+  void changeEntry(bool, int, std::string);
+
+  void set_title(std::string);
 };
 

mapselector.cc

@@ -68 +68 @@
   int prev_act=cbt.get_active_row_number();
   cbt.clear();
+  cbt_content.clear();
   std::vector< std::string >::iterator emsi=ml.begin();
   for(;emsi!=ml.end();emsi++)
     {
       cbt.append_text(*emsi);
+      cbt_content.push_back(*emsi);
     }
   if(def)
     {
       cbt.prepend_text("Default values");
+      cbt_content.push_back("Default values");
     }
   if(prev_act!=-1)
@@ -117 +120 @@
 void MapSelector::set_active_text(Glib::ustring text)
 {
-  cbt.set_active_text(text);
+  if(text.compare(""))
+    {
+      cbt.set_active_text(text);
+    }
+  else
+    { 
+      cbt.set_active_text("Default values");
+    }
 }
 
@@ -123 +133 @@
 {
   cbt.append_text(text);
+  cbt_content.push_back(text);
+
   if(set_new_map)
     {

mapselector.h

@@ -61 +61 @@
   ///Names in it are selectable.
   Gtk::ComboBoxText cbt;
+
+  std::vector<std::string> cbt_content;
 
   ///New button.

mapstorage.cc

@@ -53 +53 @@
 int MapStorage::addNodeMap(const std::string & name, Graph::NodeMap<double> *nodemap, double default_value)
 {
-  std::cout << default_value << std::endl;
   if( nodemap_storage.find(name) == nodemap_storage.end() )
     {
@@ -79 +78 @@
   signal_prop.emit(itisedge, prop);
 }
+
+void MapStorage::broadcastActiveMaps()
+{
+  for(int i=0;i<NODE_PROPERTY_NUM;i++)
+    {
+      signal_map_win.emit(false, i, active_nodemaps[i]);
+    }
+  
+  for(int i=0;i<EDGE_PROPERTY_NUM;i++)
+    {
+      signal_map_win.emit(true, i, active_edgemaps[i]);
+    }
+}
+
 
 std::string MapStorage::getActiveEdgeMap(int prop)
@@ -441 +454 @@
   file_name = "";
   modified = false;
+
+  arrow_pos_read_ok = false;
+  
+  for(int i=0;i<NODE_PROPERTY_NUM;i++)
+    {
+      changeActiveMap(false, i, "");
+      signal_map_win.emit(false, i, "");
+    }
+  
+  for(int i=0;i<EDGE_PROPERTY_NUM;i++)
+    {
+      changeActiveMap(true, i, "");
+      signal_map_win.emit(true, i, "");
+    }
 }
 

mapstorage.h

@@ -86 +86 @@
   sigc::signal<void, std::string> signal_edge_map;
 
+  /// Signal emitted, when entry in \ref MapWin should be changed.
+  sigc::signal<void, bool, int, std::string> signal_map_win;
+
 public:
   ///Constructor of MapStorage.
@@ -110 +113 @@
   void changeActiveMap(bool itisedge , int prop , std::string mapname);
 
+  ///Emits signals that let change the active maps in \ref MapWin.
+  void broadcastActiveMaps();
+
   /// Returns the active edgemap shown by a visualization property.
 
@@ -136 +142 @@
   ///returns \ref signal_edge_map to be able to connect functions to it
   sigc::signal<void, std::string> signal_edge_map_ch(){return signal_edge_map;};
+
+  ///returns \ref signal_map_win to be able to connect functions to it
+  sigc::signal<void, bool, int, std::string> signal_map_win_ch(){return signal_map_win;};
 
   ///Adds given map to storage.

nbtab.cc

@@ -203 +203 @@
     {
       mapwin=new MapWin("Map Setup - "+name, mapstorage.getEdgeMapList(), mapstorage.getNodeMapList(), *this);
+      mapst2mapwin=mapstorage.signal_map_win_ch().connect(sigc::mem_fun(*mapwin, &MapWin::changeEntry));
       mapwin->show();
       mapwinexists=true;
@@ -215 +216 @@
       int iterations;
       gd_canvas->get_design_data(attraction, propulsation, iterations);
-      designwin=new DesignWin("Design Setup - "+name, attraction, propulsation, iterations);
+      designwin=new DesignWin("Design Setup - "+name, attraction, propulsation, iterations, *this);
 
       designwin->signal_attraction().connect(sigc::mem_fun(*this, &NoteBookTab::attraction_ch));
@@ -231 +232 @@
 void NoteBookTab::closeMapWin()
 {
+  mapst2mapwin.disconnect();
   mapwinexists=false;
   delete mapwin;
@@ -279 +281 @@
 }
 
+void NoteBookTab::active_maps_needed()
+{
+  mapstorage.broadcastActiveMaps();
+}

nbtab.h

@@ -184 +184 @@
   void getView(bool &, bool &, double&, double&);
 
+  ///Let the graph redesign, based on gravity and edge elasticity.
   void reDesignGraph();
 
+  ///Indicates that attraction factor is changed
   void attraction_ch(double);
 
+  ///Indicates that propulsation factor is changed
   void propulsation_ch(double);
 
+  ///Indicates that iteration number of redesign is changed
   void iteration_ch(int);
+
+  ///\ref MapWin calls this function when it updates the maplist in comboboxes.
+  void active_maps_needed();
+
+private:
+  ///Signal connection from \ref MapStorage to \ref MapWin
+
+  ///If \ref MapWin is closed this connection has to be disconnected,
+  ///therefore we have to store it.
+  sigc::connection mapst2mapwin;
 };