Changeset 4879 for nanovis/branches

Timestamp:

Dec 19, 2014 2:12:19 PM (9 years ago)

Author:

ldelgass

Message:

Fix for ExecuteCommand?

Location:

nanovis/branches/1.1

Files:

• Command.cpp (modified) (2 diffs)
• Trace.cpp (modified) (1 diff)
• Trace.h (modified) (2 diffs)
• nanovis.cpp (modified) (2 diffs)

nanovis/branches/1.1/Command.cpp

@@ -141 +141 @@
 #endif
 
+    lastCmdStatus = TCL_OK;
     result = Tcl_EvalEx(interp, Tcl_DStringValue(dsPtr),
                         Tcl_DStringLength(dsPtr),
@@ -146 +147 @@
     Tcl_DStringSetLength(dsPtr, 0);
 
+    if (lastCmdStatus == TCL_BREAK) {
+        return TCL_BREAK;
+    }
+    lastCmdStatus = result;
     if (result != TCL_OK) {
         TRACE("Error: %d", result);

nanovis/branches/1.1/Trace.cpp

@@ -174 +174 @@
     return false;
 }
-
-

nanovis/branches/1.1/Trace.h

@@ -6 +6 @@
  */
 
-#ifndef __TRACE_H__
-#define __TRACE_H__
+#ifndef NV_TRACE_H
+#define NV_TRACE_H
 
 #include <string>
@@ -44 +44 @@
 #define INFO(...)       nv::LogMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 
-#define USER_ERROR(...) nv::logUserMessage(__VA_ARGS__);
+#define USER_ERROR(...) nv::logUserMessage(__VA_ARGS__)
 
 }

nanovis/branches/1.1/nanovis.cpp

@@ -50 +50 @@
 #include "HeightMap.h"
 #include "NvCamera.h"
+#include "NvLIC.h"
 #include "NvShader.h"
-#include "NvLIC.h"
 #include "PlaneRenderer.h"
+#include "Texture2D.h"
 #include "Trace.h"
 #include "TransferFunction.h"
 #include "Unirect.h"
 #include "VelocityArrowsSlice.h"
+#include "Volume.h"
 #include "VolumeInterpolator.h"
 #include "VolumeRenderer.h"
@@ -626 +628 @@
 }
 
-// INSOO
-// FOR DEBUGGING
 void
 NanoVis::bmpWriteToFile(int frame_number, const char *directory_name)