Changeset 194:6b2b718420eb in glemon-0.x for graph_displayer_canvas-edge.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-edge.cc (modified) (9 diffs)

graph_displayer_canvas-edge.cc

@@ -17 +17 @@
  */
 
-#include "graph_displayer_canvas.h"
+#include <graph_displayer_canvas.h>
+#include <mapstorage.h>
+#include <nbtab.h>
 #include <cmath>
 
@@ -28 +30 @@
   min=edge_property_defaults[E_WIDTH];
   max=edge_property_defaults[E_WIDTH];
-  Graph::EdgeMap<double> actual_map((mytab.mapstorage).graph,edge_property_defaults[E_WIDTH]);
+  Graph::EdgeMap<double> actual_map((mytab.mapstorage)->graph,edge_property_defaults[E_WIDTH]);
   
   if(edge==INVALID)
     {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double v=fabs(actual_map[i]);
@@ -69 +71 @@
   double min, max;
 
-  min=(mytab.mapstorage).minOfEdgeMap(mapname);
-  max=(mytab.mapstorage).maxOfEdgeMap(mapname);
-  actual_map=((mytab.mapstorage).edgemap_storage)[mapname];
-
-  if(edge==INVALID)
-    {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  min=(mytab.mapstorage)->minOfEdgeMap(mapname);
+  max=(mytab.mapstorage)->maxOfEdgeMap(mapname);
+  actual_map=((mytab.mapstorage)->edgemap_storage)[mapname];
+
+  if(edge==INVALID)
+    {
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double v=(*actual_map)[i];
@@ -132 +134 @@
   //green in RGB
   Graph::EdgeMap<double> * actual_map;
-  actual_map=((mytab.mapstorage).edgemap_storage)[mapname];
+  actual_map=((mytab.mapstorage)->edgemap_storage)[mapname];
 
   double max, min;
 
-  max=(mytab.mapstorage).maxOfEdgeMap(mapname);
-  min=(mytab.mapstorage).minOfEdgeMap(mapname);
-
-  if(edge==INVALID)
-    {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  max=(mytab.mapstorage)->maxOfEdgeMap(mapname);
+  min=(mytab.mapstorage)->minOfEdgeMap(mapname);
+
+  if(edge==INVALID)
+    {
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double w=(*actual_map)[i];
@@ -183 +185 @@
   //the minimum of the nodemap to the range of
   //green in RGB
-  Graph::EdgeMap<double> actual_map((mytab.mapstorage).graph,edge_property_defaults[E_COLOR]);
+  Graph::EdgeMap<double> actual_map((mytab.mapstorage)->graph,edge_property_defaults[E_COLOR]);
 
   double max, min;
@@ -192 +194 @@
   if(edge==INVALID)
     {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double w=actual_map[i];
@@ -237 +239 @@
   if(edge==INVALID)
     {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           edgemap_to_edit=mapname;
-          double number=(*((mytab.mapstorage).edgemap_storage)[mapname])[i];
+          double number=(*((mytab.mapstorage)->edgemap_storage)[mapname])[i];
           
           std::ostringstream ostr;
@@ -251 +253 @@
   else
     {
-          double number=(*((mytab.mapstorage).edgemap_storage)[mapname])[edge];
+          double number=(*((mytab.mapstorage)->edgemap_storage)[mapname])[edge];
 
           std::ostringstream ostr;
@@ -272 +274 @@
   if(edge==INVALID)
     {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           edgemap_to_edit="";