Changeset 194:6b2b718420eb in glemon-0.x for graph_displayer_canvas-node.cc

Timestamp:

02/28/07 19:20:28 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Header reorganising

File:

• graph_displayer_canvas-node.cc (modified) (8 diffs)

graph_displayer_canvas-node.cc

@@ -17 +17 @@
  */
 
-#include "graph_displayer_canvas.h"
+#include <graph_displayer_canvas.h>
+#include <mapstorage.h>
+#include <nbtab.h>
 #include <cmath>
 
@@ -26 +28 @@
   Graph::NodeMap<double> * actual_map;
   double min, max;
-  min=(mytab.mapstorage).minOfNodeMap(mapname);
-  max=(mytab.mapstorage).maxOfNodeMap(mapname);
-  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
-
-  if(node==INVALID)
-    {
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  min=(mytab.mapstorage)->minOfNodeMap(mapname);
+  max=(mytab.mapstorage)->maxOfNodeMap(mapname);
+  actual_map=((mytab.mapstorage)->nodemap_storage)[mapname];
+
+  if(node==INVALID)
+    {
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double v=fabs((*actual_map)[i]);
@@ -104 +106 @@
   min=node_property_defaults[N_RADIUS];
   max=node_property_defaults[N_RADIUS];
-  Graph::NodeMap<double> actual_map((mytab.mapstorage).graph,node_property_defaults[N_RADIUS]);
+  Graph::NodeMap<double> actual_map((mytab.mapstorage)->graph,node_property_defaults[N_RADIUS]);
   
   if(node==INVALID)
     {
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double v=fabs(actual_map[i]);
@@ -168 +170 @@
 
   Graph::NodeMap<double> * actual_map;
-  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
+  actual_map=((mytab.mapstorage)->nodemap_storage)[mapname];
 
   double max, min;
 
-  max=(mytab.mapstorage).maxOfNodeMap(mapname);
-  min=(mytab.mapstorage).minOfNodeMap(mapname);
-
-  if(node==INVALID)
-    {
-
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  max=(mytab.mapstorage)->maxOfNodeMap(mapname);
+  min=(mytab.mapstorage)->minOfNodeMap(mapname);
+
+  if(node==INVALID)
+    {
+
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           Gdk::Color color;
@@ -223 +225 @@
   //green in RGB
 
-  Graph::NodeMap<double> actual_map((mytab.mapstorage).graph,node_property_defaults[N_COLOR]);
+  Graph::NodeMap<double> actual_map((mytab.mapstorage)->graph,node_property_defaults[N_COLOR]);
 
   double max, min;
@@ -233 +235 @@
     {
 
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           Gdk::Color color;
@@ -280 +282 @@
 
   Graph::NodeMap<double> * actual_map=NULL;
-  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
-
-  if(node==INVALID)
-    {
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  actual_map=((mytab.mapstorage)->nodemap_storage)[mapname];
+
+  if(node==INVALID)
+    {
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           nodemap_to_edit=mapname;
@@ -317 +319 @@
   if(node==INVALID)
     {
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           nodemap_to_edit="";