Changeset 2828 for trunk/packages/vizservers

Timestamp:

Mar 7, 2012, 2:42:57 PM (13 years ago)

Author:

ldelgass

Message:

Remove cruft - ifdef disabled code that calls nonexistant functions

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (5 diffs)
• dxReader.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -71 +71 @@
 
 #define PLANE_CMD               0
-#define __TEST_CODE__           0
-// FOR testing new functions
-#define _LOCAL_ZINC_TEST_       0
-
-#if _LOCAL_ZINC_TEST_
-/* #include "Test.h" */
-#endif
 
 // EXTERN DECLARATIONS
@@ -1148 +1141 @@
     nBytes = buf.size();
 
-#if _LOCAL_ZINC_TEST_
-    //FILE* fp = fopen("/home/nanohub/vrinside/nv/data/HOON/QDWL_100_100_50_strain_8000i.nd_zatom_12_1", "rb");
-    FILE* fp;
-
-    fp = fopen("/home/nanohub/vrinside/nv/data/HOON/GaAs_AlGaAs_2QD_B4.nd_zc_1_wf", "rb");
-    if (fp == NULL) {
-        ERROR("cannot open the file\n");
-        return TCL_ERROR;
-    }
-    unsigned char* b = (unsigned char*)malloc(nBytes);
-    fread(b, nBytes, 1, fp);
-    fclose(fp);
-#endif  /*_LOCAL_ZINC_TEST_*/
     TRACE("Checking header[%.20s]\n", bytes);
 
-    Volume *volPtr;
-    volPtr = NULL;                      // Supress compiler warning.
-    
+    Volume *volPtr = NULL;
+
     if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) {
         TRACE("ZincBlende stream is in\n");
@@ -1172 +1151 @@
         //vol = NvZincBlendeReconstructor::getInstance()->loadFromStream(fdata);
 
-#if _LOCAL_ZINC_TEST_
-        volPtr = NvZincBlendeReconstructor::getInstance()->loadFromMemory(b);
-#else
         volPtr = NvZincBlendeReconstructor::getInstance()->loadFromMemory((void*) buf.bytes());
-#endif  /*_LOCAL_ZINC_TEST_*/
         if (volPtr == NULL) {
             Tcl_AppendResult(interp, "can't get volume instance", (char *)NULL);
@@ -1199 +1174 @@
         Tcl_SetHashValue(hPtr, volPtr);
         volPtr->name(Tcl_GetHashKey(&NanoVis::volumeTable, hPtr));
-#if __TEST_CODE__
-    } else if ((nBytes > 5) && (strncmp(bytes, "<FET>", 5) == 0)) {
-        TRACE("FET loading...\n");
-        std::stringstream fdata;
-        fdata.write(nBytes - 5, bytes + 5);
-        Rappture::Outcome context;
-        volPtr = load_volume_stream3(context, tag, fdata);
-        if (volPtr == NULL) {
-            Tcl_AppendResult(interp, context.remark(), (char*)NULL);
-            return TCL_ERROR;
-        }
-#endif  /*__TEST_CODE__*/
     } else {
         if ((nBytes > 5) && (strncmp(bytes, "<ODX>", 5) == 0)) {
@@ -2394 +2357 @@
     Tcl_CreateObjCommand(interp, "up",          UpCmd,          NULL, NULL);
     Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      NULL, NULL);
-#if __TEST_CODE__
-    Tcl_CreateObjCommand(interp, "test", TestCmd, NULL, NULL);
-#endif
+
     Tcl_InitHashTable(&NanoVis::volumeTable, TCL_STRING_KEYS);
     Tcl_InitHashTable(&NanoVis::heightmapTable, TCL_STRING_KEYS);

trunk/packages/vizservers/nanovis/dxReader.cpp

@@ -41 +41 @@
 #include "NvZincBlendeReconstructor.h"
 
-#define  _LOCAL_ZINC_TEST_ 0
-
 /* Load a 3D volume from a dx-format file
  */
@@ -126 +124 @@
             } else if (sscanf(start, "delta %lg %lg %lg", &ddx, &ddy, &ddz) == 3) {
         int count = 0;
-                // found one of the delta lines
-                if (ddx != 0.0) {
+        // found one of the delta lines
+        if (ddx != 0.0) {
             dx = ddx;
             count++;

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -66 +66 @@
 #include <BMPImageLoaderImpl.h>
 #include <ImageLoaderFactory.h>
-
-//#define  _LOCAL_ZINC_TEST_
 
 // R2 headers