Changeset 95:628c0b383d2f in glemon-0.x

Timestamp:

11/30/05 14:24:23 (19 years ago)

Author:

Hegyi Péter

Branch:

gui

Phase:

public

Convert:

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

Message:

MapWin? is created and disposed from now instead of being show and hide.

Files:

• main_win.cc (modified) (7 diffs)
• main_win.h (modified) (2 diffs)
• map_win.cc (modified) (5 diffs)
• map_win.h (modified) (2 diffs)
• mw-mapselector.cc (modified) (5 diffs)

main_win.cc

@@ -2 +2 @@
 #include "icons/guipixbufs.h"
 
-MainWin::MainWin()
-{
-  mapwin=new MapWin("Map Setup", mapstorage.getEdgeMapList(), mapstorage.getNodeMapList(), *this);
+MainWin::MainWin():mapwinexists(false)
+{
   gd_canvas=new GraphDisplayerCanvas(*this);
 
@@ -106 +105 @@
   ag->add( Gtk::Action::create("ShowMenu", "_Show") );
   ag->add( Gtk::Action::create("ShowMaps", "_Maps"),
-      sigc::mem_fun(*(this->mapwin), &MapWin::show));
+           sigc::mem_fun(*this, &MainWin::createMapWin));
 
   Gtk::RadioAction::Group tool_group;
@@ -213 +212 @@
   mapstorage.modified = false;
   gd_canvas->drawGraph();
-  mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+  if(mapwinexists)
+    {
+      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+    }
   set_title(Glib::filename_display_basename(file) + " - " + prog_name);
 }
@@ -239 +241 @@
   gd_canvas->clear();
   mapstorage.clear();
-  mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+  if(mapwinexists)
+    {
+      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+    }
   set_title("unsaved file - " + prog_name);
 }
@@ -276 +281 @@
       mapstorage.modified = false;
       gd_canvas->drawGraph();
-      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+      if(mapwinexists)
+        {
+          mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+        }
       set_title(Glib::filename_display_basename(filename) + " - " + prog_name);
     }
@@ -333 +341 @@
   gd_canvas->clear();
   mapstorage.clear();
-  mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+  if(mapwinexists)
+    {
+      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+    }
   set_title("unsaved file - " + prog_name);
 }
@@ -360 +371 @@
 void MainWin::registerNewEdgeMap(std::string mapname)
 {
-  mapwin->registerNewEdgeMap(mapname);
+  if(mapwinexists)
+    {
+      mapwin->registerNewEdgeMap(mapname);
+    }
 }
 
 void MainWin::registerNewNodeMap(std::string mapname)
 {
-  mapwin->registerNewNodeMap(mapname);
-}
+  if(mapwinexists)
+    {
+      mapwin->registerNewNodeMap(mapname);
+    }
+}
+
+void MainWin::createMapWin()
+{
+  if(!mapwinexists)
+    {
+      mapwin=new MapWin("Map Setup", mapstorage.getEdgeMapList(), mapstorage.getNodeMapList(), *this);
+      mapwin->show();
+      mapwinexists=true;
+    }
+}
+
+void MainWin::closeMapWin()
+{
+  mapwinexists=false;
+  delete mapwin;
+}

main_win.h

@@ -28 +28 @@
 
 protected:
-  ///Window of map-showing setup. Its type is \ref MapWin
   MapWin * mapwin;
+  bool mapwinexists;
 
   ///The graph will be drawn on this \ref GraphDisplayerCanvas
@@ -67 +67 @@
   void registerNewNodeMap(std::string);
 
+  void createMapWin();
+  void closeMapWin();
 };
 

map_win.cc

@@ -6 +6 @@
   if(e->keyval==GDK_Escape)
   {
-    hide();
+    mainwin.closeMapWin();
+    //    hide();
   }
   return true;
@@ -24 +25 @@
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-    e_combo_array[i]=new MapSelector(eml, i, true);
+    e_combo_array[i]=new MapSelector(eml, mainwin.getActiveEdgeMap(i), i, true);
 
     (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -44 +45 @@
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-    n_combo_array[i]=new MapSelector(nml, i, false);
+    n_combo_array[i]=new MapSelector(nml, mainwin.getActiveNodeMap(i), i, false);
 
     (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -60 +61 @@
   show_all_children();
 
+}
+
+MapWin::~MapWin()
+{
 }
 
@@ -107 +112 @@
   }
 }
+
+bool MapWin::on_delete_event(GdkEventAny * event)
+{
+  event=event;
+  mainwin.closeMapWin();
+  return true;
+}

map_win.h

@@ -41 +41 @@
   public:
 
-    MapSelector(std::vector<std::string>, int, bool);
+    MapSelector(std::vector<std::string>, std::string, int, bool);
 
     sigc::signal<void, std::string> signal_cbt_ch();
@@ -80 +80 @@
   MapWin(const std::string& title, std::vector<std::string>, std::vector<std::string>, MainWin & mw);
 
+  ~MapWin();
+
+  virtual bool on_delete_event(GdkEventAny *);
+
   void nodeMapChanged(std::string, int);
 

mw-mapselector.cc

@@ -1 +1 @@
 #include "map_win.h"
 
-MapWin::MapSelector::MapSelector(std::vector<std::string> ml, int identifier, bool edge):id(identifier),itisedge(edge),default_state(true),set_new_map(false)
+MapWin::MapSelector::MapSelector(std::vector<std::string> ml, std::string act, int identifier, bool edge):id(identifier),itisedge(edge),set_new_map(false)
 {
   update_list(ml);
 
-  cbt.set_active(0);
+  if(act=="")
+    {
+      cbt.set_active(0);
+      default_state=true;
+    }
+  else
+    {
+      cbt.set_active_text((Glib::ustring)act);
+      default_state=false;
+    }
 
   //binding signal to the actual entry
@@ -56 +65 @@
 void MapWin::MapSelector::update_list( std::vector< std::string > ml )
 {
+  int prev_act=cbt.get_active_row_number();
   cbt.clear();
   std::vector< std::string >::iterator emsi=ml.begin();
@@ -63 +73 @@
     }
   cbt.prepend_text("Default values");
+  if(prev_act!=-1)
+    {
+      cbt.set_active(prev_act);
+    }
 }
 
@@ -78 +92 @@
   else if((!default_state)&&(cbt.get_active_row_number()==0))
     {
-      signal_cbt.emit("");
       reset();
     }
@@ -86 +99 @@
 {
   default_state=true;
+
   cbt.set_active(0);