Ignore:
Timestamp:
Aug 2, 2014, 2:06:20 PM (5 years ago)
Author:
ldelgass
Message:

merge r3597 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/Command.cpp

    r3568 r4612  
    2626 *        o Use Tcl command option parser to reduce size of procedures, remove
    2727 *          lots of extra error checking code. (almost there)
    28  *        o Convert GetVolumeIndices to GetVolumes.  Goal is to remove
    29  *          all references of Nanovis::volume[] from this file.  Don't
    30  *          want to know how volumes are stored. Same for heightmaps.
    31  *        o Rationalize volume id scheme. Right now it's the index in
    32  *          the vector. 1) Use a list instead of a vector. 2) carry
    33  *          an id field that's a number that gets incremented each new volume.
    3428 *        o Add bookkeeping for volumes, heightmaps, flows, etc. to track
    35  *          1) id #  2) simulation # 3) include/exclude.  The include/exclude
     29 *          1) simulation # 2) include/exclude.  The include/exclude
    3630 *          is to indicate whether the item should contribute to the overall
    3731 *          limits of the axes.
     
    4539
    4640#include <RpField1D.h>
    47 #include <RpFieldRect3D.h>
    48 #include <RpFieldPrism3D.h>
    4941#include <RpEncode.h>
    5042#include <RpOutcome.h>
     
    5547#include "nanovis.h"
    5648#include "CmdProc.h"
     49#include "FlowCmd.h"
    5750#include "Trace.h"
    5851#ifdef USE_POINTSET_RENDERER
     
    109102}";
    110103
    111 static Tcl_ObjCmdProc AxisCmd;
    112 static Tcl_ObjCmdProc CameraCmd;
    113 static Tcl_ObjCmdProc CutplaneCmd;
    114 extern Tcl_AppInitProc FlowCmdInitProc;
    115 static Tcl_ObjCmdProc GridCmd;
    116 static Tcl_ObjCmdProc LegendCmd;
    117 static Tcl_ObjCmdProc ScreenCmd;
    118 static Tcl_ObjCmdProc SnapshotCmd;
    119 static Tcl_ObjCmdProc TransfuncCmd;
    120 static Tcl_ObjCmdProc Unirect2dCmd;
    121 static Tcl_ObjCmdProc UpCmd;
    122 static Tcl_ObjCmdProc VolumeCmd;
    123 
    124104bool
    125105GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, bool *boolPtr)
     
    22282208    return interp;
    22292209}
    2230 
    2231 
Note: See TracChangeset for help on using the changeset viewer.