Changeset 196:c220f9de6545 in glemon-0.x

Timestamp:

03/01/07 14:33:46 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

EpsWin? and DesignWin? does not need to know NoteBookTab?.

Files:

• design_win.cc (modified) (2 diffs)
• design_win.h (modified) (3 diffs)
• eps_win.cc (modified) (5 diffs)
• eps_win.h (modified) (4 diffs)
• nbtab.cc (modified) (9 diffs)
• nbtab.h (modified) (1 diff)

design_win.cc

@@ -17 +17 @@
  */
 
-#include <nbtab.h>
 #include <design_win.h>
 
@@ -29 +28 @@
 }
 
-DesignWin::DesignWin(const std::string& title, double attraction_v, double propulsation_v, int iterations_v, NoteBookTab & mw):mytab(mw)
+DesignWin::DesignWin(const std::string& title, double attraction_v, double propulsation_v, int iterations_v)
 {
   set_title(title);
 
-  mytab.signal_title_ch().connect(sigc::mem_fun(*this, &DesignWin::set_title));
+  //mytab.signal_title_ch().connect(sigc::mem_fun(*this, &DesignWin::set_title));
 
   signal_key_press_event().connect(sigc::mem_fun(*this, &DesignWin::closeIfEscapeIsPressed));

design_win.h

@@ -20 +20 @@
 #define DESWIN_H
 
-class NoteBookTab;
-
 #include <all_include.h>
 #include <libgnomecanvasmm.h>
@@ -29 +27 @@
 {
 private:
-  ///\ref NoteBookTab to that the \ref MapWin belongs to.
-  NoteBookTab & mytab;
-
   Gtk::SpinButton * attraction;
   Gtk::SpinButton * propulsation;
@@ -55 +50 @@
 
   ///It builds the window.
-  DesignWin(const std::string&, double, double, int, NoteBookTab & mw);
+  DesignWin(const std::string&, double, double, int);
 
   sigc::signal<void, double> signal_attraction(){return signal_attraction_ch;};

eps_win.cc

@@ -17 +17 @@
  */
 
-#include <nbtab.h>
 #include <eps_win.h>
 #include <set>
@@ -30 +29 @@
 }
 
-EpsWin::EpsWin(const std::string& title, NoteBookTab & mw):Gtk::Dialog(title, true, true),mytab(mw)
+EpsWin::EpsWin(const std::string& title):Gtk::Dialog(title, true, true)
 {
   set_default_size(200, 50);
@@ -37 +36 @@
 
   signal_key_press_event().connect(sigc::mem_fun(*this, &EpsWin::closeIfEscapeIsPressed));
-
-  mytab.signal_title_ch().connect(sigc::mem_fun(*this, &EpsWin::set_title));
 
   table=new Gtk::Table(EPS_PROPERTY_NUM, 1, false);
@@ -77 +74 @@
 {
   event=event;
-  mytab.closeEpsWin();
+  signal_eps_close.emit();
   return true;
 }
@@ -91 +88 @@
           values[i]=options[i]->get_active();
         }
-      mytab.exportGraphToEPS(values, name.get_text());
+      signal_eps_details.emit(values, name.get_text());
     }
   on_delete_event(NULL);

eps_win.h

@@ -20 +20 @@
 #define EPS_WIN_H
 
-class NoteBookTab;
-
 #include <all_include.h>
 #include <libgnomecanvasmm.h>
@@ -34 +32 @@
 {
 protected:
-  ///\ref NoteBookTab to that the \ref EpsWin belongs to.
-  NoteBookTab & mytab;
-
   ///Designing element
   Gtk::Table * table;
@@ -64 +59 @@
   ///\param nml nodemap list
   ///\param mw the owner \ref NoteBookTab (\ref mytab)
-  EpsWin(const std::string& title, NoteBookTab & mw);
+  EpsWin(const std::string& title);
 
   ///Deregistrates \ref EpsWin in its \ref NoteBookTab (\ref mytab)
@@ -80 +75 @@
   virtual void on_response(int response_id);
 
+  ///indicates that user is ready to export EPS file
+  sigc::signal<void, std::vector<bool>, 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;};
+
+  ///indicates that the windows can be closed
+  sigc::signal<void> signal_eps_close;
+
+  ///returns \ref signal_eps_close
+  sigc::signal<void> signal_eps_close_ch(){return signal_eps_close;};
+  
+
 };
 

nbtab.cc

@@ -54 +54 @@
       mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
     }
-  signal_title.emit(Glib::filename_display_basename(file));
+  title_changed(Glib::filename_display_basename(file));
 }
 
@@ -83 +83 @@
       mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
     }
-  signal_title.emit("unsaved file");
+  title_changed("unsaved file");
 }
 
@@ -123 +123 @@
           mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
         }
-      signal_title.emit(Glib::filename_display_basename(filename));
+      title_changed(Glib::filename_display_basename(filename));
     }
   }
@@ -137 +137 @@
     mapstorage->writeToFile(mapstorage->file_name);
     mapstorage->modified = false;
-    signal_title.emit(Glib::filename_display_basename(mapstorage->file_name));
+    title_changed(Glib::filename_display_basename(mapstorage->file_name));
   }
 }
@@ -152 +152 @@
     mapstorage->writeToFile(filename);
     mapstorage->modified = false;
-    signal_title.emit(Glib::filename_display_basename(filename));
+    title_changed(Glib::filename_display_basename(filename));
   }
 }
@@ -182 +182 @@
       mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
     }
-  signal_title.emit("unsaved file");
+  title_changed("unsaved file");
 }
 
@@ -241 +241 @@
   if(!epswinexists)
     {
-      epswin=new EpsWin("Export to EPS - "+name, *this);
+      epswin=new EpsWin("Export to EPS - "+name);
       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));
     }
 }
@@ -255 +257 @@
       int iterations;
       mapstorage->get_design_data(attraction, propulsation, iterations);
-      designwin=new DesignWin("Design Setup - "+name, attraction, propulsation, iterations, *this);
+      designwin=new DesignWin("Design Setup - "+name, attraction, propulsation, iterations);
 
       designwin->signal_attraction().connect(sigc::mem_fun(mapstorage, &MapStorage::set_attraction));
@@ -323 +325 @@
   mapstorage->exportGraphToEPS(options, filename);
 }
+
+void NoteBookTab::title_changed(std::string newtitle)
+{
+  signal_title.emit(newtitle);
+  if(epswinexists)
+    {
+      epswin->set_title(newtitle);
+    }
+  if(designwinexists)
+    {
+      designwin->set_title(newtitle);
+    }
+}

nbtab.h

@@ -235 +235 @@
 
 private:
+  ///Called when title of tab has changed
+  void title_changed(std::string);
+
   ///Signal connection from \ref MapStorage to \ref MapWin