Changeset 2409 for branches/blt4/packages/vizservers/nanovis/DataLoader.cpp

Timestamp:

Aug 25, 2011 1:09:15 PM (13 years ago)

Author:

gah

Message:

update from branch

File:

• branches/blt4/packages/vizservers/nanovis/DataLoader.cpp (modified) (15 diffs)

branches/blt4/packages/vizservers/nanovis/DataLoader.cpp

@@ -4 +4 @@
 #include <stdlib.h>
 #include <math.h>
+#include <Trace.h>
 
 inline void endian_swap(unsigned int& x)
@@ -35 +36 @@
         if (path.size() == 0)
         {
-                printf("file not found[%s]\n", path.c_str());
-                return NULL;
+            ERROR("file not found[%s]\n", path.c_str());
+            return NULL;
         }
 
@@ -42 +43 @@
         if (fp == NULL) 
         {
-                printf("ERROR :file not found %s\n", path.c_str());
-                return NULL;
+            ERROR("file not found %s\n", path.c_str());
+            return NULL;
         }
 
@@ -173 +174 @@
         if (path.size() == 0)
         {
-                printf("file not found[%s]\n", path.c_str());
-                return NULL;
+            ERROR("file not found[%s]\n", path.c_str());
+            return NULL;
         }
 
@@ -180 +181 @@
         if (fp == NULL) 
         {
-                printf("ERROR :file not found %s\n", path.c_str());
-                return NULL;
+            ERROR("file not found %s\n", path.c_str());
+            return NULL;
         }
 
@@ -243 +244 @@
                                 if (length > max) 
                                 {
-                                        //printf("max %lf %lf %fl\n", x, y, z);
+                                        //TRACE("max %lf %lf %fl\n", x, y, z);
                                         max = length;
                                 }
@@ -262 +263 @@
         fclose(fp);
 
-        printf("width %d, height %d, depth %d, min %f, max %f, scaleX %f, scaleY %f, scaleZ %f\n", 
+        TRACE("width %d, height %d, depth %d, min %f, max %f, scaleX %f, scaleY %f, scaleZ %f\n", 
                 width, height, depth, min, max, axisScaleX, axisScaleY, axisScaleZ);
         return data;
@@ -273 +274 @@
         if (fname == 0)
         {
-                printf("file name is null\n");
-                return NULL;
+            ERROR("file name is null\n");
+            return NULL;
         }
 
@@ -280 +281 @@
         if (fp == NULL) 
         {
-                printf("ERROR :file not found %s\n", fname);
-                return NULL;
+            ERROR("file not found %s\n", fname);
+            return NULL;
         }
 
@@ -302 +303 @@
         if (fname == 0)
         {
-                printf("file name is null\n");
-                return;
+            ERROR("file name is null\n");
+            return;
         }
 
@@ -309 +310 @@
         if (fp == NULL) 
         {
-                printf("ERROR :file not found %s\n", fname);
-                return;
+            ERROR("file not found %s\n", fname);
+            return;
         }
 
@@ -326 +327 @@
         if (path.size() == 0)
         {
-                printf("file not found[%s]\n", path.c_str());
-                return NULL;
+            ERROR("file not found[%s]\n", path.c_str());
+            return NULL;
         }
 
@@ -333 +334 @@
         if (fp == NULL) 
         {
-                printf("ERROR :file not found %s\n", path.c_str());
-                return NULL;
+            ERROR("file not found %s\n", path.c_str());
+            return NULL;
         }
 
@@ -387 +388 @@
                                 if (length > max) 
                                 {
-                                        printf("max %lf %lf %fl\n", x, y, z);
+                                        TRACE("max %lf %lf %fl\n", x, y, z);
                                         max = length;
                                 }
@@ -406 +407 @@
         fclose(fp);
 
-        printf("width %d, height %d, depth %d, min %f, max %f, scaleX %f, scaleY %f, scaleZ %f\n", 
+        TRACE("width %d, height %d, depth %d, min %f, max %f, scaleX %f, scaleY %f, scaleZ %f\n", 
                 width, height, depth, min, max, axisScaleX, axisScaleY, axisScaleZ);
         return data;