Changeset 204:8fec6a6472fe in glemon-0.x for graph_displayer_canvas-event.cc

Timestamp:

02/20/07 16:08:30 (18 years ago)

Author:

Hegyi Péter

Branch:

fastopen

Phase:

public

Tags:

tip

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/branches/fastopen@3191

Message:

The much faster way.

File:

• graph_displayer_canvas-event.cc (modified) (12 diffs)

graph_displayer_canvas-event.cc

@@ -341 +341 @@
       (nodesmap[active_node])->show();
 
-      nodetextmap[active_node]=new Gnome::Canvas::Text(displayed_graph,
-          clicked_x+node_property_defaults[N_RADIUS]+5,
-          clicked_y+node_property_defaults[N_RADIUS]+5, "");
-      nodetextmap[active_node]->property_fill_color().set_value("darkblue");
-      nodetextmap[active_node]->raise_to_top();
+//       nodetextmap[active_node]=new Gnome::Canvas::Text(displayed_graph,
+//           clicked_x+node_property_defaults[N_RADIUS]+5,
+//           clicked_y+node_property_defaults[N_RADIUS]+5, "");
+//       nodetextmap[active_node]->property_fill_color().set_value("darkblue");
+//       nodetextmap[active_node]->raise_to_top();
 
 //       mapwin.updateNode(active_node);
@@ -467 +467 @@
             text_pos+=(XY(10,10));
 
-            edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph,
-                text_pos.x, text_pos.y, "");
-            edgetextmap[active_edge]->property_fill_color().set_value(
-                "darkgreen");
-            edgetextmap[active_edge]->raise_to_top();
+//             edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph,
+//                 text_pos.x, text_pos.y, "");
+//             edgetextmap[active_edge]->property_fill_color().set_value(
+//                 "darkgreen");
+//             edgetextmap[active_edge]->raise_to_top();
 
             propertyUpdate(active_edge);
@@ -639 +639 @@
               {
                 //at the same time only one can be active
-                if(nodetextmap[i]==active_item)
-                  {
-                    clicked_node=i;
-                  }
+//              if(nodetextmap[i]==active_item)
+//                {
+//                  clicked_node=i;
+//                }
               }
 
@@ -664 +664 @@
                   {
                     //at the same time only one can be active
-                    if(edgetextmap[i]==active_item)
-                      {
-                        clicked_edge=i;
-                      }
+//                  if(edgetextmap[i]==active_item)
+//                    {
+//                      clicked_edge=i;
+//                    }
                   }
 
@@ -691 +691 @@
 
                 //and there is activated map
-                if(nodetextmap[clicked_node]->property_text().get_value()!="")
-                  {
-                    //activate the general variable for it
-                    active_node=clicked_node;
-
-                    //create a dialog
-                    Gtk::Dialog dialog("Edit value", true);
-                    dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-                    dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
-                    Gtk::VBox* vbox = dialog.get_vbox();
-                    Gtk::SpinButton spin(0.0, 4);
-                    spin.set_increments(1.0, 10.0);
-                    spin.set_range(-1000000.0, 1000000.0);
-                    spin.set_numeric(true);
-                    spin.set_value(atof(nodetextmap[active_node]->property_text().get_value().c_str()));
-                    vbox->add(spin);
-                    spin.show();
-                    switch (dialog.run())
-                      {
-                      case Gtk::RESPONSE_NONE:
-                      case Gtk::RESPONSE_CANCEL:
-                        break;
-                      case Gtk::RESPONSE_ACCEPT:
-                        double new_value = spin.get_value();
-                        (*(mytab.mapstorage).nodemap_storage[nodemap_to_edit])[active_node] =
-                          new_value;
-                        std::ostringstream ostr;
-                        ostr << new_value;
-                        nodetextmap[active_node]->property_text().set_value(ostr.str());
-                        //mapwin.updateNode(active_node);
-                        //mapwin.updateNode(Node(INVALID));
-                        propertyUpdate(Node(INVALID));
-                      }
-                  }
+//              if(nodetextmap[clicked_node]->property_text().get_value()!="")
+//                {
+//                  //activate the general variable for it
+//                  active_node=clicked_node;
+
+//                  //create a dialog
+//                  Gtk::Dialog dialog("Edit value", true);
+//                  dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+//                  dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
+//                  Gtk::VBox* vbox = dialog.get_vbox();
+//                  Gtk::SpinButton spin(0.0, 4);
+//                  spin.set_increments(1.0, 10.0);
+//                  spin.set_range(-1000000.0, 1000000.0);
+//                  spin.set_numeric(true);
+//                  spin.set_value(atof(nodetextmap[active_node]->property_text().get_value().c_str()));
+//                  vbox->add(spin);
+//                  spin.show();
+//                  switch (dialog.run())
+//                    {
+//                    case Gtk::RESPONSE_NONE:
+//                    case Gtk::RESPONSE_CANCEL:
+//                      break;
+//                    case Gtk::RESPONSE_ACCEPT:
+//                      double new_value = spin.get_value();
+//                      (*(mytab.mapstorage).nodemap_storage[nodemap_to_edit])[active_node] =
+//                        new_value;
+//                      std::ostringstream ostr;
+//                      ostr << new_value;
+//                      nodetextmap[active_node]->property_text().set_value(ostr.str());
+//                      //mapwin.updateNode(active_node);
+//                      //mapwin.updateNode(Node(INVALID));
+//                      propertyUpdate(Node(INVALID));
+//                    }
+//                }
               }
             else
@@ -734 +734 @@
 
                   //and there is activated map
-                  if(edgetextmap[clicked_edge]->property_text().get_value()!="")
-                    {
-                      //activate the general variable for it
-                      active_edge=clicked_edge;
-
-                      //create a dialog
-                      Gtk::Dialog dialog("Edit value", true);
-                      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-                      dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
-                      Gtk::VBox* vbox = dialog.get_vbox();
-                      Gtk::SpinButton spin(0.0, 4);
-                      spin.set_increments(1.0, 10.0);
-                      spin.set_range(-1000000.0, 1000000.0);
-                      spin.set_numeric(true);
-                      spin.set_value(atof(edgetextmap[active_edge]->property_text().get_value().c_str()));
-                      vbox->add(spin);
-                      spin.show();
-                      switch (dialog.run())
-                        {
-                        case Gtk::RESPONSE_NONE:
-                        case Gtk::RESPONSE_CANCEL:
-                          break;
-                        case Gtk::RESPONSE_ACCEPT:
-                          double new_value = spin.get_value();
-                          (*(mytab.mapstorage).edgemap_storage[edgemap_to_edit])[active_edge] =
-                            new_value;
-                          std::ostringstream ostr;
-                          ostr << new_value;
-                          edgetextmap[active_edge]->property_text().set_value(
-                                                                              ostr.str());
-                          //mapwin.updateEdge(active_edge);
-                          //                   mapwin.updateEdge(Edge(INVALID));
-                          propertyUpdate(Edge(INVALID));
-                        }
-                    }
+//                if(edgetextmap[clicked_edge]->property_text().get_value()!="")
+//                  {
+//                    //activate the general variable for it
+//                    active_edge=clicked_edge;
+
+//                    //create a dialog
+//                    Gtk::Dialog dialog("Edit value", true);
+//                    dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+//                    dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
+//                    Gtk::VBox* vbox = dialog.get_vbox();
+//                    Gtk::SpinButton spin(0.0, 4);
+//                    spin.set_increments(1.0, 10.0);
+//                    spin.set_range(-1000000.0, 1000000.0);
+//                    spin.set_numeric(true);
+//                    spin.set_value(atof(edgetextmap[active_edge]->property_text().get_value().c_str()));
+//                    vbox->add(spin);
+//                    spin.show();
+//                    switch (dialog.run())
+//                      {
+//                      case Gtk::RESPONSE_NONE:
+//                      case Gtk::RESPONSE_CANCEL:
+//                        break;
+//                      case Gtk::RESPONSE_ACCEPT:
+//                        double new_value = spin.get_value();
+//                        (*(mytab.mapstorage).edgemap_storage[edgemap_to_edit])[active_edge] =
+//                          new_value;
+//                        std::ostringstream ostr;
+//                        ostr << new_value;
+//                        edgetextmap[active_edge]->property_text().set_value(
+//                                                                            ostr.str());
+//                        //mapwin.updateEdge(active_edge);
+//                        //                   mapwin.updateEdge(Edge(INVALID));
+//                        propertyUpdate(Edge(INVALID));
+//                      }
+//                  }
                 }
             break;
@@ -781 +781 @@
 void GraphDisplayerCanvas::deleteItem(Node node_to_delete)
 {
-  delete(nodetextmap[node_to_delete]);
+  //  delete(nodetextmap[node_to_delete]);
   delete(nodesmap[node_to_delete]);
   (mytab.mapstorage).graph.erase(node_to_delete);
@@ -788 +788 @@
 void GraphDisplayerCanvas::deleteItem(Edge edge_to_delete)
 {
-  delete(edgetextmap[edge_to_delete]);
+  //  delete(edgetextmap[edge_to_delete]);
   delete(edgesmap[edge_to_delete]);
   (mytab.mapstorage).graph.erase(edge_to_delete);
@@ -796 +796 @@
 {
   new_place+=(XY(10,10));
-  edgetextmap[forming_edge]->property_x().set_value(new_place.x);
-  edgetextmap[forming_edge]->property_y().set_value(new_place.y);
+//   edgetextmap[forming_edge]->property_x().set_value(new_place.x);
+//   edgetextmap[forming_edge]->property_y().set_value(new_place.y);
 }
 
@@ -849 +849 @@
   //repositioning node and its text
   moved_item->move(dx, dy);
-  nodetextmap[moved_node]->move(dx, dy);
+  //  nodetextmap[moved_node]->move(dx, dy);
 
   // the new coordinates of the centre of the node 
@@ -885 +885 @@
       XY text_pos=mytab.mapstorage.arrow_pos[ei];
       text_pos+=(XY(10,10));
-      edgetextmap[ei]->property_x().set_value(text_pos.x);
-      edgetextmap[ei]->property_y().set_value(text_pos.y);
+//       edgetextmap[ei]->property_x().set_value(text_pos.x);
+//       edgetextmap[ei]->property_y().set_value(text_pos.y);
     }
 
@@ -909 +909 @@
           XY text_pos=mytab.mapstorage.arrow_pos[ei];
           text_pos+=(XY(10,10));
-          edgetextmap[ei]->property_x().set_value(text_pos.x);
-          edgetextmap[ei]->property_y().set_value(text_pos.y);
+//        edgetextmap[ei]->property_x().set_value(text_pos.x);
+//        edgetextmap[ei]->property_y().set_value(text_pos.y);
         }
     }