Changeset 955 for trunk

Timestamp:

Mar 17, 2008 1:39:27 PM (16 years ago)

Author:

gah

Message:

fix axis initialization flags

Location:

trunk/vizservers/nanovis

Files:

• Axis.cpp (modified) (1 diff)
• Grid.cpp (modified) (8 diffs)
• nanovis.cpp (modified) (1 diff)

trunk/vizservers/nanovis/Axis.cpp

@@ -128 +128 @@
     _range = 0.0, _scale = 0.0;
     _reqStep = 0.0;
+    _flags = AUTOSCALE;
 }
 

trunk/vizservers/nanovis/Grid.cpp

@@ -4 +4 @@
 
 #define NUMDIGITS       6
+#define GRID_TICK       0.05
 
 Grid::Grid() : 
     _axisColor(1.0f, 1.0f, 1.0f, 1.0f), 
     _majorColor(1.0f, 1.0f, 1.0f, 1.0f), 
-    _minorColor(0.7f, 0.7f, 0.7f, 1.0f), 
+    _minorColor(0.5f, 0.5f, 0.5f, 1.0f), 
     _font(0), 
     _visible(false),
@@ -43 +44 @@
     {
         glVertex3f(0.0f, 0.0f, 0.0f);
-        glVertex3f(1.15f, 0.0f, 0.0f);
+        glVertex3f(1.0f + GRID_TICK, 0.0f, 0.0f);
         glVertex3f(0.0f, 0.0f, 0.0f);
-        glVertex3f(0.0f, 1.15f, 0.0f);
+        glVertex3f(0.0f, 1.0f + GRID_TICK, 0.0f);
         glVertex3f(0.0f, 0.0f, 0.0f);
-        glVertex3f(0.0f, 0.0f, 1.15f);
+        glVertex3f(0.0f, 0.0f, 1.0f + GRID_TICK);
     }
     glEnd();
@@ -66 +67 @@
             glVertex3f(x, 1.0f, 0.0f);
             glVertex3f(x, 0.0f, 0.0f);
-            glVertex3f(x, 0.0f, 1.1f);
+            glVertex3f(x, 0.0f, 1.0f + GRID_TICK);
         }
         for (result = yAxis.FirstMajor(iter); result; result = iter.Next()) {
@@ -72 +73 @@
             y = yAxis.Map(iter.GetValue());
             glVertex3f(0.0f, y, 0.0f);
-            glVertex3f(1.1f, y, 0.0f);
+            glVertex3f(1.0f + GRID_TICK, y, 0.0f);
             glVertex3f(0.0f, y, 0.0f);
             glVertex3f(0.0f, y, 1.0f);
@@ -82 +83 @@
             glVertex3f(0.0f, 1.0f, z);
             glVertex3f(0.0f, 0.0f, z);
-            glVertex3f(1.1f, 0.0f, z);
+            glVertex3f(1.0f + GRID_TICK, 0.0f, z);
         }
     }
@@ -158 +159 @@
             float x;
             x = xAxis.Map(iter.GetValue());
-            if (gluProject(x, 0.0f, 1.11f, mv, prjm, viewport, &wx, &wy, &wz)) {
+            if (gluProject(x, 0.0f, 1.06f, mv, prjm, viewport, &wx, &wy, &wz)) {
                 char buff[20];
                 glLoadIdentity();
@@ -169 +170 @@
             float y;
             y = yAxis.Map(iter.GetValue());
-            if (gluProject(1.11f, y, 0.0f, mv, prjm, viewport, &wx, &wy, &wz)) {
+            if (gluProject(1.06f, y, 0.0f, mv, prjm, viewport, &wx, &wy, &wz)) {
                 char buff[20];
                 glLoadIdentity();
@@ -180 +181 @@
             float z;
             z = zAxis.Map(iter.GetValue());
-            if (gluProject(1.11f, 0.0f, z, mv, prjm, viewport, &wx, &wy, &wz)) {
+            if (gluProject(1.06f, 0.0f, z, mv, prjm, viewport, &wx, &wy, &wz)) {
                 char buff[20];
                 glLoadIdentity();

trunk/vizservers/nanovis/nanovis.cpp

@@ -856 +856 @@
     if (frame_number >= 0) {
         if (directory_name)
-                sprintf(filename, "%s/image%03d.bmp", directory_name, frame_number);
+            sprintf(filename, "%s/image%03d.bmp", directory_name, frame_number);
         else
-                sprintf(filename, "/tmp/flow_animation/image%03d.bmp", frame_number);
+            sprintf(filename, "/tmp/flow_animation/image%03d.bmp", frame_number);
 
         printf("Writing %s\n", filename);
         f = fopen(filename, "wb");
-        if (f == 0)
-        {
-                Trace("cannot create file\n");
-        }
-    }
-    else {
+        if (f == 0) {
+            Trace("cannot create file\n");
+        }
+    } else {
         f = fopen("/tmp/image.bmp", "wb");
-        if (f == 0)
-        {
-                Trace("cannot create file\n");
+        if (f == 0) {
+            Trace("cannot create file\n");
         }
     }