Revision: 56540
http://sourceforge.net/p/brlcad/code/56540
Author: brlcad
Date: 2013-08-04 22:38:40 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
pjt never finished import_body/export_body, commands for low-level
reading/writing of geometry to files. doesn't seem like a great idea to me.
say buh bye. as the main reason for db5_types.c, there may be other related
code needing to go under the hatchet.
Modified Paths:
--------------
brlcad/trunk/src/mged/CMakeLists.txt
brlcad/trunk/src/mged/cmd.h
brlcad/trunk/src/mged/setup.c
Removed Paths:
-------------
brlcad/trunk/src/mged/bodyio.c
Modified: brlcad/trunk/src/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/mged/CMakeLists.txt 2013-08-04 22:27:17 UTC (rev
56539)
+++ brlcad/trunk/src/mged/CMakeLists.txt 2013-08-04 22:38:40 UTC (rev
56540)
@@ -69,7 +69,6 @@
arbs.c
attach.c
axes.c
- bodyio.c
buttons.c
chgmodel.c
chgtree.c
Deleted: brlcad/trunk/src/mged/bodyio.c
===================================================================
--- brlcad/trunk/src/mged/bodyio.c 2013-08-04 22:27:17 UTC (rev 56539)
+++ brlcad/trunk/src/mged/bodyio.c 2013-08-04 22:38:40 UTC (rev 56540)
@@ -1,372 +0,0 @@
-/* B O D Y I O . C
- * BRL-CAD
- *
- * Copyright (c) 2000-2013 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This program 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 program 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 <signal.h>
-#include <math.h>
-#include <time.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#ifdef HAVE_PWD_H
-# include <pwd.h>
-#endif
-#include "bio.h"
-
-#include "bu.h"
-#include "vmath.h"
-#include "db5.h"
-#include "bn.h"
-#include "nmg.h"
-#include "raytrace.h"
-#include "./mged.h"
-#include "./sedit.h"
-
-/*
- * C M D _ I M P O R T _ B O D Y ()
- *
- * Read an object's body from disk file
- *
- */
-int
-cmd_import_body(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc,
const char *argv[])
-{
- struct directory *dp;
- struct stat stat_buf;
- int major_code, minor_code;
- int majc, minc;
- char *descrip;
- struct bu_vls vls = BU_VLS_INIT_ZERO;
- struct rt_db_internal intern;
- struct rt_binunif_internal *bip;
- int fd;
- ssize_t gotten;
-
- CHECK_DBI_NULL;
-
- if (argc != 4) {
- bu_vls_printf(&vls, "help %s", argv[0]);
- Tcl_Eval(interp, bu_vls_addr(&vls));
- bu_vls_free(&vls);
- return TCL_ERROR;
- }
-
- switch (sscanf(argv[3], "%d %d", &major_code, &minor_code)) {
- case 1:
- /* XXX is it safe to have no minor code? */
- minor_code = 0;
- case 2:
- break;
- case 0:
- if (db5_type_codes_from_descrip(&majc, &minc,
- argv[3])
- && db5_type_codes_from_tag(&majc, &minc,
- argv[3])) {
- bu_vls_printf(&vls,
- "Invalid data type: '%s'\n", argv[3]);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- }
- major_code = majc;
- minor_code = minc;
- break;
- }
-
- if (db5_type_descrip_from_codes(&descrip, major_code, minor_code)) {
- bu_vls_printf(&vls,
- "Invalid maj/min: %d %d\n",
- major_code, minor_code);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- }
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("Type is %d %d '%s'\n", major_code, minor_code, descrip);
-
- /*
- * Check to see if we need to create a new object
- */
- if ((dp = db_lookup(dbip, argv[1], LOOKUP_QUIET)) == RT_DIR_NULL) {
- bu_vls_printf(&vls, "object \"%s\" does not exist.\n", argv[1]);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- } else {
- RT_DB_INTERNAL_INIT(&intern);
- }
-
- if (!bu_file_exists(argv[2], &fd)) {
- bu_vls_printf(&vls,
- "Cannot open file %s for reading\n", argv[2]);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- }
-
- /*
- * How much data do we have to suck in?
- */
- if (fstat(fd, &stat_buf) < 0) {
- bu_vls_printf(&vls, "Cannot get status of file %s\n", argv[2]);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- }
-
- if (RT_G_DEBUG & DEBUG_VOL) {
- bu_log ("File '%s' is %ld bytes long\n", argv[2],
(long)stat_buf.st_size);
- }
-
- if (db5_type_descrip_from_codes(&descrip, major_code, minor_code)) {
- bu_vls_printf(&vls,
- "Invalid major_code/minor_code: %d\n", major_code);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- }
- switch (major_code) {
- case DB5_MAJORTYPE_BINARY_UNIF:
- BU_ALLOC(bip, struct rt_binunif_internal);
- bip->magic = RT_BINUNIF_INTERNAL_MAGIC;
- bip->type = minor_code;
- bip->u.uint8 = (unsigned char *) bu_malloc((size_t)stat_buf.st_size,
"binunif");
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("Created an rt_binunif_internal for type '%s' (minor=%d)\n",
descrip, minor_code);
-
- gotten = read(fd, (void *) (bip->u.uint8), (size_t)stat_buf.st_size);
- if (gotten == -1) {
- perror("import_body");
- return TCL_ERROR;
- } else if (gotten < stat_buf.st_size) {
- bu_vls_printf(&vls,
- "Incomplete read of object %s from file %s, got %zu
bytes\n",
- argv[1], argv[2], gotten);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- }
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("gotten=%zu, minor_code is %d\n",
- gotten, minor_code);
- bip->count = (long)(gotten / db5_type_sizeof_n_binu(minor_code));
- if (RT_G_DEBUG & DEBUG_VOL) {
- bu_log("Got 'em!\nThink I own %zu of 'em\n", bip->count);
- fflush(stderr);
- }
- intern.idb_major_type = DB5_MAJORTYPE_BRLCAD;
- intern.idb_type = minor_code;
- intern.idb_meth = &OBJ[ID_BINUNIF];
- intern.idb_ptr = (genptr_t)bip;
- rt_binunif_dump(bip);
- rt_db_put_internal5(dp, dbip, &intern, &rt_uniresource,
DB5_MAJORTYPE_BINARY_UNIF);
- rt_db_free_internal(&intern);
- break;
- default:
- bu_vls_printf(&vls,
- "Haven't gotten around to supporting type: %s\n",
- descrip);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- }
-
- return TCL_OK;
-}
-
-
-/*
- * C M D _ E X P O R T _ B O D Y ()
- *
- * Write an object's body to disk file
- *
- */
-int
-cmd_export_body(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc,
const char *argv[])
-{
- struct directory *dp;
- int fd;
- void *bufp;
- size_t nbytes = 0;
- ssize_t written;
- struct bu_external ext;
- struct db5_raw_internal raw;
- struct rt_db_internal intern;
- struct rt_binunif_internal *bip;
- struct bu_vls vls = BU_VLS_INIT_ZERO;
- char *tmp;
-
- CHECK_DBI_NULL;
-
- if (argc != 3) {
- bu_vls_printf(&vls, "help %s", argv[0]);
- Tcl_Eval(interp, bu_vls_addr(&vls));
- bu_vls_free(&vls);
- return TCL_ERROR;
- }
-
- /*
- * Find the guy we're told to write
- */
- if ((dp = db_lookup(dbip, argv[2], LOOKUP_NOISY)) == RT_DIR_NULL) {
- bu_vls_printf(&vls,
- "Cannot find object %s for writing\n", argv[2]);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- }
- RT_DB_INTERNAL_INIT(&intern);
- if (rt_db_get_internal5(&intern, dp, dbip, NULL, &rt_uniresource)
- != ID_BINUNIF
- || db_get_external(&ext, dp, dbip) < 0) {
- (void)signal(SIGINT, SIG_IGN);
- TCL_READ_ERR_return;
- }
- if (db5_get_raw_internal_ptr(&raw, ext.ext_buf) == NULL) {
- bu_free_external(&ext);
- (void)signal(SIGINT, SIG_IGN);
- TCL_READ_ERR_return;
- }
-
- /*
- * Do the writing
- */
-#ifndef _WIN32
- if ((fd = creat(argv[1], S_IRWXU | S_IRGRP | S_IROTH)) == -1)
-#else
- if ((fd = creat(argv[1], _S_IREAD | _S_IWRITE)) == -1)
-#endif
- {
- bu_free_external(&ext);
- bu_vls_printf(&vls,
- "Cannot open file %s for writing\n", argv[1]);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- }
- if (db5_type_descrip_from_codes(&tmp, raw.major_type, raw.minor_type))
- tmp = 0;
-
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("cmd_export_body() sees type (%d, %d)='%s'\n",
- raw.major_type, raw.minor_type, tmp);
- switch (raw.major_type) {
- case DB5_MAJORTYPE_BINARY_UNIF:
- bip = (struct rt_binunif_internal *) intern.idb_ptr;
- RT_CK_BINUNIF(bip);
- rt_binunif_dump(bip);
- bufp = (void *) bip->u.uint8;
- bu_log("cmd_export_body() thinks bip->count=%zu\n", bip->count);
- switch (bip->type) {
- case DB5_MINORTYPE_BINU_FLOAT:
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("bip->type switch... float");
- nbytes = (size_t) (bip->count * sizeof(float));
- break;
- case DB5_MINORTYPE_BINU_DOUBLE:
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("bip->type switch... double");
- nbytes = (size_t) (bip->count * sizeof(double));
- break;
- case DB5_MINORTYPE_BINU_8BITINT:
- case DB5_MINORTYPE_BINU_8BITINT_U:
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("bip->type switch... 8bitint");
- nbytes = (size_t) (bip->count);
- break;
- case DB5_MINORTYPE_BINU_16BITINT:
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("bip->type switch... 16bitint");
- nbytes = (size_t) (bip->count * 2);
- bu_log("data[0] = %u\n", bip->u.uint16[0]);
- break;
- case DB5_MINORTYPE_BINU_16BITINT_U:
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("bip->type switch... 16bituint");
- nbytes = (size_t) (bip->count * 2);
- bu_log("data[0] = %u\n", bip->u.uint16[0]);
- break;
- case DB5_MINORTYPE_BINU_32BITINT:
- case DB5_MINORTYPE_BINU_32BITINT_U:
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("bip->type switch... 32bitint");
- nbytes = (size_t) (bip->count * 4);
- break;
- case DB5_MINORTYPE_BINU_64BITINT:
- case DB5_MINORTYPE_BINU_64BITINT_U:
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("bip->type switch... 64bitint");
- nbytes = (size_t) (bip->count * 8);
- break;
- default:
- /* XXX This shouldn't happen!! */
- bu_log("bip->type switch... default");
- break;
- }
- break;
- default:
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("I'm in the default\n");
- bufp = (void *) ext.ext_buf;
- nbytes = (size_t) ext.ext_nbytes;
- break;
- }
- if (RT_G_DEBUG & DEBUG_VOL)
- bu_log("going to write %zu bytes\n", nbytes);
-
- written = write(fd, bufp, nbytes);
- if (written != (ssize_t)nbytes) {
- perror(argv[1]);
- bu_log("%s:%d\n", __FILE__, __LINE__);
- bu_free_external(&ext);
- bu_vls_printf(&vls,
- "Incomplete write of object %s to file %s, got %zd,
s/b=%zu\n",
- argv[2], argv[1], written, nbytes);
- Tcl_SetResult(interp, bu_vls_addr(&vls), TCL_VOLATILE);
- bu_vls_free(&vls);
- mged_print_result(TCL_ERROR);
- return TCL_ERROR;
- }
-
- bu_free_external(&ext);
- return TCL_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/mged/cmd.h
===================================================================
--- brlcad/trunk/src/mged/cmd.h 2013-08-04 22:27:17 UTC (rev 56539)
+++ brlcad/trunk/src/mged/cmd.h 2013-08-04 22:38:40 UTC (rev 56540)
@@ -57,12 +57,10 @@
extern int cmd_draw(ClientData, Tcl_Interp *, int, const char *[]);
extern int cmd_emuves(ClientData, Tcl_Interp *, int, const char *[]);
extern int cmd_ev(ClientData, Tcl_Interp *, int, const char *[]);
-extern int cmd_export_body(ClientData, Tcl_Interp *, int, const char *[]);
extern int cmd_get(ClientData, Tcl_Interp *, int, const char *[]);
extern int cmd_get_more_default(ClientData, Tcl_Interp *, int, const char *[]);
extern int cmd_has_embedded_fb(ClientData, Tcl_Interp *, int, const char *[]);
extern int cmd_hist(ClientData, Tcl_Interp *, int, const char *[]);
-extern int cmd_import_body(ClientData, Tcl_Interp *, int, const char *[]);
extern int cmd_kill(ClientData, Tcl_Interp *, int, const char *[]);
extern int cmd_list(ClientData, Tcl_Interp *, int, const char *[]);
extern int cmd_lm(ClientData, Tcl_Interp *, int, const char *[]);
Modified: brlcad/trunk/src/mged/setup.c
===================================================================
--- brlcad/trunk/src/mged/setup.c 2013-08-04 22:27:17 UTC (rev 56539)
+++ brlcad/trunk/src/mged/setup.c 2013-08-04 22:38:40 UTC (rev 56540)
@@ -83,10 +83,6 @@
{"bb", cmd_ged_plain_wrapper, ged_bb},
{"bev", cmd_ged_plain_wrapper, ged_bev},
{"bo", cmd_ged_plain_wrapper, ged_bo},
-#if 0
- {"import_body", cmd_import_body, GED_FUNC_PTR_NULL},
- {"export_body", cmd_export_body, GED_FUNC_PTR_NULL},
-#endif
{"bomb", f_bomb, GED_FUNC_PTR_NULL},
{"bot", cmd_ged_plain_wrapper, ged_bot},
{"bot_condense", cmd_ged_plain_wrapper, ged_bot_condense},
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
