Changeset 4879 for nanovis/branches


Ignore:
Timestamp:
Dec 19, 2014, 5:12:19 PM (5 years ago)
Author:
ldelgass
Message:

Fix for ExecuteCommand?

Location:
nanovis/branches/1.1
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/Command.cpp

    r4874 r4879  
    141141#endif
    142142
     143    lastCmdStatus = TCL_OK;
    143144    result = Tcl_EvalEx(interp, Tcl_DStringValue(dsPtr),
    144145                        Tcl_DStringLength(dsPtr),
     
    146147    Tcl_DStringSetLength(dsPtr, 0);
    147148
     149    if (lastCmdStatus == TCL_BREAK) {
     150        return TCL_BREAK;
     151    }
     152    lastCmdStatus = result;
    148153    if (result != TCL_OK) {
    149154        TRACE("Error: %d", result);
  • nanovis/branches/1.1/Trace.cpp

    r4874 r4879  
    174174    return false;
    175175}
    176 
    177 
  • nanovis/branches/1.1/Trace.h

    r4874 r4879  
    66 */
    77
    8 #ifndef __TRACE_H__
    9 #define __TRACE_H__
     8#ifndef NV_TRACE_H
     9#define NV_TRACE_H
    1010
    1111#include <string>
     
    4444#define INFO(...)       nv::LogMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
    4545
    46 #define USER_ERROR(...) nv::logUserMessage(__VA_ARGS__);
     46#define USER_ERROR(...) nv::logUserMessage(__VA_ARGS__)
    4747
    4848}
  • nanovis/branches/1.1/nanovis.cpp

    r4877 r4879  
    5050#include "HeightMap.h"
    5151#include "NvCamera.h"
     52#include "NvLIC.h"
    5253#include "NvShader.h"
    53 #include "NvLIC.h"
    5454#include "PlaneRenderer.h"
     55#include "Texture2D.h"
    5556#include "Trace.h"
    5657#include "TransferFunction.h"
    5758#include "Unirect.h"
    5859#include "VelocityArrowsSlice.h"
     60#include "Volume.h"
    5961#include "VolumeInterpolator.h"
    6062#include "VolumeRenderer.h"
     
    626628}
    627629
    628 // INSOO
    629 // FOR DEBUGGING
    630630void
    631631NanoVis::bmpWriteToFile(int frame_number, const char *directory_name)
Note: See TracChangeset for help on using the changeset viewer.