Changeset 198:d6cc0579b94b in glemon-0.x

Timestamp:

03/01/07 17:28:13 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Shape feature of EPS can be used.

Files:

• eps_win.cc (modified) (5 diffs)
• eps_win.h (modified) (5 diffs)
• mapstorage.cc (modified) (3 diffs)
• mapstorage.h (modified) (1 diff)
• nbtab.cc (modified) (3 diffs)
• nbtab.h (modified) (1 diff)

eps_win.cc

@@ -18 +18 @@
 
 #include <eps_win.h>
+
+#include <mapselector.h>
+
 #include <set>
 
@@ -29 +32 @@
 }
 
-EpsWin::EpsWin(const std::string& title):Gtk::Dialog(title, true, true)
+EpsWin::EpsWin(const std::string& title, std::vector<std::string> nml):Gtk::Dialog(title, true, true)
 {
   set_default_size(200, 50);
@@ -55 +58 @@
     }
 
+  mapselector=new MapSelector(nml, "", "Nodeshapes", false);
+  mapselector->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &EpsWin::newMapWinNeeded));
+
   hbox.pack_start(*(new Gtk::Label("Filename")));
   hbox.pack_start(name);
@@ -61 +67 @@
 
   vbox->pack_start(*table);
+  vbox->pack_start(*mapselector);
   vbox->pack_start(hbox);
 
@@ -88 +95 @@
           values[i]=options[i]->get_active();
         }
-      signal_eps_details.emit(values, name.get_text());
+      signal_eps_details.emit(values, name.get_text(), mapselector->get_active_text());
     }
   on_delete_event(NULL);
 }
+
+void EpsWin::newMapWinNeeded(bool isitedge)
+{
+  signal_new_map.emit(false);
+}
+
+void EpsWin::registerNewNodeMap(std::string newmapname)
+{
+    mapselector->append_text((Glib::ustring)newmapname);
+}

eps_win.h

@@ -19 +19 @@
 #ifndef EPS_WIN_H
 #define EPS_WIN_H
+
+class MapSelector;
 
 #include <all_include.h>
@@ -50 +52 @@
   Gtk::Entry name;
 
+  MapSelector * mapselector;
 public:
   ///Constructor
@@ -59 +62 @@
   ///\param nml nodemap list
   ///\param mw the owner \ref NoteBookTab (\ref mytab)
-  EpsWin(const std::string& title);
+  EpsWin(const std::string& title, std::vector<std::string>);
 
   ///Deregistrates \ref EpsWin in its \ref NoteBookTab (\ref mytab)
@@ -76 +79 @@
 
   ///indicates that user is ready to export EPS file
-  sigc::signal<void, std::vector<bool>, std::string > signal_eps_details;
+  sigc::signal<void, std::vector<bool>, std::string, std::string > signal_eps_details;
 
   ///returns \ref signal_eps_details
-  sigc::signal<void, std::vector<bool>, std::string > signal_eps_details_ch(){return signal_eps_details;};
+  sigc::signal<void, std::vector<bool>, std::string, std::string > signal_eps_details_ch(){return signal_eps_details;};
 
   ///indicates that the windows can be closed
@@ -87 +90 @@
   sigc::signal<void> signal_eps_close_ch(){return signal_eps_close;};
   
+  ///indicates that the windows can be closed
+  sigc::signal<void, bool> signal_new_map;
 
+  ///returns \ref signal_eps_close
+  sigc::signal<void, bool> signal_new_map_ch(){return signal_new_map;};
+
+  ///Function is called when new map is required.
+  void newMapWinNeeded(bool);
+
+  ///This function inserts name of the new nodemap in the name list in \ref MapSelector s
+
+  ///\param new_name
+  ///name of new map
+  void registerNewNodeMap(std::string new_name);
 };
 

mapstorage.cc

@@ -592 +592 @@
 }
 
-void MapStorage::exportGraphToEPS(std::vector<bool> options, std::string filename)
-{
+void MapStorage::exportGraphToEPS(std::vector<bool> options, std::string filename, std::string shapemap)
+{
+  Graph::NodeMap<int> _shapes(graph, 0);
   Graph::NodeMap<int> _nodeColors(graph, 0);
   Graph::EdgeMap<int> _edgeColors(graph, 0);
@@ -643 +644 @@
         }
     }
+  if(shapemap!="")
+    {
+      if((minOfNodeMap(shapemap)>=0)&&(maxOfNodeMap(shapemap)<=4))
+        {
+          _shapes=*(nodemap_storage[shapemap]);
+        }
+    }
 
   Palette palette;
@@ -653 +661 @@
     nodeScale(2).nodeSizes(_nodeSizes).
     coords(coords).
+    nodeShapes(_shapes).
     nodeColors(composeMap(paletteW,_nodeColors)).
     edgeColors(composeMap(palette,_edgeColors)).
     edgeWidthScale(0.3).edgeWidths(_edgeWidths).
     nodeTexts(_nodeTextMap).nodeTextSize(7).
-    enableParallel(_enableParallel).parEdgeDist(4).
+    enableParallel(_enableParallel).parEdgeDist(5).
     drawArrows(_drawArrows).arrowWidth(7).arrowLength(7).
     run();

mapstorage.h

@@ -295 +295 @@
   void redesign_data_changed();
 
-  void exportGraphToEPS(std::vector<bool>, std::string);
+  void exportGraphToEPS(std::vector<bool>, std::string, std::string);
 };
 

nbtab.cc

@@ -224 +224 @@
       mapwin->registerNewNodeMap(mapname);
     }
+  if(epswinexists)
+    {
+      epswin->registerNewNodeMap(mapname);
+    }
 }
 
@@ -241 +245 @@
   if(!epswinexists)
     {
-      epswin=new EpsWin("Export to EPS - "+name);
+      epswin=new EpsWin("Export to EPS - "+name, mapstorage->getNodeMapList());
       epswin->show();
       epswinexists=true;
       epswin->signal_eps_details_ch().connect(sigc::mem_fun(*this, &NoteBookTab::exportGraphToEPS));
       epswin->signal_eps_close_ch().connect(sigc::mem_fun(*this, &NoteBookTab::closeEpsWin));
+      epswin->signal_new_map_ch().connect(sigc::mem_fun(*this, &NoteBookTab::popupNewMapWin));
     }
 }
@@ -321 +326 @@
 }
 
-void NoteBookTab::exportGraphToEPS(std::vector<bool> options, std::string filename)
-{
-  mapstorage->exportGraphToEPS(options, filename);
+void NoteBookTab::exportGraphToEPS(std::vector<bool> options, std::string filename, std::string shapemap)
+{
+  mapstorage->exportGraphToEPS(options, filename, shapemap);
 }
 

nbtab.h

@@ -229 +229 @@
 
   ///Lets Mapstorage export the graph to EPS
-  void exportGraphToEPS(std::vector<bool>, std::string);
+  void exportGraphToEPS(std::vector<bool>, std::string, std::string);
 
   ///\ref MapWin calls this function when it updates the maplist in comboboxes.