Changeset 4063 for trunk/packages/vizservers/nanovis/ZincBlendeReconstructor.cpp

Timestamp:

Nov 15, 2013 3:32:03 PM (10 years ago)

Author:

ldelgass

Message:

Remove some more Rappture deps from nanovis

File:

• trunk/packages/vizservers/nanovis/ZincBlendeReconstructor.cpp (modified) (11 diffs)

trunk/packages/vizservers/nanovis/ZincBlendeReconstructor.cpp

@@ -61 +61 @@
     do {
         getLine(stream);
-        if (buff[0] == '#') {
+        if (_buff[0] == '#') {
             continue;
-        } else if (strstr((const char*) buff, "object") != 0) {
+        } else if (strstr((const char*) _buff, "object") != 0) {
             TRACE("VERSION 1");
             version = 1;
             break;
-        } else if (strstr(buff, "record format") != 0) {
+        } else if (strstr(_buff, "record format") != 0) {
             TRACE("VERSION 2");
             version = 2;
@@ -77 +77 @@
         float dummy;
 
-        sscanf(buff, "%s%s%s%s%s%d%d%d", str[0], str[1], str[2], str[3], str[4], &width, &height, &depth);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &(origin.x), &(origin.y), &(origin.z));
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &(delta.x), &dummy, &dummy);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &dummy, &(delta.y), &dummy);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &dummy, &dummy, &(delta.z));
+        sscanf(_buff, "%s%s%s%s%s%d%d%d", str[0], str[1], str[2], str[3], str[4], &width, &height, &depth);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &(origin.x), &(origin.y), &(origin.z));
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &(delta.x), &dummy, &dummy);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &dummy, &(delta.y), &dummy);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &dummy, &dummy, &(delta.z));
         do {
             getLine(stream);
-        } while (strcmp(buff, "<\\HDR>") != 0);
+        } while (strcmp(_buff, "<\\HDR>") != 0);
 
         width = width / 4;
@@ -111 +111 @@
         do {
             getLine(stream);
-            if ((pt = strstr(buff, "delta")) != 0) {
+            if ((pt = strstr(_buff, "delta")) != 0) {
                 sscanf(pt, "%s%f%f%f", str[0], &(delta.x), &(delta.y), &(delta.z));
 #ifdef _LOADER_DEBUG_
                 TRACE("delta : %f %f %f", delta.x, delta.y, delta.z);
 #endif
-            } else if ((pt = strstr(buff, "datacount")) != 0) {
+            } else if ((pt = strstr(_buff, "datacount")) != 0) {
                 sscanf(pt, "%s%d", str[0], &datacount);
 #ifdef _LOADER_DEBUG_
                 TRACE("datacount = %d", datacount);
 #endif
-            } else if ((pt = strstr(buff, "datatype")) != 0) {
+            } else if ((pt = strstr(_buff, "datatype")) != 0) {
                 sscanf(pt, "%s%s", str[0], str[1]);
                 if (strcmp(str[1], "double64")) {
                 }
-            } else if ((pt = strstr(buff, "count")) != 0) {
+            } else if ((pt = strstr(_buff, "count")) != 0) {
                 sscanf(pt, "%s%d%d%d", str[0], &width, &height, &depth);
 #ifdef _LOADER_DEBUG_
                 TRACE("width height depth %d %d %d", width, height, depth);
 #endif
-            } else if ((pt = strstr(buff, "emptymark")) != 0) {
+            } else if ((pt = strstr(_buff, "emptymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
                 TRACE("emptyvalue %lf", emptyvalue);
 #endif
-            } else if ((pt = strstr(buff, "emprymark")) != 0) {
+            } else if ((pt = strstr(_buff, "emprymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
@@ -141 +141 @@
 #endif
             }
-        } while (strcmp(buff, "<\\HDR>") != 0 && strcmp(buff, "</HDR>") != 0);
+        } while (strcmp(_buff, "<\\HDR>") != 0 && strcmp(_buff, "</HDR>") != 0);
 
         data = malloc(width * height * depth * 8 * 4 * sizeof(double)); 
@@ -363 +363 @@
         sin.get(ch);
         if (ch == '\n') break;
-        buff[index++] = ch;
+        _buff[index++] = ch;
         if (ch == '>') {
-            if (buff[1] == '\\')
+            if (_buff[1] == '\\')
                 break;
         }
     } while (!sin.eof());
 
-    buff[index] = '\0';
-
-#ifdef _LOADER_DEBUG_
-    TRACE("%s", buff);
+    _buff[index] = '\0';
+
+#ifdef _LOADER_DEBUG_
+    TRACE("%s", _buff);
 #endif
 }
 
 ZincBlendeVolume *
-ZincBlendeReconstructor::loadFromMemory(void *dataBlock)
+ZincBlendeReconstructor::loadFromMemory(const void *dataBlock)
 {
     ZincBlendeVolume *volume = NULL;
@@ -386 +386 @@
     int version = 1;
 
-    unsigned char *stream = (unsigned char *)dataBlock;
+    const unsigned char *stream = (const unsigned char *)dataBlock;
     char str[5][20];
     do {
         getLine(stream);
-        if (buff[0] == '#') {
+        if (_buff[0] == '#') {
             continue;
-        } else if (strstr((const char *)buff, "object") != 0) {
+        } else if (strstr((const char *)_buff, "object") != 0) {
             TRACE("VERSION 1");
             version = 1; 
             break;
-        } else if (strstr(buff, "record format") != 0) {
+        } else if (strstr(_buff, "record format") != 0) {
             TRACE("VERSION 2");
             version = 2; 
@@ -406 +406 @@
         float dummy;
 
-        sscanf(buff, "%s%s%s%s%s%d%d%d", str[0], str[1], str[2], str[3], str[4],&width, &height, &depth);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &(origin.x), &(origin.y), &(origin.z));
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &(delta.x), &dummy, &dummy);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &dummy, &(delta.y), &dummy);
-        getLine(stream); 
-        sscanf(buff, "%s%f%f%f", str[0], &dummy, &dummy, &(delta.z));
+        sscanf(_buff, "%s%s%s%s%s%d%d%d", str[0], str[1], str[2], str[3], str[4],&width, &height, &depth);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &(origin.x), &(origin.y), &(origin.z));
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &(delta.x), &dummy, &dummy);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &dummy, &(delta.y), &dummy);
+        getLine(stream); 
+        sscanf(_buff, "%s%f%f%f", str[0], &dummy, &dummy, &(delta.z));
         do {
             getLine(stream);
-        } while (strcmp(buff, "<\\HDR>") != 0);
+        } while (strcmp(_buff, "<\\HDR>") != 0);
 
         width = width / 4;
@@ -435 +435 @@
         do {
             getLine(stream);
-            if ((pt = strstr(buff, "delta")) != 0) {   
+            if ((pt = strstr(_buff, "delta")) != 0) {   
                 sscanf(pt, "%s%f%f%f", str[0], &(delta.x), &(delta.y), &(delta.z));
 #ifdef _LOADER_DEBUG_
                 TRACE("delta : %f %f %f", delta.x, delta.y, delta.z);
 #endif
-            } else if ((pt = strstr(buff, "datacount")) != 0) {
+            } else if ((pt = strstr(_buff, "datacount")) != 0) {
                 sscanf(pt, "%s%d", str[0], &datacount);
                 TRACE("datacount = %d", datacount);
-            } else if ((pt = strstr(buff, "datatype")) != 0) {
+            } else if ((pt = strstr(_buff, "datatype")) != 0) {
                 sscanf(pt, "%s%s", str[0], str[1]);
                 if (strcmp(str[1], "double64")) {
                 }
-            } else if ((pt = strstr(buff, "count")) != 0) {
+            } else if ((pt = strstr(_buff, "count")) != 0) {
                 sscanf(pt, "%s%d%d%d", str[0], &width, &height, &depth);
 #ifdef _LOADER_DEBUG_
                 TRACE("width height depth %d %d %d", width, height, depth);
 #endif
-            } else if ((pt = strstr(buff, "emptymark")) != 0) {
+            } else if ((pt = strstr(_buff, "emptymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
                 TRACE("emptyvalue %lf", emptyvalue);
 #endif
-            } else if ((pt = strstr(buff, "emprymark")) != 0) {
+            } else if ((pt = strstr(_buff, "emprymark")) != 0) {
                 sscanf(pt, "%s%lf", str[0], &emptyvalue);
 #ifdef _LOADER_DEBUG_
@@ -463 +463 @@
 #endif
             }
-        } while (strcmp(buff, "<\\HDR>") != 0 && strcmp(buff, "</HDR>") != 0);
+        } while (strcmp(_buff, "<\\HDR>") != 0 && strcmp(_buff, "</HDR>") != 0);
 
         if (datacount == -1) datacount = width * height * depth;
@@ -478 +478 @@
 }
 
-void ZincBlendeReconstructor::getLine(unsigned char*& stream)
+void ZincBlendeReconstructor::getLine(const unsigned char*& stream)
 {
     char ch;
@@ -486 +486 @@
         ++stream;
         if (ch == '\n') break;
-        buff[index++] = ch;
+        _buff[index++] = ch;
         if (ch == '>') {
-            if (buff[1] == '\\')
+            if (_buff[1] == '\\')
                 break;
         }
     } while (1);
 
-    buff[index] = '\0';
-
-#ifdef _LOADER_DEBUG_
-    TRACE("%s", buff);
-#endif
-}
+    _buff[index] = '\0';
+
+#ifdef _LOADER_DEBUG_
+    TRACE("%s", _buff);
+#endif
+}