Revision: 65572
http://sourceforge.net/p/brlcad/code/65572
Author: starseeker
Date: 2015-07-11 02:37:14 +0000 (Sat, 11 Jul 2015)
Log Message:
-----------
Needs further testing, but this removes Tcl entirely from libbu.
Modified Paths:
--------------
brlcad/trunk/include/bn/bn_tcl.h
brlcad/trunk/include/bu/CMakeLists.txt
brlcad/trunk/include/bu.h
brlcad/trunk/include/fb.h
brlcad/trunk/include/raytrace.h
brlcad/trunk/include/rt/rt_tcl.h
brlcad/trunk/include/rt/wdb.h
brlcad/trunk/include/tclcad.h
brlcad/trunk/src/libbn/CMakeLists.txt
brlcad/trunk/src/libbu/CMakeLists.txt
brlcad/trunk/src/libfb/CMakeLists.txt
brlcad/trunk/src/libtclcad/tclcad.c
brlcad/trunk/src/mged/points/process.c
brlcad/trunk/src/rttherm/CMakeLists.txt
brlcad/trunk/src/rttherm/ssampview.c
Removed Paths:
-------------
brlcad/trunk/include/bu/bu_tcl.h
brlcad/trunk/src/libbu/tcl.c
Modified: brlcad/trunk/include/bn/bn_tcl.h
===================================================================
--- brlcad/trunk/include/bn/bn_tcl.h 2015-07-11 02:05:35 UTC (rev 65571)
+++ brlcad/trunk/include/bn/bn_tcl.h 2015-07-11 02:37:14 UTC (rev 65572)
@@ -32,9 +32,12 @@
#define BN_TCL_H
#include "common.h"
+
+#include "tcl.h"
+
#include "vmath.h"
+#include "bu/vls.h"
#include "bn/defines.h"
-#include "bu/bu_tcl.h"
__BEGIN_DECLS
Modified: brlcad/trunk/include/bu/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/bu/CMakeLists.txt 2015-07-11 02:05:35 UTC (rev
65571)
+++ brlcad/trunk/include/bu/CMakeLists.txt 2015-07-11 02:37:14 UTC (rev
65572)
@@ -1,7 +1,6 @@
set(bu_headers
avs.h
bitv.h
- bu_tcl.h
cmd.h
color.h
cv.h
Deleted: brlcad/trunk/include/bu/bu_tcl.h
===================================================================
--- brlcad/trunk/include/bu/bu_tcl.h 2015-07-11 02:05:35 UTC (rev 65571)
+++ brlcad/trunk/include/bu/bu_tcl.h 2015-07-11 02:37:14 UTC (rev 65572)
@@ -1,69 +0,0 @@
-/* B U _ T C L . H
- * BRL-CAD
- *
- * Copyright (c) 2004-2014 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-
-#ifndef BU_TCL_H
-#define BU_TCL_H
-
-#include "common.h"
-
-#include "tcl.h" /* Included for Tcl_Interp definition */
-
-#include "bu/defines.h"
-#include "bu/magic.h"
-#include "bu/list.h"
-#include "bu/vls.h"
-
-__BEGIN_DECLS
-
-/** @addtogroup bu_tcl
- * @brief
- * Routine(s) to allow TCL calling libbu code.
- */
-/** @{ */
-/** @file bu/bu_tcl.h */
-
-/**
- * Bu_Init
- *
- * Allows LIBBU to be dynamically loaded to a vanilla tclsh/wish with
- * "load /usr/brlcad/lib/libbu.so"
- *
- * @param interp - tcl interpreter in which this command was registered.
- *
- * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
- */
-BU_EXPORT extern int Bu_Init(void *interp);
-
-
-/** @} */
-
-__END_DECLS
-
-#endif /* BU_TCL_H */
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
Modified: brlcad/trunk/include/bu.h
===================================================================
--- brlcad/trunk/include/bu.h 2015-07-11 02:05:35 UTC (rev 65571)
+++ brlcad/trunk/include/bu.h 2015-07-11 02:37:14 UTC (rev 65572)
@@ -61,7 +61,6 @@
#include "./bu/version.h"
#include "./bu/avs.h"
#include "./bu/bitv.h"
-#include "./bu/bu_tcl.h"
#include "./bu/cmd.h"
#include "./bu/color.h"
#include "./bu/cv.h"
Modified: brlcad/trunk/include/fb.h
===================================================================
--- brlcad/trunk/include/fb.h 2015-07-11 02:05:35 UTC (rev 65571)
+++ brlcad/trunk/include/fb.h 2015-07-11 02:37:14 UTC (rev 65572)
@@ -58,7 +58,7 @@
#include "bsocket.h"
#include "bio.h"
-#include "bu/bu_tcl.h"
+#include "tcl.h"
#include "bu/magic.h"
#include "bu/vls.h"
Modified: brlcad/trunk/include/raytrace.h
===================================================================
--- brlcad/trunk/include/raytrace.h 2015-07-11 02:05:35 UTC (rev 65571)
+++ brlcad/trunk/include/raytrace.h 2015-07-11 02:37:14 UTC (rev 65572)
@@ -46,7 +46,6 @@
#include "tcl.h"
#include "bu/avs.h"
#include "bu/bitv.h"
-#include "bu/bu_tcl.h"
#include "bu/file.h"
#include "bu/hash.h"
#include "bu/hist.h"
Modified: brlcad/trunk/include/rt/rt_tcl.h
===================================================================
--- brlcad/trunk/include/rt/rt_tcl.h 2015-07-11 02:05:35 UTC (rev 65571)
+++ brlcad/trunk/include/rt/rt_tcl.h 2015-07-11 02:37:14 UTC (rev 65572)
@@ -35,8 +35,8 @@
#define RT_RT_TCL_H
#include "common.h"
+#include "tcl.h" /* for Tcl_Interp */
#include "vmath.h"
-#include "bu/bu_tcl.h" /* for Tcl_Interp */
#include "rt/defines.h"
__BEGIN_DECLS
Modified: brlcad/trunk/include/rt/wdb.h
===================================================================
--- brlcad/trunk/include/rt/wdb.h 2015-07-11 02:05:35 UTC (rev 65571)
+++ brlcad/trunk/include/rt/wdb.h 2015-07-11 02:37:14 UTC (rev 65572)
@@ -25,11 +25,13 @@
#define RT_WDB_H
#include "common.h"
+
+#include "tcl.h" /* for Tcl_Interp */
+
#include "vmath.h"
#include "bu/magic.h"
#include "bu/list.h"
#include "bu/vls.h"
-#include "bu/bu_tcl.h" /* for Tcl_Interp */
#include "bu/observer.h"
#include "bn/tol.h"
#include "rt/db_instance.h"
Modified: brlcad/trunk/include/tclcad.h
===================================================================
--- brlcad/trunk/include/tclcad.h 2015-07-11 02:05:35 UTC (rev 65571)
+++ brlcad/trunk/include/tclcad.h 2015-07-11 02:37:14 UTC (rev 65572)
@@ -128,6 +128,7 @@
TCLCAD_EXPORT extern int tclcad_tk_setup(Tcl_Interp *interp);
TCLCAD_EXPORT extern void tclcad_auto_path(Tcl_Interp *interp);
TCLCAD_EXPORT extern void tclcad_tcl_library(Tcl_Interp *interp);
+TCLCAD_EXPORT extern int Bu_Init(void *interp);
TCLCAD_EXPORT extern int Tclcad_Init(Tcl_Interp *interp);
/* defined in tclcad_obj.c */
Modified: brlcad/trunk/src/libbn/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbn/CMakeLists.txt 2015-07-11 02:05:35 UTC (rev
65571)
+++ brlcad/trunk/src/libbn/CMakeLists.txt 2015-07-11 02:37:14 UTC (rev
65572)
@@ -41,7 +41,7 @@
)
-BRLCAD_ADDLIB(libbn "${LIBBN_SOURCES}" libbu)
+BRLCAD_ADDLIB(libbn "${LIBBN_SOURCES}" "libbu;${TCL_LIBRARY}")
SET_TARGET_PROPERTIES(libbn PROPERTIES VERSION 20.0.1 SOVERSION 20)
Modified: brlcad/trunk/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/CMakeLists.txt 2015-07-11 02:05:35 UTC (rev
65571)
+++ brlcad/trunk/src/libbu/CMakeLists.txt 2015-07-11 02:37:14 UTC (rev
65572)
@@ -99,7 +99,6 @@
sscanf.c
scan.c
str.c
- tcl.c
temp.c
thread.cpp
timer.c
@@ -114,12 +113,8 @@
xdr.c
)
-BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}"
"${CMAKE_THREAD_LIBS_INIT};${TCL_LIBRARY};${WINSOCK_LIB};${PSAPI_LIB};${M_LIBRARY};y2038")
+BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}"
"${CMAKE_THREAD_LIBS_INIT};${DL_LIBRARY};${WINSOCK_LIB};${PSAPI_LIB};${M_LIBRARY};y2038")
set_target_properties(libbu PROPERTIES VERSION 20.0.1 SOVERSION 20)
-get_directory_property(BRLCAD_TCL_BUILD DIRECTORY
${BRLCAD_SOURCE_DIR}/src/other DEFINITION BRLCAD_TCL_BUILD)
-if("${BRLCAD_TCL_BUILD}" STREQUAL "ON")
- add_dependencies(libbu tcl)
-endif("${BRLCAD_TCL_BUILD}" STREQUAL "ON")
if(CPP_DLL_DEFINES)
set_property(TARGET libbu APPEND PROPERTY COMPILE_DEFINITIONS
"Y2038_DLL_IMPORTS")
endif(CPP_DLL_DEFINES)
Deleted: brlcad/trunk/src/libbu/tcl.c
===================================================================
--- brlcad/trunk/src/libbu/tcl.c 2015-07-11 02:05:35 UTC (rev 65571)
+++ brlcad/trunk/src/libbu/tcl.c 2015-07-11 02:37:14 UTC (rev 65572)
@@ -1,451 +0,0 @@
-/* T C L . C
- * BRL-CAD
- *
- * Copyright (c) 1998-2014 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-
-#include "common.h"
-
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "tcl.h"
-#include "bu/cmd.h"
-#include "bu/color.h"
-#include "bu/debug.h"
-#include "bu/file.h"
-#include "bu/malloc.h"
-#include "bu/str.h"
-#include "bu/units.h"
-#include "bu/bu_tcl.h"
-#include "vmath.h"
-
-#define TINYBUFSIZ 32
-#define SMALLBUFSIZ 256
-
-/**
- * A wrapper for bu_mem_barriercheck.
- *
- * \@param clientData - UNUSED, present for signature matching
- * @param argc - number of elements in argv
- * @param argv - command name and arguments
- *
- * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
- */
-HIDDEN int
-tcl_bu_mem_barriercheck(void *UNUSED(clientData),
- int argc,
- const char **argv)
-{
- int ret;
-
- if (argc > 1) {
- bu_log("Usage: %s\n", argv[0]);
- return BRLCAD_ERROR;
- }
-
- ret = bu_mem_barriercheck();
- if (UNLIKELY(ret < 0)) {
- bu_log("bu_mem_barriercheck() failed\n");
- return BRLCAD_ERROR;
- }
- return BRLCAD_OK;
-}
-
-
-/**
- * A wrapper for bu_prmem. Prints map of memory currently in use, to
- * stderr.
- *
- * \@param clientData - UNUSED, present for signature matching
- * @param argc - number of elements in argv
- * @param argv - command name and arguments
- *
- * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
- */
-HIDDEN int
-tcl_bu_prmem(void *UNUSED(clientData),
- int argc,
- const char **argv)
-{
- if (argc != 2) {
- bu_log("Usage: bu_prmem title\n");
- return BRLCAD_ERROR;
- }
-
- bu_prmem(argv[1]);
- return BRLCAD_OK;
-}
-
-
-/**
- * Given arguments of alternating keywords and values and a specific
- * keyword ("Iwant"), return the value associated with that keyword.
- *
- * example: bu_get_value_by_keyword Iwant az 35 elev 25 temp 9.6
- *
- * If only one argument is given after the search keyword, it is
- * interpreted as a list in the same format.
- *
- * example: bu_get_value_by_keyword Iwant {az 35 elev 25 temp 9.6}
- *
- * Search order is left-to-right, only first match is returned.
- *
- * Sample use:
- * bu_get_value_by_keyword V8 [concat type [.inmem get box.s]]
- *
- * @param clientData - associated data/state
- * @param argc - number of elements in argv
- * @param argv - command name and arguments
- *
- * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
- */
-HIDDEN int
-tcl_bu_get_value_by_keyword(void *clientData,
- int argc,
- const char **argv)
-{
- Tcl_Interp *interp = (Tcl_Interp *)clientData;
- int i = 0;
- int listc = 0;
- const char *iwant = (const char *)NULL;
- const char **listv = (const char **)NULL;
- const char **tofree = (const char **)NULL;
-
- if (argc < 3) {
- char buf[TINYBUFSIZ];
- snprintf(buf, TINYBUFSIZ, "%d", argc);
- bu_log("bu_get_value_by_keyword: wrong # of args (%s).\n"
- "Usage: bu_get_value_by_keyword iwant {list}\n"
- "Usage: bu_get_value_by_keyword iwant key1 val1 key2 val2 ...
keyN valN\n", buf);
- return BRLCAD_ERROR;
- }
-
- iwant = argv[1];
-
- if (argc == 3) {
- if (Tcl_SplitList(interp, argv[2], &listc, (const char ***)&listv) !=
TCL_OK) {
- bu_log("bu_get_value_by_keyword: iwant='%s', unable to split
'%s'\n", iwant, argv[2]);
- return BRLCAD_ERROR;
- }
- tofree = listv;
- } else {
- /* Take search list from remaining arguments */
- listc = argc - 2;
- listv = argv + 2;
- }
-
- if ((listc & 1) != 0) {
- char buf[TINYBUFSIZ];
- snprintf(buf, TINYBUFSIZ, "%d", listc);
- bu_log("bu_get_value_by_keyword: odd # of items in list (%s).\n", buf);
-
- if (tofree)
- Tcl_Free((char *)tofree); /* not bu_free() */
- return BRLCAD_ERROR;
- }
-
- for (i=0; i < listc; i += 2) {
- if (BU_STR_EQUAL(iwant, listv[i])) {
- /* If value is a list, don't nest it in another list */
- if (listv[i+1][0] == '{') {
- struct bu_vls str = BU_VLS_INIT_ZERO;
-
- /* Skip leading { */
- bu_vls_strcat(&str, &listv[i+1][1]);
- /* Trim trailing } */
- bu_vls_trunc(&str, -1);
- Tcl_AppendResult(interp, bu_vls_addr(&str), NULL);
- bu_vls_free(&str);
- } else {
- Tcl_AppendResult(interp, listv[i+1], NULL);
- }
-
- if (tofree)
- Tcl_Free((char *)tofree); /* not bu_free() */
- return BRLCAD_OK;
- }
- }
-
- /* Not found */
-
- if (tofree)
- Tcl_Free((char *)tofree); /* not bu_free() */
- return BRLCAD_ERROR;
-}
-
-
-/**
- * A wrapper for bu_rgb_to_hsv.
- *
- * @param clientData - associated data/state
- * @param argc - number of elements in argv
- * @param argv - command name and arguments
- *
- * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
- */
-HIDDEN int
-tcl_bu_rgb_to_hsv(void *clientData,
- int argc,
- const char **argv)
-{
- Tcl_Interp *interp = (Tcl_Interp *)clientData;
- int rgb_int[3];
- unsigned char rgb[3];
- fastf_t hsv[3];
- struct bu_vls result = BU_VLS_INIT_ZERO;
-
- if (argc != 4) {
- bu_log("Usage: bu_rgb_to_hsv R G B\n");
- return BRLCAD_ERROR;
- }
- if (sscanf(argv[1], "%d", &rgb_int[0]) != 1
- || sscanf(argv[2], "%d", &rgb_int[1]) != 1
- || sscanf(argv[3], "%d", &rgb_int[2]) != 1
- || (rgb_int[0] < 0) || (rgb_int[0] > 255)
- || (rgb_int[1] < 0) || (rgb_int[1] > 255)
- || (rgb_int[2] < 0) || (rgb_int[2] > 255)) {
- bu_vls_printf(&result, "bu_rgb_to_hsv: Bad RGB (%s, %s, %s)\n",
- argv[1], argv[2], argv[3]);
- bu_log("ERROR: %s", bu_vls_addr(&result));
- bu_vls_free(&result);
- return BRLCAD_ERROR;
- }
- rgb[0] = rgb_int[0];
- rgb[1] = rgb_int[1];
- rgb[2] = rgb_int[2];
-
- bu_rgb_to_hsv(rgb, hsv);
- bu_vls_printf(&result, "%g %g %g", hsv[0], hsv[1], hsv[2]);
- Tcl_AppendResult(interp, bu_vls_addr(&result), NULL);
- bu_vls_free(&result);
- return BRLCAD_OK;
-
-}
-
-
-/**
- * A wrapper for bu_hsv_to_rgb.
- *
- * @param clientData - associated data/state
- * @param argc - number of elements in argv
- * @param argv - command name and arguments
- *
- * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
- */
-HIDDEN int
-tcl_bu_hsv_to_rgb(void *clientData,
- int argc,
- const char **argv)
-{
- Tcl_Interp *interp = (Tcl_Interp *)clientData;
-
- double vals[3];
- fastf_t hsv[3];
- unsigned char rgb[3];
- struct bu_vls result = BU_VLS_INIT_ZERO;
-
- if (argc != 4) {
- bu_log("Usage: bu_hsv_to_rgb H S V\n");
- return BRLCAD_ERROR;
- }
- if (sscanf(argv[1], "%lf", &vals[0]) != 1
- || sscanf(argv[2], "%lf", &vals[1]) != 1
- || sscanf(argv[3], "%lf", &vals[2]) != 1)
- {
- bu_log("Bad HSV parsing (%s, %s, %s)\n", argv[1], argv[2], argv[3]);
- return BRLCAD_ERROR;
- }
-
- VMOVE(hsv, vals);
- if (bu_hsv_to_rgb(hsv, rgb) == 0) {
- bu_log("HSV to RGB conversion failed (%s, %s, %s)\n", argv[1], argv[2],
argv[3]);
- return BRLCAD_ERROR;
- }
-
- bu_vls_printf(&result, "%d %d %d", rgb[0], rgb[1], rgb[2]);
- Tcl_AppendResult(interp, bu_vls_addr(&result), NULL);
- bu_vls_free(&result);
- return BRLCAD_OK;
-
-}
-
-/**
- * A wrapper for bu_brlcad_dir.
- *
- * @param clientData - associated data/state
- * @param argc - number of elements in argv
- * @param argv - command name and arguments
- *
- * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
- */
-HIDDEN int
-tcl_bu_brlcad_dir(void *clientData,
- int argc,
- const char **argv)
-{
- Tcl_Interp *interp = (Tcl_Interp *)clientData;
- if (argc != 2) {
- bu_log("Usage: bu_brlcad_dir dirkey\n");
- return BRLCAD_ERROR;
- }
- Tcl_AppendResult(interp, bu_brlcad_dir(argv[1], 1), NULL);
- return BRLCAD_OK;
-}
-
-/**
- * A wrapper for bu_brlcad_root.
- *
- * @param clientData - associated data/state
- * @param argc - number of elements in argv
- * @param argv - command name and arguments
- *
- * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
- */
-HIDDEN int
-tcl_bu_brlcad_root(void *clientData,
- int argc,
- const char **argv)
-{
- Tcl_Interp *interp = (Tcl_Interp *)clientData;
- if (argc != 2) {
- bu_log("Usage: bu_brlcad_root subdir\n");
- return BRLCAD_ERROR;
- }
- Tcl_AppendResult(interp, bu_brlcad_root(argv[1], 1), NULL);
- return BRLCAD_OK;
-}
-
-
-/**
- * A wrapper for bu_brlcad_data.
- *
- * @param clientData - associated data/state
- * @param argc - number of elements in argv
- * @param argv - command name and arguments
- *
- * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
- */
-HIDDEN int
-tcl_bu_brlcad_data(void *clientData,
- int argc,
- const char **argv)
-{
- Tcl_Interp *interp = (Tcl_Interp *)clientData;
- if (argc != 2) {
- bu_log("Usage: bu_brlcad_data subdir\n");
- return BRLCAD_ERROR;
- }
- Tcl_AppendResult(interp, bu_brlcad_data(argv[1], 1), NULL);
- return BRLCAD_OK;
-}
-
-
-/**
- * A wrapper for bu_units_conversion.
- *
- * @param clientData - associated data/state
- * @param argc - number of elements in argv
- * @param argv - command name and arguments
- *
- * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
- */
-HIDDEN int
-tcl_bu_units_conversion(void *clientData,
- int argc,
- const char **argv)
-{
- Tcl_Interp *interp = (Tcl_Interp *)clientData;
- double conv_factor;
- struct bu_vls result = BU_VLS_INIT_ZERO;
-
- if (argc != 2) {
- bu_log("Usage: bu_units_conversion units_string\n");
- return BRLCAD_ERROR;
- }
-
- conv_factor = bu_units_conversion(argv[1]);
- if (conv_factor <= 0.0) {
- bu_log("ERROR: bu_units_conversion: Unrecognized units string: %s\n",
argv[1]);
- return BRLCAD_ERROR;
- }
-
- bu_vls_printf(&result, "%.12e", conv_factor);
- Tcl_AppendResult(interp, bu_vls_addr(&result), NULL);
- bu_vls_free(&result);
- return BRLCAD_OK;
-}
-
-
-static int
-wrapper_func(ClientData data, Tcl_Interp *interp, int argc, const char *argv[])
-{
- struct bu_cmdtab *ctp = (struct bu_cmdtab *)data;
-
- return ctp->ct_func(interp, argc, argv);
-}
-
-
-static void
-register_cmds(Tcl_Interp *interp, struct bu_cmdtab *cmds)
-{
- struct bu_cmdtab *ctp = NULL;
-
- for (ctp = cmds; ctp->ct_name != (char *)NULL; ctp++) {
- (void)Tcl_CreateCommand(interp, ctp->ct_name, wrapper_func,
(ClientData)ctp, (Tcl_CmdDeleteProc *)NULL);
- }
-}
-
-
-int
-Bu_Init(void *p)
-{
- Tcl_Interp *interp = (Tcl_Interp *)p;
-
- static struct bu_cmdtab cmds[] = {
- {"bu_units_conversion", tcl_bu_units_conversion},
- {"bu_brlcad_data", tcl_bu_brlcad_data},
- {"bu_brlcad_dir", tcl_bu_brlcad_dir},
- {"bu_brlcad_root", tcl_bu_brlcad_root},
- {"bu_mem_barriercheck", tcl_bu_mem_barriercheck},
- {"bu_prmem", tcl_bu_prmem},
- {"bu_get_value_by_keyword", tcl_bu_get_value_by_keyword},
- {"bu_rgb_to_hsv", tcl_bu_rgb_to_hsv},
- {"bu_hsv_to_rgb", tcl_bu_hsv_to_rgb},
- {(const char *)NULL, BU_CMD_NULL}
- };
-
- register_cmds(interp, cmds);
-
- Tcl_SetVar(interp, "BU_DEBUG_FORMAT", BU_DEBUG_FORMAT, TCL_GLOBAL_ONLY);
- Tcl_LinkVar(interp, "bu_debug", (char *)&bu_debug, TCL_LINK_INT);
-
- return BRLCAD_OK;
-}
-
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
Modified: brlcad/trunk/src/libfb/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libfb/CMakeLists.txt 2015-07-11 02:05:35 UTC (rev
65571)
+++ brlcad/trunk/src/libfb/CMakeLists.txt 2015-07-11 02:37:14 UTC (rev
65572)
@@ -15,7 +15,7 @@
)
BRLCAD_LIB_INCLUDE_DIRS(fb FB_INCLUDE_DIRS "")
-set(LINKLIBS "")
+set(LINKLIBS "${TCL_LIBRARY}")
if(BRLCAD_ENABLE_X11 AND X11_FOUND)
set(FBX11DEFS "-DIF_X")
set(LINKLIBS ${LINKLIBS} ${X11_LIBRARIES})
Modified: brlcad/trunk/src/libtclcad/tclcad.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad.c 2015-07-11 02:05:35 UTC (rev 65571)
+++ brlcad/trunk/src/libtclcad/tclcad.c 2015-07-11 02:37:14 UTC (rev 65572)
@@ -34,6 +34,7 @@
#include "dm.h"
#include "fb.h"
+#include "bu.h"
#include "bn.h"
#include "vmath.h"
#include "raytrace.h"
@@ -79,7 +80,403 @@
}
+#define TINYBUFSIZ 32
+#define SMALLBUFSIZ 256
+
+/**
+ * A wrapper for bu_mem_barriercheck.
+ *
+ * \@param clientData - UNUSED, present for signature matching
+ * @param argc - number of elements in argv
+ * @param argv - command name and arguments
+ *
+ * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
+ */
+HIDDEN int
+tcl_bu_mem_barriercheck(void *UNUSED(clientData),
+ int argc,
+ const char **argv)
+{
+ int ret;
+
+ if (argc > 1) {
+ bu_log("Usage: %s\n", argv[0]);
+ return BRLCAD_ERROR;
+ }
+
+ ret = bu_mem_barriercheck();
+ if (UNLIKELY(ret < 0)) {
+ bu_log("bu_mem_barriercheck() failed\n");
+ return BRLCAD_ERROR;
+ }
+ return BRLCAD_OK;
+}
+
+
+/**
+ * A wrapper for bu_prmem. Prints map of memory currently in use, to
+ * stderr.
+ *
+ * \@param clientData - UNUSED, present for signature matching
+ * @param argc - number of elements in argv
+ * @param argv - command name and arguments
+ *
+ * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
+ */
+HIDDEN int
+tcl_bu_prmem(void *UNUSED(clientData),
+ int argc,
+ const char **argv)
+{
+ if (argc != 2) {
+ bu_log("Usage: bu_prmem title\n");
+ return BRLCAD_ERROR;
+ }
+
+ bu_prmem(argv[1]);
+ return BRLCAD_OK;
+}
+
+
+/**
+ * Given arguments of alternating keywords and values and a specific
+ * keyword ("Iwant"), return the value associated with that keyword.
+ *
+ * example: bu_get_value_by_keyword Iwant az 35 elev 25 temp 9.6
+ *
+ * If only one argument is given after the search keyword, it is
+ * interpreted as a list in the same format.
+ *
+ * example: bu_get_value_by_keyword Iwant {az 35 elev 25 temp 9.6}
+ *
+ * Search order is left-to-right, only first match is returned.
+ *
+ * Sample use:
+ * bu_get_value_by_keyword V8 [concat type [.inmem get box.s]]
+ *
+ * @param clientData - associated data/state
+ * @param argc - number of elements in argv
+ * @param argv - command name and arguments
+ *
+ * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
+ */
+HIDDEN int
+tcl_bu_get_value_by_keyword(void *clientData,
+ int argc,
+ const char **argv)
+{
+ Tcl_Interp *interp = (Tcl_Interp *)clientData;
+ int i = 0;
+ int listc = 0;
+ const char *iwant = (const char *)NULL;
+ const char **listv = (const char **)NULL;
+ const char **tofree = (const char **)NULL;
+
+ if (argc < 3) {
+ char buf[TINYBUFSIZ];
+ snprintf(buf, TINYBUFSIZ, "%d", argc);
+ bu_log("bu_get_value_by_keyword: wrong # of args (%s).\n"
+ "Usage: bu_get_value_by_keyword iwant {list}\n"
+ "Usage: bu_get_value_by_keyword iwant key1 val1 key2 val2 ...
keyN valN\n", buf);
+ return BRLCAD_ERROR;
+ }
+
+ iwant = argv[1];
+
+ if (argc == 3) {
+ if (Tcl_SplitList(interp, argv[2], &listc, (const char ***)&listv) !=
TCL_OK) {
+ bu_log("bu_get_value_by_keyword: iwant='%s', unable to split
'%s'\n", iwant, argv[2]);
+ return BRLCAD_ERROR;
+ }
+ tofree = listv;
+ } else {
+ /* Take search list from remaining arguments */
+ listc = argc - 2;
+ listv = argv + 2;
+ }
+
+ if ((listc & 1) != 0) {
+ char buf[TINYBUFSIZ];
+ snprintf(buf, TINYBUFSIZ, "%d", listc);
+ bu_log("bu_get_value_by_keyword: odd # of items in list (%s).\n", buf);
+
+ if (tofree)
+ Tcl_Free((char *)tofree); /* not bu_free() */
+ return BRLCAD_ERROR;
+ }
+
+ for (i=0; i < listc; i += 2) {
+ if (BU_STR_EQUAL(iwant, listv[i])) {
+ /* If value is a list, don't nest it in another list */
+ if (listv[i+1][0] == '{') {
+ struct bu_vls str = BU_VLS_INIT_ZERO;
+
+ /* Skip leading { */
+ bu_vls_strcat(&str, &listv[i+1][1]);
+ /* Trim trailing } */
+ bu_vls_trunc(&str, -1);
+ Tcl_AppendResult(interp, bu_vls_addr(&str), NULL);
+ bu_vls_free(&str);
+ } else {
+ Tcl_AppendResult(interp, listv[i+1], NULL);
+ }
+
+ if (tofree)
+ Tcl_Free((char *)tofree); /* not bu_free() */
+ return BRLCAD_OK;
+ }
+ }
+
+ /* Not found */
+
+ if (tofree)
+ Tcl_Free((char *)tofree); /* not bu_free() */
+ return BRLCAD_ERROR;
+}
+
+
+/**
+ * A wrapper for bu_rgb_to_hsv.
+ *
+ * @param clientData - associated data/state
+ * @param argc - number of elements in argv
+ * @param argv - command name and arguments
+ *
+ * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
+ */
+HIDDEN int
+tcl_bu_rgb_to_hsv(void *clientData,
+ int argc,
+ const char **argv)
+{
+ Tcl_Interp *interp = (Tcl_Interp *)clientData;
+ int rgb_int[3];
+ unsigned char rgb[3];
+ fastf_t hsv[3];
+ struct bu_vls result = BU_VLS_INIT_ZERO;
+
+ if (argc != 4) {
+ bu_log("Usage: bu_rgb_to_hsv R G B\n");
+ return BRLCAD_ERROR;
+ }
+ if (sscanf(argv[1], "%d", &rgb_int[0]) != 1
+ || sscanf(argv[2], "%d", &rgb_int[1]) != 1
+ || sscanf(argv[3], "%d", &rgb_int[2]) != 1
+ || (rgb_int[0] < 0) || (rgb_int[0] > 255)
+ || (rgb_int[1] < 0) || (rgb_int[1] > 255)
+ || (rgb_int[2] < 0) || (rgb_int[2] > 255)) {
+ bu_vls_printf(&result, "bu_rgb_to_hsv: Bad RGB (%s, %s, %s)\n",
+ argv[1], argv[2], argv[3]);
+ bu_log("ERROR: %s", bu_vls_addr(&result));
+ bu_vls_free(&result);
+ return BRLCAD_ERROR;
+ }
+ rgb[0] = rgb_int[0];
+ rgb[1] = rgb_int[1];
+ rgb[2] = rgb_int[2];
+
+ bu_rgb_to_hsv(rgb, hsv);
+ bu_vls_printf(&result, "%g %g %g", hsv[0], hsv[1], hsv[2]);
+ Tcl_AppendResult(interp, bu_vls_addr(&result), NULL);
+ bu_vls_free(&result);
+ return BRLCAD_OK;
+
+}
+
+
+/**
+ * A wrapper for bu_hsv_to_rgb.
+ *
+ * @param clientData - associated data/state
+ * @param argc - number of elements in argv
+ * @param argv - command name and arguments
+ *
+ * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
+ */
+HIDDEN int
+tcl_bu_hsv_to_rgb(void *clientData,
+ int argc,
+ const char **argv)
+{
+ Tcl_Interp *interp = (Tcl_Interp *)clientData;
+
+ double vals[3];
+ fastf_t hsv[3];
+ unsigned char rgb[3];
+ struct bu_vls result = BU_VLS_INIT_ZERO;
+
+ if (argc != 4) {
+ bu_log("Usage: bu_hsv_to_rgb H S V\n");
+ return BRLCAD_ERROR;
+ }
+ if (sscanf(argv[1], "%lf", &vals[0]) != 1
+ || sscanf(argv[2], "%lf", &vals[1]) != 1
+ || sscanf(argv[3], "%lf", &vals[2]) != 1)
+ {
+ bu_log("Bad HSV parsing (%s, %s, %s)\n", argv[1], argv[2], argv[3]);
+ return BRLCAD_ERROR;
+ }
+
+ VMOVE(hsv, vals);
+ if (bu_hsv_to_rgb(hsv, rgb) == 0) {
+ bu_log("HSV to RGB conversion failed (%s, %s, %s)\n", argv[1], argv[2],
argv[3]);
+ return BRLCAD_ERROR;
+ }
+
+ bu_vls_printf(&result, "%d %d %d", rgb[0], rgb[1], rgb[2]);
+ Tcl_AppendResult(interp, bu_vls_addr(&result), NULL);
+ bu_vls_free(&result);
+ return BRLCAD_OK;
+
+}
+
+/**
+ * A wrapper for bu_brlcad_dir.
+ *
+ * @param clientData - associated data/state
+ * @param argc - number of elements in argv
+ * @param argv - command name and arguments
+ *
+ * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
+ */
+HIDDEN int
+tcl_bu_brlcad_dir(void *clientData,
+ int argc,
+ const char **argv)
+{
+ Tcl_Interp *interp = (Tcl_Interp *)clientData;
+ if (argc != 2) {
+ bu_log("Usage: bu_brlcad_dir dirkey\n");
+ return BRLCAD_ERROR;
+ }
+ Tcl_AppendResult(interp, bu_brlcad_dir(argv[1], 1), NULL);
+ return BRLCAD_OK;
+}
+
+/**
+ * A wrapper for bu_brlcad_root.
+ *
+ * @param clientData - associated data/state
+ * @param argc - number of elements in argv
+ * @param argv - command name and arguments
+ *
+ * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
+ */
+HIDDEN int
+tcl_bu_brlcad_root(void *clientData,
+ int argc,
+ const char **argv)
+{
+ Tcl_Interp *interp = (Tcl_Interp *)clientData;
+ if (argc != 2) {
+ bu_log("Usage: bu_brlcad_root subdir\n");
+ return BRLCAD_ERROR;
+ }
+ Tcl_AppendResult(interp, bu_brlcad_root(argv[1], 1), NULL);
+ return BRLCAD_OK;
+}
+
+
+/**
+ * A wrapper for bu_brlcad_data.
+ *
+ * @param clientData - associated data/state
+ * @param argc - number of elements in argv
+ * @param argv - command name and arguments
+ *
+ * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
+ */
+HIDDEN int
+tcl_bu_brlcad_data(void *clientData,
+ int argc,
+ const char **argv)
+{
+ Tcl_Interp *interp = (Tcl_Interp *)clientData;
+ if (argc != 2) {
+ bu_log("Usage: bu_brlcad_data subdir\n");
+ return BRLCAD_ERROR;
+ }
+ Tcl_AppendResult(interp, bu_brlcad_data(argv[1], 1), NULL);
+ return BRLCAD_OK;
+}
+
+
+/**
+ * A wrapper for bu_units_conversion.
+ *
+ * @param clientData - associated data/state
+ * @param argc - number of elements in argv
+ * @param argv - command name and arguments
+ *
+ * @return BRLCAD_OK if successful, otherwise, BRLCAD_ERROR.
+ */
+HIDDEN int
+tcl_bu_units_conversion(void *clientData,
+ int argc,
+ const char **argv)
+{
+ Tcl_Interp *interp = (Tcl_Interp *)clientData;
+ double conv_factor;
+ struct bu_vls result = BU_VLS_INIT_ZERO;
+
+ if (argc != 2) {
+ bu_log("Usage: bu_units_conversion units_string\n");
+ return BRLCAD_ERROR;
+ }
+
+ conv_factor = bu_units_conversion(argv[1]);
+ if (conv_factor <= 0.0) {
+ bu_log("ERROR: bu_units_conversion: Unrecognized units string: %s\n",
argv[1]);
+ return BRLCAD_ERROR;
+ }
+
+ bu_vls_printf(&result, "%.12e", conv_factor);
+ Tcl_AppendResult(interp, bu_vls_addr(&result), NULL);
+ bu_vls_free(&result);
+ return BRLCAD_OK;
+}
+
+
+static void
+register_cmds(Tcl_Interp *interp, struct bu_cmdtab *cmds)
+{
+ struct bu_cmdtab *ctp = NULL;
+
+ for (ctp = cmds; ctp->ct_name != (char *)NULL; ctp++) {
+ (void)Tcl_CreateCommand(interp, ctp->ct_name, wrapper_func,
(ClientData)ctp, (Tcl_CmdDeleteProc *)NULL);
+ }
+}
+
+
int
+Bu_Init(void *p)
+{
+ Tcl_Interp *interp = (Tcl_Interp *)p;
+
+ static struct bu_cmdtab cmds[] = {
+ {"bu_units_conversion", tcl_bu_units_conversion},
+ {"bu_brlcad_data", tcl_bu_brlcad_data},
+ {"bu_brlcad_dir", tcl_bu_brlcad_dir},
+ {"bu_brlcad_root", tcl_bu_brlcad_root},
+ {"bu_mem_barriercheck", tcl_bu_mem_barriercheck},
+ {"bu_prmem", tcl_bu_prmem},
+ {"bu_get_value_by_keyword", tcl_bu_get_value_by_keyword},
+ {"bu_rgb_to_hsv", tcl_bu_rgb_to_hsv},
+ {"bu_hsv_to_rgb", tcl_bu_hsv_to_rgb},
+ {(const char *)NULL, BU_CMD_NULL}
+ };
+
+ register_cmds(interp, cmds);
+
+ Tcl_SetVar(interp, "BU_DEBUG_FORMAT", BU_DEBUG_FORMAT, TCL_GLOBAL_ONLY);
+ Tcl_LinkVar(interp, "bu_debug", (char *)&bu_debug, TCL_LINK_INT);
+
+ return BRLCAD_OK;
+}
+
+
+
+int
Tclcad_Init(Tcl_Interp *interp)
{
if (library_initialized(0))
Modified: brlcad/trunk/src/mged/points/process.c
===================================================================
--- brlcad/trunk/src/mged/points/process.c 2015-07-11 02:05:35 UTC (rev
65571)
+++ brlcad/trunk/src/mged/points/process.c 2015-07-11 02:37:14 UTC (rev
65572)
@@ -38,10 +38,11 @@
# endif
#endif
+#include "tcl.h"
+
#include "bu/malloc.h"
#include "bu/log.h"
#include "bu/vls.h"
-#include "bu/bu_tcl.h"
#include "vmath.h"
extern Tcl_Interp *twerp;
Modified: brlcad/trunk/src/rttherm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/rttherm/CMakeLists.txt 2015-07-11 02:05:35 UTC (rev
65571)
+++ brlcad/trunk/src/rttherm/CMakeLists.txt 2015-07-11 02:37:14 UTC (rev
65572)
@@ -9,7 +9,7 @@
include_directories(${RTTHERM_INCLUDE_DIRS})
if(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
- BRLCAD_ADDEXEC(ssampview "spectrum.c;ssampview.c"
"libfb;libmultispectral;${TCL_TK_LIBRARY};${X11_LIBRARIES}")
+ BRLCAD_ADDEXEC(ssampview "spectrum.c;ssampview.c"
"libtclcad;libfb;libmultispectral;${TCL_TK_LIBRARY};${X11_LIBRARIES}")
endif(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
BRLCAD_ADDEXEC(rttherm "spectrum.c;viewtherm.c"
"libfb;libged;librttherm;libmultispectral")
Modified: brlcad/trunk/src/rttherm/ssampview.c
===================================================================
--- brlcad/trunk/src/rttherm/ssampview.c 2015-07-11 02:05:35 UTC (rev
65571)
+++ brlcad/trunk/src/rttherm/ssampview.c 2015-07-11 02:37:14 UTC (rev
65572)
@@ -37,6 +37,7 @@
#include "bn.h"
#include "raytrace.h"
#include "spectrum.h"
+#include "tclcad.h"
#include "fb.h"
#include "tcl.h"
#include "tk.h"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
