Changeset 4885 for nanovis


Ignore:
Timestamp:
Dec 19, 2014, 8:13:34 PM (4 years ago)
Author:
ldelgass
Message:

Merge fixes from release branch

Location:
nanovis/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk/FlowCmd.cpp

    r4880 r4885  
    270270    {
    271271        char info[1024];
    272         int length = 
     272        int length =
    273273            sprintf(info, "nv>data tag %s min %g max %g\n",
    274274                    flow->name(), range[0], range[1]);
     
    287287
    288288static CmdSpec flowDataOps[] = {
    289     {"follows", 2, FlowDataFollowsOp, 5, 5, "size nComponents",},
     289    {"follows", 1, FlowDataFollowsOp, 5, 5, "size nComponents",},
    290290};
    291291static int nFlowDataOps = NumCmdSpecs(flowDataOps);
  • nanovis/trunk/protocol-nanovis.txt

    r4817 r4885  
    9696          This doesn't currently produce a response, it only returns a Tcl list
    9797          within the server's interpreter
    98 
    9998<flowObj> configure <?option value...?>
    10099          -ambient <val>
     
    106105          -opacity <val>
    107106          -outline <bool>
    108           -position <val|%val>
    109            val = world coordinate, or %val = [0,100]
     107          -position <val|val%>
     108           val = world coordinate, or val% = [0,100]
    110109          -slice <bool>
    111110          -specularExp <val>
     
    116115          Send flow data.  Data bytes follow the newline after the command
    117116<flowObj> legend <w> <h>
    118 
    119117<flowObj> particles add <name> <?switches?>
    120118          see '<flowObj> particles configure' for switches
     
    123121          -color <{r g b a}>
    124122          -hide <bool>
    125           -position <val|%val>
    126            val = [0,100], or %val = [0,1]
     123          -position <val|val%>
     124           val = world coordinate, or val% = [0,100]
    127125          -size <val>
    128126<flowObj> particles delete <names>
Note: See TracChangeset for help on using the changeset viewer.