Changeset 1117 for trunk/packages/vizservers/nanovis

Timestamp:

Aug 18, 2008, 2:13:34 PM (16 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis/transfer-function

Files:

• MainWindow.cpp (modified) (2 diffs)
• TransferFunctionGLUTWindow.cpp (modified) (4 diffs)

trunk/packages/vizservers/nanovis/transfer-function/MainWindow.cpp

@@ -272 +272 @@
         fgets(buf, 100, fp);
         token=strtok(buf, seps);
-        num_of_control_point=atof(token);
+        num_of_control_point=(int)atof(token);
 
         //read control points
@@ -294 +294 @@
         fgets(buf, 100, fp);
         token=strtok(buf, seps);
-        num_of_color_point=atof(token);
+        num_of_color_point=(int)atof(token);
 
 

trunk/packages/vizservers/nanovis/transfer-function/TransferFunctionGLUTWindow.cpp

@@ -93 +93 @@
     tf_winy=main_window_y*2/3;
 
-    unitHeight = 0.8*tf_winy;
-    tf_unitWidth = 0.95*tf_winx;
+    unitHeight = (int)(0.8*tf_winy);
+    tf_unitWidth = (int)(0.95*tf_winx);
 
 
@@ -382 +382 @@
         lv_tf_height_scale += (scY - gv_lastY)*0.007;
         gv_lastY = scY;
-        scalePointsY(scY - gv_lastY);
+        scalePointsY((int)(scY - gv_lastY));
     }   
 
@@ -466 +466 @@
     winy = y;
 
-    unitHeight = 0.8*y;
-    tf_unitWidth = 0.95*x;
+    unitHeight = (int)(0.8*y);
+    tf_unitWidth = (int)(0.95*x);
 
     xy_aspect = (float)x / (float)y;
@@ -505 +505 @@
     ControlPoint* cur=tf_pointList;
     int allSameY=1;
-    int y=tf_pointList->y;
+    int y=(int)tf_pointList->y;
     while (cur!=0){
         if (cur->y!=y){