Changeset 4057
- Timestamp:
- Nov 14, 2013, 6:01:50 PM (11 years ago)
- Location:
- trunk/packages/vizservers/geovis
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/geovis/CmdProc.cpp
r3998 r4057 11 11 #include "CmdProc.h" 12 12 13 using namespace Rappture;13 using namespace GeoVis; 14 14 15 15 /** … … 116 116 */ 117 117 Tcl_ObjCmdProc * 118 Rappture::GetOpFromObj(Tcl_Interp *interp, /* Interpreter to report errors to */119 120 121 118 GeoVis::GetOpFromObj(Tcl_Interp *interp, /* Interpreter to report errors to */ 119 int nSpecs, /* Number of specifications in array */ 120 CmdSpec *specs, /* Op specification array */ 121 int operPos, /* Position of operation in argument 122 122 * list. */ 123 int objc,/* Number of arguments in the argument123 int objc, /* Number of arguments in the argument 124 124 * vector. This includes any prefixed 125 125 * arguments */ 126 127 126 Tcl_Obj *const *objv, /* Argument vector */ 127 int flags) 128 128 { 129 129 CmdSpec *specPtr; -
trunk/packages/vizservers/geovis/CmdProc.h
r3998 r4057 6 6 */ 7 7 8 #ifndef RAPPTURE_CMDPROC_H9 #define RAPPTURE_CMDPROC_H8 #ifndef GEOVIS_CMDPROC_H 9 #define GEOVIS_CMDPROC_H 10 10 11 11 #include <tcl.h> 12 12 13 namespace Rappture{13 namespace GeoVis { 14 14 15 15 /** … … 43 43 CmdSpec *specs, int operPos, int objc, Tcl_Obj *const *objv, int flags); 44 44 45 #define NumCmdSpecs(s) (sizeof(s) / sizeof( Rappture::CmdSpec))45 #define NumCmdSpecs(s) (sizeof(s) / sizeof(GeoVis::CmdSpec)) 46 46 47 47 } -
trunk/packages/vizservers/geovis/RendererCmd.cpp
r4054 r4057 232 232 } 233 233 234 static Rappture::CmdSpec cameraOps[] = {234 static CmdSpec cameraOps[] = { 235 235 {"orient", 1, CameraOrientOp, 6, 6, "qw qx qy qz"}, 236 236 {"pan", 1, CameraPanOp, 4, 4, "panX panY"}, … … 248 248 Tcl_ObjCmdProc *proc; 249 249 250 proc = Rappture::GetOpFromObj(interp, nCameraOps, cameraOps,251 Rappture::CMDSPEC_ARG1, objc, objv, 0);250 proc = GetOpFromObj(interp, nCameraOps, cameraOps, 251 CMDSPEC_ARG1, objc, objv, 0); 252 252 if (proc == NULL) { 253 253 return TCL_ERROR; … … 365 365 } 366 366 367 static Rappture::CmdSpec keyOps[] = {367 static CmdSpec keyOps[] = { 368 368 {"press", 1, KeyPressOp, 3, 3, "key"}, 369 369 {"release", 1, KeyReleaseOp, 3, 3, "key"}, … … 377 377 Tcl_ObjCmdProc *proc; 378 378 379 proc = Rappture::GetOpFromObj(interp, nKeyOps, keyOps,380 Rappture::CMDSPEC_ARG1, objc, objv, 0);379 proc = GetOpFromObj(interp, nKeyOps, keyOps, 380 CMDSPEC_ARG1, objc, objv, 0); 381 381 if (proc == NULL) { 382 382 return TCL_ERROR; … … 505 505 } 506 506 507 static Rappture::CmdSpec mapLayerOps[] = {507 static CmdSpec mapLayerOps[] = { 508 508 {"add", 1, MapLayerAddOp, 6, 6, "type url name"}, 509 509 {"delete", 1, MapLayerDeleteOp, 3, 4, "?name?"}, … … 520 520 Tcl_ObjCmdProc *proc; 521 521 522 proc = Rappture::GetOpFromObj(interp, nMapLayerOps, mapLayerOps,523 Rappture::CMDSPEC_ARG2, objc, objv, 0);522 proc = GetOpFromObj(interp, nMapLayerOps, mapLayerOps, 523 CMDSPEC_ARG2, objc, objv, 0); 524 524 if (proc == NULL) { 525 525 return TCL_ERROR; … … 593 593 } 594 594 595 static Rappture::CmdSpec mapOps[] = {595 static CmdSpec mapOps[] = { 596 596 {"layer", 2, MapLayerOp, 3, 6, "op ?params...?"}, 597 597 {"load", 2, MapLoadOp, 4, 5, "options"}, … … 606 606 Tcl_ObjCmdProc *proc; 607 607 608 proc = Rappture::GetOpFromObj(interp, nMapOps, mapOps,609 Rappture::CMDSPEC_ARG1, objc, objv, 0);608 proc = GetOpFromObj(interp, nMapOps, mapOps, 609 CMDSPEC_ARG1, objc, objv, 0); 610 610 if (proc == NULL) { 611 611 return TCL_ERROR; … … 719 719 } 720 720 721 static Rappture::CmdSpec mouseOps[] = {721 static CmdSpec mouseOps[] = { 722 722 {"click", 1, MouseClickOp, 5, 5, "button x y"}, 723 723 {"dblclick", 2, MouseDoubleClickOp, 5, 5, "button x y"}, … … 735 735 Tcl_ObjCmdProc *proc; 736 736 737 proc = Rappture::GetOpFromObj(interp, nMouseOps, mouseOps,738 Rappture::CMDSPEC_ARG1, objc, objv, 0);737 proc = GetOpFromObj(interp, nMouseOps, mouseOps, 738 CMDSPEC_ARG1, objc, objv, 0); 739 739 if (proc == NULL) { 740 740 return TCL_ERROR; … … 751 751 } 752 752 753 static Rappture::CmdSpec rendererOps[] = {753 static CmdSpec rendererOps[] = { 754 754 {"render", 1, RendererRenderOp, 2, 2, ""}, 755 755 }; … … 762 762 Tcl_ObjCmdProc *proc; 763 763 764 proc = Rappture::GetOpFromObj(interp, nRendererOps, rendererOps,765 Rappture::CMDSPEC_ARG1, objc, objv, 0);764 proc = GetOpFromObj(interp, nRendererOps, rendererOps, 765 CMDSPEC_ARG1, objc, objv, 0); 766 766 if (proc == NULL) { 767 767 return TCL_ERROR; … … 801 801 } 802 802 803 static Rappture::CmdSpec screenOps[] = {803 static CmdSpec screenOps[] = { 804 804 {"bgcolor", 1, ScreenBgColorOp, 5, 5, "r g b"}, 805 805 {"size", 1, ScreenSizeOp, 4, 4, "width height"} … … 813 813 Tcl_ObjCmdProc *proc; 814 814 815 proc = Rappture::GetOpFromObj(interp, nScreenOps, screenOps,816 Rappture::CMDSPEC_ARG1, objc, objv, 0);815 proc = GetOpFromObj(interp, nScreenOps, screenOps, 816 CMDSPEC_ARG1, objc, objv, 0); 817 817 if (proc == NULL) { 818 818 return TCL_ERROR; -
trunk/packages/vizservers/geovis/configure
r4024 r4057 636 636 SHLIB_LD 637 637 SHLIB_CFLAGS 638 RP_LIB_DIR639 RP_INC_SPEC640 RP_DIR641 638 LD_RPATH 642 639 CFLAGS_OPTIMIZE … … 705 702 enable_option_checking 706 703 with_tcllib 707 with_rappture708 704 with_osg_includes 709 705 with_osg_libs … … 1339 1335 --with-tcllib=DIR location of Tcl binary library libtclstubs.a 1340 1336 [default=/usr/lib] 1341 --with-rappture=DIR location of rappture files lib/librappture.a and1342 include/rappture.h [default=/usr]1343 1337 --with-osg-includes=DIR OSG include files are in DIR 1344 1338 --with-osg-libs=DIR OSG libraries are in DIR … … 2304 2298 2305 2299 2306 # Check whether --with-rappture was given.2307 if test "${with_rappture+set}" = set; then :2308 withval=$with_rappture; with_rappture=$withval2309 else2310 with_rappture=yes2311 fi2312 2313 2314 2315 2300 # Check whether --with-osg-includes was given. 2316 2301 if test "${with_osg_includes+set}" = set; then : … … 5059 5044 # 5060 5045 # Need to check for the following dependencies: 5061 # Rappture headers and library (done) 5062 # Tcl headers and library (done) 5046 # Tcl headers and library 5063 5047 # GL headers and library 5064 5048 # pthread library … … 5070 5054 for dir in \ 5071 5055 ${exec_prefix} \ 5072 ${exec_prefix}/lib \ 5073 ${with_rappture} \ 5074 ${with_rappture}/lib ; do 5056 ${exec_prefix}/lib ; do 5075 5057 tclconfig="${dir}/tclConfig.sh" 5076 5058 if test -f "$tclconfig" ; then … … 5090 5072 if test "x$with_tclinclude" != "x" ; then 5091 5073 TCL_INC_SPEC="-I${with_tclinclude}" 5092 fi5093 5094 RP_DIR=""5095 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rappture" >&55096 $as_echo_n "checking for rappture... " >&6; }5097 if test "$with_rappture" == "yes" ; then5098 for dir in "$exec_prefix" "/usr" ; do5099 if test -r "$dir/include/rappture2/rappture2.h" -a \5100 -r "$dir/lib/librappture.a"; then5101 RP_DIR="$dir"5102 RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2"5103 RP_LIB_DIR="$dir/lib"5104 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&55105 $as_echo "$dir" >&6; }5106 break5107 fi5108 done5109 else5110 if test ! -d "$with_rappture" ; then5111 as_fn_error $? "--with-rappture: no such directory $with_rappture" "$LINENO" 55112 fi5113 RP_DIR=$with_rappture5114 RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2"5115 RP_LIB_DIR="$with_rappture/lib"5116 fi5117 if test "x${RP_DIR}" = "x" ; then5118 as_fn_error $? "cannot find rappture.h and librappture2.a, try using --with-rappture" "$LINENO" 55119 else5120 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_rappture" >&55121 $as_echo "$with_rappture" >&6; }5122 5074 fi 5123 5075 … … 5433 5385 fi 5434 5386 done 5435 5436 5437 5438 5387 5439 5388 -
trunk/packages/vizservers/geovis/configure.in
r4024 r4057 9 9 [with_tcllib=$withval], 10 10 [with_tcllib=""]) 11 12 AC_ARG_WITH(13 [rappture],14 [AS_HELP_STRING([--with-rappture[=DIR]],15 [location of rappture files lib/librappture.a and include/rappture.h @<:@default=/usr@:>@])],16 [with_rappture=$withval],17 [with_rappture=yes])18 11 19 12 AC_ARG_WITH( … … 81 74 # 82 75 # Need to check for the following dependencies: 83 # Rappture headers and library (done) 84 # Tcl headers and library (done) 76 # Tcl headers and library 85 77 # GL headers and library 86 78 # pthread library … … 92 84 for dir in \ 93 85 ${exec_prefix} \ 94 ${exec_prefix}/lib \ 95 ${with_rappture} \ 96 ${with_rappture}/lib ; do 86 ${exec_prefix}/lib ; do 97 87 tclconfig="${dir}/tclConfig.sh" 98 88 if test -f "$tclconfig" ; then … … 112 102 if test "x$with_tclinclude" != "x" ; then 113 103 TCL_INC_SPEC="-I${with_tclinclude}" 114 fi115 116 RP_DIR=""117 AC_MSG_CHECKING([for rappture])118 if test "$with_rappture" == "yes" ; then119 for dir in "$exec_prefix" "/usr" ; do120 if test -r "$dir/include/rappture2/rappture2.h" -a \121 -r "$dir/lib/librappture.a"; then122 RP_DIR="$dir"123 RP_INC_SPEC="-I$dir/include -I$dir/include/rappture2"124 RP_LIB_DIR="$dir/lib"125 AC_MSG_RESULT([$dir])126 break127 fi128 done129 else130 if test ! -d "$with_rappture" ; then131 AC_MSG_ERROR([--with-rappture: no such directory $with_rappture])132 fi133 RP_DIR=$with_rappture134 RP_INC_SPEC="-I$with_rappture/include -I$with_rappture/include/rappture2"135 RP_LIB_DIR="$with_rappture/lib"136 fi137 if test "x${RP_DIR}" = "x" ; then138 AC_MSG_ERROR([cannot find rappture.h and librappture2.a, try using --with-rappture])139 else140 AC_MSG_RESULT([$with_rappture])141 104 fi 142 105 … … 162 125 AC_SUBST(CFLAGS_OPTIMIZE) 163 126 AC_SUBST(LD_RPATH) 164 AC_SUBST(RP_DIR)165 AC_SUBST(RP_INC_SPEC)166 AC_SUBST(RP_LIB_DIR)167 127 AC_SUBST(SHLIB_CFLAGS) 168 128 AC_SUBST(SHLIB_LD)
Note: See TracChangeset
for help on using the changeset viewer.