Changeset 201:879e47e5b731 in glemon-0.x for nbtab.cc

Timestamp:

01/02/08 22:03:09 (16 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

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

Message:

Merge branches/akos to trunk.

File:

• nbtab.cc (modified) (14 diffs)

nbtab.cc

@@ -31 +31 @@
 
   Gtk::ScrolledWindow *pScrolledWindow = manage(new Gtk::ScrolledWindow);
+  pScrolledWindow->set_shadow_type(Gtk::SHADOW_ETCHED_IN);
   gd_canvas=new GraphDisplayerCanvas(*this);
   pScrolledWindow->add(*gd_canvas);
@@ -47 +48 @@
 {
   mapstorage->readFromFile(file);
-  mapstorage->file_name = file;
-  mapstorage->modified = false;
+  mapstorage->setFileName(file);
+  mapstorage->setModified(false);
   gd_canvas->drawGraph();
   if(mapwinexists)
     {
-      mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
+      mapwin->update(
+          mapstorage->getEdgeMapList(NUM),
+          mapstorage->getEdgeMapList(STR),
+          mapstorage->getNodeMapList(NUM),
+          mapstorage->getNodeMapList(STR));
     }
   title_changed(Glib::filename_display_basename(file));
@@ -59 +64 @@
 void NoteBookTab::newFile()
 {
-  if (mapstorage->modified)
+  if (mapstorage->getModified())
   {
     Gtk::MessageDialog mdialog("<b>Save changes before closing?</b>", true,
@@ -81 +86 @@
   if(mapwinexists)
     {
-      mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
+      mapwin->update(
+          mapstorage->getEdgeMapList(NUM),
+          mapstorage->getEdgeMapList(STR),
+          mapstorage->getNodeMapList(NUM),
+          mapstorage->getNodeMapList(STR));
     }
   title_changed("unsaved file");
@@ -88 +97 @@
 void NoteBookTab::openFile()
 {
-  if (mapstorage->modified)
+  if (mapstorage->getModified())
   {
     Gtk::MessageDialog mdialog("<b>Save changes before closing?</b>", true, 
@@ -116 +125 @@
     if (!mapstorage->readFromFile(filename))
     {
-      mapstorage->file_name = filename;
-      mapstorage->modified = false;
+      mapstorage->setFileName(filename);
+      mapstorage->setModified(false);
       gd_canvas->drawGraph();
       if(mapwinexists)
         {
-          mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
+          mapwin->update(
+              mapstorage->getEdgeMapList(NUM),
+              mapstorage->getEdgeMapList(STR),
+              mapstorage->getNodeMapList(NUM),
+              mapstorage->getNodeMapList(STR));
         }
       title_changed(Glib::filename_display_basename(filename));
@@ -130 +143 @@
 void NoteBookTab::saveFile()
 {
-  if (mapstorage->file_name == "") {
+  if (mapstorage->getFileName() == "") {
     saveFileAs();
   }
   else
   {
-    mapstorage->writeToFile(mapstorage->file_name);
-    mapstorage->modified = false;
-    title_changed(Glib::filename_display_basename(mapstorage->file_name));
+    mapstorage->writeToFile(mapstorage->getFileName());
+    mapstorage->setModified(false);
+    title_changed(Glib::filename_display_basename(mapstorage->getFileName()));
   }
 }
@@ -149 +162 @@
   {
     Glib::ustring filename = fcdialog.get_filename();
-    mapstorage->file_name = filename;
+    mapstorage->setFileName(filename);
     mapstorage->writeToFile(filename);
-    mapstorage->modified = false;
+    mapstorage->setModified(false);
     title_changed(Glib::filename_display_basename(filename));
   }
@@ -158 +171 @@
 void NoteBookTab::close()
 {
-  if (mapstorage->modified)
+  if (mapstorage->getModified())
   {
     Gtk::MessageDialog mdialog("<b>Save changes before closing?</b>", true,
@@ -180 +193 @@
   if(mapwinexists)
     {
-      mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
+      mapwin->update(
+          mapstorage->getEdgeMapList(NUM),
+          mapstorage->getEdgeMapList(STR),
+          mapstorage->getNodeMapList(NUM),
+          mapstorage->getNodeMapList(STR));
     }
   title_changed("unsaved file");
@@ -210 +227 @@
 }
 
-void NoteBookTab::registerNewEdgeMap(std::string mapname)
-{
-  if(mapwinexists)
-    {
-      mapwin->registerNewEdgeMap(mapname);
-    }
-}
-
-void NoteBookTab::registerNewNodeMap(std::string mapname)
-{
-  if(mapwinexists)
-    {
-      mapwin->registerNewNodeMap(mapname);
+void NoteBookTab::registerNewEdgeMap(std::string mapname, MapValue::Type type)
+{
+  if(mapwinexists)
+    {
+      mapwin->registerNewEdgeMap(mapname, type);
+    }
+}
+
+void NoteBookTab::registerNewNodeMap(std::string mapname, MapValue::Type type)
+{
+  if(mapwinexists)
+    {
+      mapwin->registerNewNodeMap(mapname, type);
     }
   if(epswinexists)
     {
-      epswin->registerNewNodeMap(mapname);
+      epswin->registerNewNodeMap(mapname, type);
     }
 }
@@ -234 +251 @@
   if(!mapwinexists)
     {
-      mapwin=new MapWin("Map Setup - "+name, mapstorage->getEdgeMapList(), mapstorage->getNodeMapList(), *this);
+      mapwin=new MapWin("Map Setup - "+name,
+          mapstorage->getEdgeMapList(NUM),
+          mapstorage->getEdgeMapList(STR),
+          mapstorage->getNodeMapList(NUM),
+          mapstorage->getNodeMapList(STR),
+          *this);
       mapst2mapwin=mapstorage->signal_map_win_ch().connect(sigc::mem_fun(*mapwin, &MapWin::changeEntry));
       mapwin->show();
@@ -245 +267 @@
   if(!epswinexists)
     {
-      epswin=new EpsWin("Export to EPS - "+name, mapstorage->getNodeMapList());
+      epswin=new EpsWin("Export to EPS - "+name, mapstorage->getNodeMapList(NUM), mapstorage->getNodeMapList(STR));
       epswin->show();
       epswinexists=true;
@@ -264 +286 @@
       designwin=new DesignWin("Design Setup - "+name, attraction, propulsation, iterations);
 
-      designwin->signal_attraction().connect(sigc::mem_fun(mapstorage, &MapStorage::set_attraction));
-      designwin->signal_propulsation().connect(sigc::mem_fun(mapstorage, &MapStorage::set_propulsation));
-      designwin->signal_iteration().connect(sigc::mem_fun(mapstorage, &MapStorage::set_iteration));
+      designwin->signal_attraction().connect(sigc::mem_fun(*mapstorage, &MapStorage::set_attraction));
+      designwin->signal_propulsation().connect(sigc::mem_fun(*mapstorage, &MapStorage::set_propulsation));
+      designwin->signal_iteration().connect(sigc::mem_fun(*mapstorage, &MapStorage::set_iteration));
       designwin->close_run().connect(sigc::mem_fun(*gd_canvas, &GraphDisplayerCanvas::reDesignGraph));