Changeset 4893
- Timestamp:
- Dec 20, 2014, 2:49:45 AM (10 years ago)
- Location:
- nanovis/branches/1.1
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
nanovis/branches/1.1
- Property svn:mergeinfo changed
/trunk/packages/vizservers/nanovis merged: 4056
- Property svn:mergeinfo changed
-
nanovis/branches/1.1/CmdProc.cpp
r4892 r4893 10 10 #include "CmdProc.h" 11 11 12 using namespace Rappture;12 using namespace nv; 13 13 14 14 /** … … 115 115 */ 116 116 Tcl_ObjCmdProc * 117 Rappture::GetOpFromObj(Tcl_Interp *interp, /* Interpreter to report errors to */118 119 120 121 122 123 124 125 126 117 nv::GetOpFromObj(Tcl_Interp *interp, /* Interpreter to report errors to */ 118 int nSpecs, /* Number of specifications in array */ 119 CmdSpec *specs, /* Op specification array */ 120 int operPos, /* Position of operation in argument 121 * list. */ 122 int objc, /* Number of arguments in the argument 123 * vector. This includes any prefixed 124 * arguments */ 125 Tcl_Obj *const *objv, /* Argument vector */ 126 int flags) 127 127 { 128 128 CmdSpec *specPtr; -
nanovis/branches/1.1/CmdProc.h
r4889 r4893 4 4 * 5 5 */ 6 #ifndef RAPPTURE_CMDPROC_H7 #define RAPPTURE_CMDPROC_H6 #ifndef NV_CMDPROC_H 7 #define NV_CMDPROC_H 8 8 9 namespace Rappture{9 namespace nv { 10 10 11 11 /** … … 38 38 CmdSpec *specs, int operPos, int objc, Tcl_Obj *const *objv, int flags); 39 39 40 #define NumCmdSpecs(s) (sizeof(s) / sizeof( Rappture::CmdSpec))40 #define NumCmdSpecs(s) (sizeof(s) / sizeof(nv::CmdSpec)) 41 41 42 42 } -
nanovis/branches/1.1/Command.cpp
r4889 r4893 648 648 } 649 649 650 static Rappture::CmdSpec cameraOps[] = {650 static CmdSpec cameraOps[] = { 651 651 {"angle", 2, CameraAngleOp, 5, 5, "xAngle yAngle zAngle",}, 652 652 {"orient", 1, CameraOrientOp, 6, 6, "qw qx qy qz",}, … … 664 664 Tcl_ObjCmdProc *proc; 665 665 666 proc = Rappture::GetOpFromObj(interp, nCameraOps, cameraOps,667 Rappture::CMDSPEC_ARG1, objc, objv, 0);666 proc = GetOpFromObj(interp, nCameraOps, cameraOps, 667 CMDSPEC_ARG1, objc, objv, 0); 668 668 if (proc == NULL) { 669 669 return TCL_ERROR; … … 778 778 } 779 779 780 static Rappture::CmdSpec cutplaneOps[] = {780 static CmdSpec cutplaneOps[] = { 781 781 {"position", 1, CutplanePositionOp, 4, 0, "relval axis ?indices?",}, 782 782 {"state", 1, CutplaneStateOp, 4, 0, "bool axis ?indices?",}, … … 806 806 Tcl_ObjCmdProc *proc; 807 807 808 proc = Rappture::GetOpFromObj(interp, nCutplaneOps, cutplaneOps,809 Rappture::CMDSPEC_ARG1, objc, objv, 0);808 proc = GetOpFromObj(interp, nCutplaneOps, cutplaneOps, 809 CMDSPEC_ARG1, objc, objv, 0); 810 810 if (proc == NULL) { 811 811 return TCL_ERROR; … … 985 985 } 986 986 987 static Rappture::CmdSpec screenOps[] = {987 static CmdSpec screenOps[] = { 988 988 {"bgcolor", 1, ScreenBgColorOp, 5, 5, "r g b",}, 989 989 {"size", 1, ScreenSizeOp, 4, 4, "width height",}, … … 997 997 Tcl_ObjCmdProc *proc; 998 998 999 proc = Rappture::GetOpFromObj(interp, nScreenOps, screenOps,1000 Rappture::CMDSPEC_ARG1, objc, objv, 0);999 proc = GetOpFromObj(interp, nScreenOps, screenOps, 1000 CMDSPEC_ARG1, objc, objv, 0); 1001 1001 if (proc == NULL) { 1002 1002 return TCL_ERROR; … … 1234 1234 } 1235 1235 1236 static Rappture::CmdSpec volumeAnimationOps[] = {1236 static CmdSpec volumeAnimationOps[] = { 1237 1237 {"capture", 2, VolumeAnimationCaptureOp, 4, 5, "numframes ?filename?",}, 1238 1238 {"clear", 2, VolumeAnimationClearOp, 3, 3, "",}, … … 1250 1250 Tcl_ObjCmdProc *proc; 1251 1251 1252 proc = Rappture::GetOpFromObj(interp, nVolumeAnimationOps,1253 volumeAnimationOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);1252 proc = GetOpFromObj(interp, nVolumeAnimationOps, 1253 volumeAnimationOps, CMDSPEC_ARG2, objc, objv, 0); 1254 1254 if (proc == NULL) { 1255 1255 return TCL_ERROR; … … 1384 1384 } 1385 1385 1386 static Rappture::CmdSpec volumeDataOps[] = {1386 static CmdSpec volumeDataOps[] = { 1387 1387 {"follows", 1, VolumeDataFollowsOp, 5, 5, "nbytes tag",}, 1388 1388 {"state", 1, VolumeDataStateOp, 4, 0, "bool ?indices?",}, … … 1396 1396 Tcl_ObjCmdProc *proc; 1397 1397 1398 proc = Rappture::GetOpFromObj(interp, nVolumeDataOps, volumeDataOps,1399 Rappture::CMDSPEC_ARG2, objc, objv, 0);1398 proc = GetOpFromObj(interp, nVolumeDataOps, volumeDataOps, 1399 CMDSPEC_ARG2, objc, objv, 0); 1400 1400 if (proc == NULL) { 1401 1401 return TCL_ERROR; … … 1488 1488 } 1489 1489 1490 static Rappture::CmdSpec volumeOutlineOps[] = {1490 static CmdSpec volumeOutlineOps[] = { 1491 1491 {"color", 1, VolumeOutlineColorOp, 6, 0, "r g b ?indices?",}, 1492 1492 {"state", 1, VolumeOutlineStateOp, 4, 0, "bool ?indices?",}, … … 1501 1501 Tcl_ObjCmdProc *proc; 1502 1502 1503 proc = Rappture::GetOpFromObj(interp, nVolumeOutlineOps, volumeOutlineOps,1504 Rappture::CMDSPEC_ARG2, objc, objv, 0);1503 proc = GetOpFromObj(interp, nVolumeOutlineOps, volumeOutlineOps, 1504 CMDSPEC_ARG2, objc, objv, 0); 1505 1505 if (proc == NULL) { 1506 1506 return TCL_ERROR; … … 1680 1680 } 1681 1681 1682 static Rappture::CmdSpec volumeShadingOps[] = {1682 static CmdSpec volumeShadingOps[] = { 1683 1683 {"ambient", 1, VolumeShadingAmbientOp, 4, 0, "value ?indices?",}, 1684 1684 {"diffuse", 1, VolumeShadingDiffuseOp, 4, 0, "value ?indices?",}, … … 1698 1698 Tcl_ObjCmdProc *proc; 1699 1699 1700 proc = Rappture::GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps,1701 Rappture::CMDSPEC_ARG2, objc, objv, 0);1700 proc = GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps, 1701 CMDSPEC_ARG2, objc, objv, 0); 1702 1702 if (proc == NULL) { 1703 1703 return TCL_ERROR; … … 1725 1725 } 1726 1726 1727 static Rappture::CmdSpec volumeOps[] = {1727 static CmdSpec volumeOps[] = { 1728 1728 {"animation", 2, VolumeAnimationOp, 3, 0, "oper ?args?",}, 1729 1729 {"data", 2, VolumeDataOp, 3, 0, "oper ?args?",}, … … 1743 1743 Tcl_ObjCmdProc *proc; 1744 1744 1745 proc = Rappture::GetOpFromObj(interp, nVolumeOps, volumeOps,1746 Rappture::CMDSPEC_ARG1, objc, objv, 0);1745 proc = GetOpFromObj(interp, nVolumeOps, volumeOps, 1746 CMDSPEC_ARG1, objc, objv, 0); 1747 1747 if (proc == NULL) { 1748 1748 return TCL_ERROR; … … 1765 1765 return TCL_ERROR; 1766 1766 } 1767 Rappture::Unirect2d data(1);1767 Unirect2d data(1); 1768 1768 if (data.parseBuffer(interp, buf) != TCL_OK) { 1769 1769 return TCL_ERROR; … … 1819 1819 } 1820 1820 1821 static Rappture::CmdSpec heightMapDataOps[] = {1821 static CmdSpec heightMapDataOps[] = { 1822 1822 {"follows", 1, HeightMapDataFollowsOp, 5, 5, "size heightmapName",}, 1823 1823 {"visible", 1, HeightMapDataVisibleOp, 4, 0, "bool ?heightmapNames...?",}, … … 1831 1831 Tcl_ObjCmdProc *proc; 1832 1832 1833 proc = Rappture::GetOpFromObj(interp, nHeightMapDataOps, heightMapDataOps,1834 Rappture::CMDSPEC_ARG2, objc, objv, 0);1833 proc = GetOpFromObj(interp, nHeightMapDataOps, heightMapDataOps, 1834 CMDSPEC_ARG2, objc, objv, 0); 1835 1835 if (proc == NULL) { 1836 1836 return TCL_ERROR; … … 1879 1879 } 1880 1880 1881 static Rappture::CmdSpec heightMapLineContourOps[] = {1881 static CmdSpec heightMapLineContourOps[] = { 1882 1882 {"color", 1, HeightMapLineContourColorOp, 6, 0, "r g b ?heightmapNames...?",}, 1883 1883 {"visible", 1, HeightMapLineContourVisibleOp, 4, 0, "bool ?heightmapNames...?",}, … … 1891 1891 Tcl_ObjCmdProc *proc; 1892 1892 1893 proc = Rappture::GetOpFromObj(interp, nHeightMapLineContourOps,1894 heightMapLineContourOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);1893 proc = GetOpFromObj(interp, nHeightMapLineContourOps, 1894 heightMapLineContourOps, CMDSPEC_ARG2, objc, objv, 0); 1895 1895 if (proc == NULL) { 1896 1896 return TCL_ERROR; … … 2034 2034 } 2035 2035 2036 static Rappture::CmdSpec heightMapOps[] = {2036 static CmdSpec heightMapOps[] = { 2037 2037 {"create", 2, HeightMapCreateOp, 10, 10, "heightmapName xmin ymin xmax ymax xnum ynum values",}, 2038 2038 {"cull", 2, HeightMapCullOp, 3, 3, "mode",}, … … 2053 2053 Tcl_ObjCmdProc *proc; 2054 2054 2055 proc = Rappture::GetOpFromObj(interp, nHeightMapOps, heightMapOps,2056 Rappture::CMDSPEC_ARG1, objc, objv, 0);2055 proc = GetOpFromObj(interp, nHeightMapOps, heightMapOps, 2056 CMDSPEC_ARG1, objc, objv, 0); 2057 2057 if (proc == NULL) { 2058 2058 return TCL_ERROR; … … 2136 2136 } 2137 2137 2138 static Rappture::CmdSpec gridOps[] = {2138 static CmdSpec gridOps[] = { 2139 2139 {"axiscolor", 5, GridAxisColorOp, 5, 6, "r g b ?a?",}, 2140 2140 {"axisname", 5, GridAxisNameOp, 5, 5, "index title units",}, … … 2150 2150 Tcl_ObjCmdProc *proc; 2151 2151 2152 proc = Rappture::GetOpFromObj(interp, nGridOps, gridOps,2153 Rappture::CMDSPEC_ARG1, objc, objv, 0);2152 proc = GetOpFromObj(interp, nGridOps, gridOps, 2153 CMDSPEC_ARG1, objc, objv, 0); 2154 2154 if (proc == NULL) { 2155 2155 return TCL_ERROR; -
nanovis/branches/1.1/Flow.cpp
r4889 r4893 50 50 TRACE("Enter"); 51 51 52 Rappture::FreeSwitches(_switches, &_sv, 0);52 FreeSwitches(_switches, &_sv, 0); 53 53 54 54 if (_data != NULL) { -
nanovis/branches/1.1/Flow.h
r4889 r4893 105 105 } 106 106 107 Rappture::Unirect3d *data()107 Unirect3d *data() 108 108 { 109 109 return _data; 110 110 } 111 111 112 void data( Rappture::Unirect3d *data)112 void data(Unirect3d *unirect) 113 113 { 114 114 if (_data != NULL) { 115 115 delete _data; 116 116 } 117 _data = data;117 _data = unirect; 118 118 } 119 119 #if 0 … … 183 183 int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) 184 184 { 185 if ( Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv,186 185 if (nv::ParseSwitches(interp, _switches, objc, objv, &_sv, 186 SWITCH_DEFAULTS) < 0) { 187 187 return TCL_ERROR; 188 188 } … … 227 227 * kept to regenerate the volume 228 228 * associated with the flow. */ 229 Rappture::Unirect3d *_data;229 Unirect3d *_data; 230 230 231 231 /** … … 250 250 FlowValues _sv; 251 251 252 static Rappture::SwitchSpec _switches[];252 static SwitchSpec _switches[]; 253 253 }; 254 254 -
nanovis/branches/1.1/FlowBox.cpp
r4889 r4893 41 41 { 42 42 TRACE("Freeing switches"); 43 Rappture::FreeSwitches(_switches, &_sv, 0);43 FreeSwitches(_switches, &_sv, 0); 44 44 } 45 45 -
nanovis/branches/1.1/FlowBox.h
r4889 r4893 49 49 int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) 50 50 { 51 if ( Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv,52 51 if (nv::ParseSwitches(interp, _switches, objc, objv, &_sv, 52 SWITCH_DEFAULTS) < 0) { 53 53 return TCL_ERROR; 54 54 } … … 70 70 std::string _name; ///< Name of this box in the hash table. 71 71 FlowBoxValues _sv; 72 static Rappture::SwitchSpec _switches[];72 static SwitchSpec _switches[]; 73 73 }; 74 74 -
nanovis/branches/1.1/FlowCmd.cpp
r4889 r4893 46 46 using namespace vrmath; 47 47 48 static Rappture::SwitchParseProc AxisSwitchProc;49 static Rappture::SwitchCustom axisSwitch = {48 static SwitchParseProc AxisSwitchProc; 49 static SwitchCustom axisSwitch = { 50 50 AxisSwitchProc, NULL, 0, 51 51 }; 52 52 53 static Rappture::SwitchParseProc ColorSwitchProc;54 static Rappture::SwitchCustom colorSwitch = {53 static SwitchParseProc ColorSwitchProc; 54 static SwitchCustom colorSwitch = { 55 55 ColorSwitchProc, NULL, 0, 56 56 }; 57 57 58 static Rappture::SwitchParseProc PointSwitchProc;59 static Rappture::SwitchCustom pointSwitch = {58 static SwitchParseProc PointSwitchProc; 59 static SwitchCustom pointSwitch = { 60 60 PointSwitchProc, NULL, 0, 61 61 }; 62 62 63 static Rappture::SwitchParseProc PositionSwitchProc;64 static Rappture::SwitchCustom positionSwitch = {63 static SwitchParseProc PositionSwitchProc; 64 static SwitchCustom positionSwitch = { 65 65 PositionSwitchProc, NULL, 0, 66 66 }; 67 67 68 static Rappture::SwitchParseProc TransferFunctionSwitchProc;69 static Rappture::SwitchCustom transferFunctionSwitch = {68 static SwitchParseProc TransferFunctionSwitchProc; 69 static SwitchCustom transferFunctionSwitch = { 70 70 TransferFunctionSwitchProc, NULL, 0, 71 71 }; 72 72 73 Rappture::SwitchSpec Flow::_switches[] = {74 { Rappture::SWITCH_FLOAT, "-ambient", "value",73 SwitchSpec Flow::_switches[] = { 74 {SWITCH_FLOAT, "-ambient", "value", 75 75 offsetof(FlowValues, ambient), 0}, 76 { Rappture::SWITCH_BOOLEAN, "-arrows", "boolean",76 {SWITCH_BOOLEAN, "-arrows", "boolean", 77 77 offsetof(FlowValues, showArrows), 0}, 78 { Rappture::SWITCH_CUSTOM, "-axis", "axis",78 {SWITCH_CUSTOM, "-axis", "axis", 79 79 offsetof(FlowValues, slicePos.axis), 0, 0, &axisSwitch}, 80 { Rappture::SWITCH_FLOAT, "-diffuse", "value",80 {SWITCH_FLOAT, "-diffuse", "value", 81 81 offsetof(FlowValues, diffuse), 0}, 82 { Rappture::SWITCH_BOOLEAN, "-hide", "boolean",82 {SWITCH_BOOLEAN, "-hide", "boolean", 83 83 offsetof(FlowValues, isHidden), 0}, 84 { Rappture::SWITCH_BOOLEAN, "-light2side", "boolean",84 {SWITCH_BOOLEAN, "-light2side", "boolean", 85 85 offsetof(FlowValues, twoSidedLighting), 0}, 86 { Rappture::SWITCH_FLOAT, "-opacity", "value",86 {SWITCH_FLOAT, "-opacity", "value", 87 87 offsetof(FlowValues, opacity), 0}, 88 { Rappture::SWITCH_BOOLEAN, "-outline", "boolean",88 {SWITCH_BOOLEAN, "-outline", "boolean", 89 89 offsetof(FlowValues, showOutline), 0}, 90 { Rappture::SWITCH_CUSTOM, "-position", "number",90 {SWITCH_CUSTOM, "-position", "number", 91 91 offsetof(FlowValues, slicePos), 0, 0, &positionSwitch}, 92 { Rappture::SWITCH_BOOLEAN, "-slice", "boolean",92 {SWITCH_BOOLEAN, "-slice", "boolean", 93 93 offsetof(FlowValues, sliceVisible), 0}, 94 { Rappture::SWITCH_FLOAT, "-specularExp", "value",94 {SWITCH_FLOAT, "-specularExp", "value", 95 95 offsetof(FlowValues, specularExp), 0}, 96 { Rappture::SWITCH_FLOAT, "-specularLevel", "value",96 {SWITCH_FLOAT, "-specularLevel", "value", 97 97 offsetof(FlowValues, specular), 0}, 98 { Rappture::SWITCH_CUSTOM, "-transferfunction", "name",98 {SWITCH_CUSTOM, "-transferfunction", "name", 99 99 offsetof(FlowValues, transferFunction), 0, 0, &transferFunctionSwitch}, 100 { Rappture::SWITCH_BOOLEAN, "-volume", "boolean",100 {SWITCH_BOOLEAN, "-volume", "boolean", 101 101 offsetof(FlowValues, showVolume), 0}, 102 { Rappture::SWITCH_END}103 }; 104 105 Rappture::SwitchSpec FlowParticles::_switches[] = {106 { Rappture::SWITCH_CUSTOM, "-axis", "string",102 {SWITCH_END} 103 }; 104 105 SwitchSpec FlowParticles::_switches[] = { 106 {SWITCH_CUSTOM, "-axis", "axis", 107 107 offsetof(FlowParticlesValues, position.axis), 0, 0, &axisSwitch}, 108 { Rappture::SWITCH_CUSTOM, "-color", "{r g b a}",108 {SWITCH_CUSTOM, "-color", "{r g b a}", 109 109 offsetof(FlowParticlesValues, color), 0, 0, &colorSwitch}, 110 { Rappture::SWITCH_BOOLEAN, "-hide", "boolean",110 {SWITCH_BOOLEAN, "-hide", "boolean", 111 111 offsetof(FlowParticlesValues, isHidden), 0}, 112 { Rappture::SWITCH_CUSTOM, "-position", "number",112 {SWITCH_CUSTOM, "-position", "number", 113 113 offsetof(FlowParticlesValues, position), 0, 0, &positionSwitch}, 114 { Rappture::SWITCH_FLOAT, "-size", "float",114 {SWITCH_FLOAT, "-size", "float", 115 115 offsetof(FlowParticlesValues, particleSize), 0}, 116 { Rappture::SWITCH_END}117 }; 118 119 Rappture::SwitchSpec FlowBox::_switches[] = {120 { Rappture::SWITCH_CUSTOM, "-color", "{r g b a}",116 {SWITCH_END} 117 }; 118 119 SwitchSpec FlowBox::_switches[] = { 120 {SWITCH_CUSTOM, "-color", "{r g b a}", 121 121 offsetof(FlowBoxValues, color), 0, 0, &colorSwitch}, 122 { Rappture::SWITCH_CUSTOM, "-corner1", "{x y z}",122 {SWITCH_CUSTOM, "-corner1", "{x y z}", 123 123 offsetof(FlowBoxValues, corner1), 0, 0, &pointSwitch}, 124 { Rappture::SWITCH_CUSTOM, "-corner2", "{x y z}",124 {SWITCH_CUSTOM, "-corner2", "{x y z}", 125 125 offsetof(FlowBoxValues, corner2), 0, 0, &pointSwitch}, 126 { Rappture::SWITCH_BOOLEAN, "-hide", "boolean",126 {SWITCH_BOOLEAN, "-hide", "boolean", 127 127 offsetof(FlowBoxValues, isHidden), 0}, 128 { Rappture::SWITCH_FLOAT, "-linewidth", "number",128 {SWITCH_FLOAT, "-linewidth", "number", 129 129 offsetof(FlowBoxValues, lineWidth), 0}, 130 { Rappture::SWITCH_END}130 {SWITCH_END} 131 131 }; 132 132 … … 172 172 size_t length = buf.size(); 173 173 174 Rappture::Unirect3d *dataPtr; 175 dataPtr = new Rappture::Unirect3d(nComponents); 174 Unirect3d *unirect = NULL; 176 175 177 176 Flow *flow = (Flow *)clientData; 178 177 if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) { 179 if (!dataPtr->importDx(result, nComponents, length - 4, bytes + 4)) { 178 unirect = new Unirect3d(nComponents); 179 if (!unirect->importDx(result, nComponents, length - 4, bytes + 4)) { 180 180 Tcl_AppendResult(interp, result.remark(), (char *)NULL); 181 delete dataPtr;181 delete unirect; 182 182 return TCL_ERROR; 183 183 } 184 184 } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) { 185 if (dataPtr->parseBuffer(interp, buf) != TCL_OK) { 186 delete dataPtr; 185 unirect = new Unirect3d(nComponents); 186 if (unirect->parseBuffer(interp, buf) != TCL_OK) { 187 delete unirect; 187 188 return TCL_ERROR; 188 189 } 189 190 } else if ((length > 10) && (strncmp(bytes, "unirect2d ", 10) == 0)) { 190 Rappture::Unirect2d *u2dPtr;191 u2dPtr = new Rappture::Unirect2d(nComponents);191 unirect = new Unirect3d(nComponents); 192 Unirect2d *u2dPtr = new Unirect2d(nComponents); 192 193 if (u2dPtr->parseBuffer(interp, buf) != TCL_OK) { 193 194 delete u2dPtr; 194 195 return TCL_ERROR; 195 196 } 196 dataPtr->convert(u2dPtr);197 unirect->convert(u2dPtr); 197 198 delete u2dPtr; 198 199 } else { 199 200 TRACE("header is %.14s", buf.bytes()); 200 if (!dataPtr->importDx(result, nComponents, length, bytes)) { 201 unirect = new Unirect3d(nComponents); 202 if (!unirect->importDx(result, nComponents, length, bytes)) { 201 203 Tcl_AppendResult(interp, result.remark(), (char *)NULL); 202 delete dataPtr;204 delete unirect; 203 205 return TCL_ERROR; 204 206 } 205 207 } 206 if ( dataPtr->nValues() == 0) {207 delete dataPtr;208 if (unirect->nValues() == 0) { 209 delete unirect; 208 210 Tcl_AppendResult(interp, "no data found in stream", (char *)NULL); 209 211 return TCL_ERROR; 210 212 } 211 213 TRACE("nx = %d ny = %d nz = %d", 212 dataPtr->xNum(), dataPtr->yNum(), dataPtr->zNum());214 unirect->xNum(), unirect->yNum(), unirect->zNum()); 213 215 TRACE("x0 = %lg y0 = %lg z0 = %lg", 214 dataPtr->xMin(), dataPtr->yMin(), dataPtr->zMin());216 unirect->xMin(), unirect->yMin(), unirect->zMin()); 215 217 TRACE("lx = %lg ly = %lg lz = %lg", 216 dataPtr->xMax() - dataPtr->xMin(),217 dataPtr->yMax() - dataPtr->yMin(),218 dataPtr->zMax() - dataPtr->zMin());218 unirect->xMax() - unirect->xMin(), 219 unirect->yMax() - unirect->yMin(), 220 unirect->zMax() - unirect->zMin()); 219 221 TRACE("dx = %lg dy = %lg dz = %lg", 220 dataPtr->xNum() > 1 ? (dataPtr->xMax() - dataPtr->xMin())/(dataPtr->xNum()-1) : 0,221 dataPtr->yNum() > 1 ? (dataPtr->yMax() - dataPtr->yMin())/(dataPtr->yNum()-1) : 0,222 dataPtr->zNum() > 1 ? (dataPtr->zMax() - dataPtr->zMin())/(dataPtr->zNum()-1) : 0);222 unirect->xNum() > 1 ? (unirect->xMax() - unirect->xMin())/(unirect->xNum()-1) : 0, 223 unirect->yNum() > 1 ? (unirect->yMax() - unirect->yMin())/(unirect->yNum()-1) : 0, 224 unirect->zNum() > 1 ? (unirect->zMax() - unirect->zMin())/(unirect->zNum()-1) : 0); 223 225 TRACE("magMin = %lg magMax = %lg", 224 dataPtr->magMin(), dataPtr->magMax());225 flow->data( dataPtr);226 unirect->magMin(), unirect->magMax()); 227 flow->data(unirect); 226 228 { 227 229 char info[1024]; 228 230 int length = 229 231 sprintf(info, "nv>data tag %s min %g max %g\n", 230 flow->name(), dataPtr->magMin(), dataPtr->magMax());232 flow->name(), unirect->magMin(), unirect->magMax()); 231 233 if (SocketWrite(info, (size_t)length) < 0) { 232 234 return TCL_ERROR; … … 237 239 } 238 240 239 static Rappture::CmdSpec flowDataOps[] = {241 static CmdSpec flowDataOps[] = { 240 242 {"follows", 1, FlowDataFollowsOp, 5, 5, "size nComponents",}, 241 243 }; … … 248 250 Tcl_ObjCmdProc *proc; 249 251 250 proc = Rappture::GetOpFromObj(interp, nFlowDataOps, flowDataOps,251 Rappture::CMDSPEC_ARG2, objc, objv, 0);252 proc = GetOpFromObj(interp, nFlowDataOps, flowDataOps, 253 CMDSPEC_ARG2, objc, objv, 0); 252 254 if (proc == NULL) { 253 255 return TCL_ERROR; … … 568 570 } 569 571 570 static Rappture::CmdSpec flowParticlesOps[] = {572 static CmdSpec flowParticlesOps[] = { 571 573 {"add", 1, FlowParticlesAddOp, 4, 0, "name ?switches?",}, 572 574 {"configure", 1, FlowParticlesConfigureOp, 4, 0, "name ?switches?",}, … … 592 594 { 593 595 Tcl_ObjCmdProc *proc; 594 proc = Rappture::GetOpFromObj(interp, nFlowParticlesOps, flowParticlesOps,595 Rappture::CMDSPEC_ARG2, objc, objv, 0);596 proc = GetOpFromObj(interp, nFlowParticlesOps, flowParticlesOps, 597 CMDSPEC_ARG2, objc, objv, 0); 596 598 if (proc == NULL) { 597 599 return TCL_ERROR; … … 675 677 } 676 678 677 static Rappture::CmdSpec flowBoxOps[] = {679 static CmdSpec flowBoxOps[] = { 678 680 {"add", 1, FlowBoxAddOp, 4, 0, "name ?switches?",}, 679 681 {"configure", 1, FlowBoxConfigureOp, 4, 0, "name ?switches?",}, … … 697 699 { 698 700 Tcl_ObjCmdProc *proc; 699 proc = Rappture::GetOpFromObj(interp, nFlowBoxOps, flowBoxOps,700 Rappture::CMDSPEC_ARG2, objc, objv, 0);701 proc = GetOpFromObj(interp, nFlowBoxOps, flowBoxOps, 702 CMDSPEC_ARG2, objc, objv, 0); 701 703 if (proc == NULL) { 702 704 return TCL_ERROR; … … 747 749 } 748 750 749 static Rappture::CmdSpec flowInstOps[] = {751 static CmdSpec flowInstOps[] = { 750 752 {"box", 1, FlowBoxOp, 2, 0, "oper ?args?"}, 751 753 {"configure", 1, FlowConfigureOp, 2, 0, "?switches?"}, … … 769 771 { 770 772 Tcl_ObjCmdProc *proc; 771 proc = Rappture::GetOpFromObj(interp, nFlowInstOps, flowInstOps,772 Rappture::CMDSPEC_ARG1, objc, objv, 0);773 proc = GetOpFromObj(interp, nFlowInstOps, flowInstOps, 774 CMDSPEC_ARG1, objc, objv, 0); 773 775 if (proc == NULL) { 774 776 return TCL_ERROR; … … 974 976 }; 975 977 976 static Rappture::SwitchParseProc VideoFormatSwitchProc;977 static Rappture::SwitchCustom videoFormatSwitch = {978 static SwitchParseProc VideoFormatSwitchProc; 979 static SwitchCustom videoFormatSwitch = { 978 980 VideoFormatSwitchProc, NULL, 0, 979 981 }; 980 982 981 static Rappture::SwitchSpec flowVideoSwitches[] = {982 { Rappture::SWITCH_INT, "-bitrate", "value",983 static SwitchSpec flowVideoSwitches[] = { 984 {SWITCH_INT, "-bitrate", "value", 983 985 offsetof(FlowVideoSwitches, bitRate), 0}, 984 { Rappture::SWITCH_CUSTOM, "-format", "string",986 {SWITCH_CUSTOM, "-format", "string", 985 987 offsetof(FlowVideoSwitches, formatObjPtr), 0, 0, &videoFormatSwitch}, 986 { Rappture::SWITCH_FLOAT, "-framerate", "value",988 {SWITCH_FLOAT, "-framerate", "value", 987 989 offsetof(FlowVideoSwitches, frameRate), 0}, 988 { Rappture::SWITCH_INT, "-height", "integer",990 {SWITCH_INT, "-height", "integer", 989 991 offsetof(FlowVideoSwitches, height), 0}, 990 { Rappture::SWITCH_INT, "-numframes", "count",992 {SWITCH_INT, "-numframes", "count", 991 993 offsetof(FlowVideoSwitches, numFrames), 0}, 992 { Rappture::SWITCH_INT, "-width", "integer",994 {SWITCH_INT, "-width", "integer", 993 995 offsetof(FlowVideoSwitches, width), 0}, 994 { Rappture::SWITCH_END}996 {SWITCH_END} 995 997 }; 996 998 … … 1178 1180 switches.formatObjPtr = Tcl_NewStringObj("mpeg1video", 10); 1179 1181 Tcl_IncrRefCount(switches.formatObjPtr); 1180 if ( Rappture::ParseSwitches(interp, flowVideoSwitches,1182 if (ParseSwitches(interp, flowVideoSwitches, 1181 1183 objc - 3, objv + 3, &switches, SWITCH_DEFAULTS) < 0) { 1182 1184 return TCL_ERROR; … … 1230 1232 tmpFileName[length] = '\0'; 1231 1233 rmdir(tmpFileName); 1232 Rappture::FreeSwitches(flowVideoSwitches, &switches, 0);1234 FreeSwitches(flowVideoSwitches, &switches, 0); 1233 1235 return result; 1234 1236 } … … 1245 1247 #endif /* HAVE_FFMPEG */ 1246 1248 1247 static Rappture::CmdSpec flowCmdOps[] = {1249 static CmdSpec flowCmdOps[] = { 1248 1250 {"add", 1, FlowAddOp, 3, 0, "name ?option value...?",}, 1249 1251 {"delete", 1, FlowDeleteOp, 3, 0, "name ?name...?",}, … … 1263 1265 Tcl_ObjCmdProc *proc; 1264 1266 1265 proc = Rappture::GetOpFromObj(interp, nFlowCmdOps, flowCmdOps,1266 Rappture::CMDSPEC_ARG1, objc, objv, 0);1267 proc = GetOpFromObj(interp, nFlowCmdOps, flowCmdOps, 1268 CMDSPEC_ARG1, objc, objv, 0); 1267 1269 if (proc == NULL) { 1268 1270 return TCL_ERROR; -
nanovis/branches/1.1/FlowParticles.cpp
r4890 r4893 41 41 } 42 42 TRACE("Freeing switches"); 43 Rappture::FreeSwitches(_switches, &_sv, 0);43 FreeSwitches(_switches, &_sv, 0); 44 44 } 45 45 -
nanovis/branches/1.1/FlowParticles.h
r4889 r4893 52 52 int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) 53 53 { 54 if ( Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv,55 54 if (nv::ParseSwitches(interp, _switches, objc, objv, &_sv, 55 SWITCH_DEFAULTS) < 0) { 56 56 return TCL_ERROR; 57 57 } … … 101 101 FlowParticlesValues _sv; 102 102 103 static Rappture::SwitchSpec _switches[];103 static SwitchSpec _switches[]; 104 104 }; 105 105 -
nanovis/branches/1.1/Switch.cpp
r3362 r4893 36 36 #include "Switch.h" 37 37 38 namespace Rappture{38 namespace nv { 39 39 40 40 static void -
nanovis/branches/1.1/Switch.h
r4889 r4893 28 28 */ 29 29 30 #ifndef RAPPTURE_SWITCH_H31 #define RAPPTURE_SWITCH_H30 #ifndef NV_SWITCH_H 31 #define NV_SWITCH_H 32 32 33 33 #ifdef HAVE_STDDEF_H … … 35 35 #endif /* HAVE_STDDEF_H */ 36 36 37 namespace Rappture{37 namespace nv { 38 38 39 39 typedef int (SwitchParseProc)(ClientData clientData, Tcl_Interp *interp, -
nanovis/branches/1.1/Unirect.cpp
r4877 r4893 45 45 46 46 int 47 Rappture::Unirect2d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)47 nv::Unirect2d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf) 48 48 { 49 49 Tcl_Obj *objPtr = Tcl_NewStringObj(buf.bytes(), buf.size()); … … 62 62 63 63 int 64 Rappture::Unirect3d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)64 nv::Unirect3d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf) 65 65 { 66 66 Tcl_Obj *objPtr = Tcl_NewStringObj(buf.bytes(), buf.size()); … … 79 79 80 80 int 81 Rappture::Unirect3d::loadData(Tcl_Interp *interp, int objc,82 81 nv::Unirect3d::loadData(Tcl_Interp *interp, int objc, 82 Tcl_Obj *const *objv) 83 83 { 84 84 int num[3], nValues; … … 313 313 314 314 int 315 Rappture::Unirect2d::loadData(Tcl_Interp *interp, int objc,316 315 nv::Unirect2d::loadData(Tcl_Interp *interp, int objc, 316 Tcl_Obj *const *objv) 317 317 { 318 318 if ((objc & 0x01) == 0) { … … 488 488 489 489 bool 490 Rappture::Unirect3d::importDx(Rappture::Outcome &result, size_t nComponents,491 490 nv::Unirect3d::importDx(Rappture::Outcome &result, size_t nComponents, 491 size_t length, char *string) 492 492 { 493 493 int nx, ny, nz, npts; … … 633 633 634 634 bool 635 Rappture::Unirect3d::resample(Rappture::Outcome &result, size_t nSamples)635 nv::Unirect3d::resample(Rappture::Outcome &result, size_t nSamples) 636 636 { 637 637 Rappture::Mesh1D xgrid(_xMin, _xMax, _xNum); … … 711 711 712 712 void 713 Rappture::Unirect3d::getVectorRange()713 nv::Unirect3d::getVectorRange() 714 714 { 715 715 assert(_nComponents == 3); … … 735 735 736 736 bool 737 Rappture::Unirect3d::convert(Rappture::Unirect2d *dataPtr)737 nv::Unirect3d::convert(nv::Unirect2d *dataPtr) 738 738 { 739 739 _initialized = false; -
nanovis/branches/1.1/Unirect.h
r4889 r4893 5 5 * Author: George A. Howlett <gah@purdue.edu> 6 6 */ 7 #ifndef RAPPTURE_UNIRECT_H8 #define RAPPTURE_UNIRECT_H7 #ifndef NV_UNIRECT_H 8 #define NV_UNIRECT_H 9 9 10 10 #include <float.h> … … 16 16 #include "Trace.h" 17 17 18 namespace Rappture{18 namespace nv { 19 19 20 20 class Unirect2d; -
nanovis/branches/1.1/nanovis.cpp
r4889 r4893 1295 1295 continue; 1296 1296 } 1297 Rappture::Unirect3d *data = flow->data();1297 Unirect3d *data = flow->data(); 1298 1298 min = data->magMin(); 1299 1299 max = data->magMax();
Note: See TracChangeset
for help on using the changeset viewer.