[brlcad-commits] SF.net SVN: brlcad:[32275] brlcad/trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 32275
          http://brlcad.svn.sourceforge.net/brlcad/?rev=32275&view=rev
Author:   brlcad
Date:     2008-08-06 04:33:50 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
after some discussions on the channel, rename the 'binary' command in mge to the 'bo' command (for binary object).  this was done due to the fact that Tcl already has a 'binary' command and ours ends up masking it - a cnflict that mysteriously didn't surface during early 8.5 testing but is still there.  this relates to tom browders sf bug 1532699 that prompted th initial change. other options considered: import/export, data, blob, borg, dbblob, adddata, ...

Modified Paths:
--------------
    brlcad/trunk/NEWS
    brlcad/trunk/doc/deprecation.txt
    brlcad/trunk/doc/html/manuals/mged/mged_cmd_index.html
    brlcad/trunk/regress/gqa.sh
    brlcad/trunk/src/gtools/g_qa.1
    brlcad/trunk/src/libged/wdb_obj.c
    brlcad/trunk/src/mged/chgmodel.c
    brlcad/trunk/src/mged/cmd.h
    brlcad/trunk/src/mged/setup.c
    brlcad/trunk/src/tclscripts/mged/help.tcl
    brlcad/trunk/src/tclscripts/mged/make_solid.tcl

Modified: brlcad/trunk/NEWS
===================================================================

--- brlcad/trunk/NEWS	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/NEWS	2008-08-06 04:33:50 UTC (rev 32275)
@@ -14,6 +14,7 @@
 --- 2008-06-XX  Release 7.13.0                                     ---
 ----------------------------------------------------------------------
 
+* renamed mged binary command to bo for binary objects - Sean Morrison
 * fixed bug that caused remote framebuffers to fail - Sean Morrison
 * integrated tgf-g with the default compile/install - Daniel Roßberg
 * add w option to tire to allow disabling wheel generation - C. Yapp

Modified: brlcad/trunk/doc/deprecation.txt
===================================================================
--- brlcad/trunk/doc/deprecation.txt	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/doc/deprecation.txt	2008-08-06 04:33:50 UTC (rev 32275)
@@ -47,9 +47,10 @@
 **************
 * DEPRECATED *
 **************
+
 7.14
 ----
-src/mged/mged.c
+mged
 	-n option -> -c option [deprecated 7.14]
 
 7.12
@@ -98,6 +99,11 @@
 	PI -> M_PI
 	M_SQRT2_DIV2 -> M_SQRT1_2
 
+7.12.6
+------
+mged
+	binary -> bo [rename]
+
 7.12.4
 ------
 include/raytrace.h
@@ -141,6 +147,8 @@
 	removed [non-stdc]
 src/librt/wdb_obj.c -> src/librt/db_obj.c
 	removed wdb_tree_cmd(), added dgo_tree_cmd() [rename]
+mged
+	dbbinary -> binary [rename]
 
 
 7.10.4

Modified: brlcad/trunk/doc/html/manuals/mged/mged_cmd_index.html
===================================================================
--- brlcad/trunk/doc/html/manuals/mged/mged_cmd_index.html	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/doc/html/manuals/mged/mged_cmd_index.html	2008-08-06 04:33:50 UTC (rev 32275)
@@ -69,7 +69,7 @@
 <TD WIDTH="22%" VALIGN="MIDDLE">
 <FONT SIZE=2><P></FONT><A HREF="#bev"><FONT SIZE=2>bev</FONT></A></TD>
 <TD WIDTH="21%" VALIGN="MIDDLE">
-<FONT SIZE=2><P></FONT><A HREF="#binary"><FONT SIZE=2>binary</FONT></A></TD>
+<FONT SIZE=2><P></FONT><A HREF="#bo"><FONT SIZE=2>bo</FONT></A></TD>
 </TR>
 <TR><TD WIDTH="18%" VALIGN="MIDDLE">
 <FONT SIZE=2><P></FONT><A HREF="#bot_condense"><FONT SIZE=2>bot_condense</FONT></A></TD>
@@ -890,8 +890,8 @@
 </FONT>
 
 <DL>
-<B><A NAME="binary"></A>binary </B><I>[-o|-i pattern type] dest source</I> </DT>
-<DD>The &quot;binary&quot; command is used to create or retrieve binary opaque objects.  One of <I>-i</I> or <I>-o</I> must be specified.</DD>
+<B><A NAME="bo"></A>bo </B><I>[-o|-i pattern type] dest source</I> </DT>
+<DD>The &quot;bo&quot; command is used to create or retrieve binary opaque objects.  One of <I>-i</I> or <I>-o</I> must be specified.</DD>
 <dd>The <i>-o</i> option &quot;outputs&quot; or extracts a binary object from the database object <i>source</i> to a file called <i>dest</i>.</dd>
 <dd>The <i>-i</i> option &quot;inputs&quot; or imports a file called <i>source</i> into a binary object called <i>dest</i> in the database.  There are two additional arguments that must be specified with the <i>-i</i> option:  pattern and type.  Currently, only uniform binary objects (arrays of values) are supported.  As a result, the <i>pattern</i> is always <i>u</i> for &quot;uniform&quot; pattern.  The <i>type</i> can be one of the following:
 <DD><i>f </I>-&gt; float</DD>
@@ -906,10 +906,10 @@
 <DD><I>L </I>-&gt; unsigned long (64 bit)</DD>
 <DD> </DD>
 <DT><FONT SIZE=4>Examples: </DT></FONT>
-<DD> <TT>mged&gt;</TT> <B>binary -i -u c cmds /usr/brlcad/html/manuals/mged/mged_cmds.html</B></DD>
+<DD> <TT>mged&gt;</TT> <B>bo -i -u c cmds /usr/brlcad/html/manuals/mged/mged_cmds.html</B></DD>
 <DD>-- Create an opaque uniform binary object of characters with the name <I>cmds</I> that contains the contents of the file <I>/usr/brlcad/html/manuals/mged/mged_cmds.html.</I></DD>
 <DD></DD>
-<DD><TT>mged&gt;</TT> <B>binary -o /home/jim/cmds.html cmds</B></DD>
+<DD><TT>mged&gt;</TT> <B>bo -o /home/jim/cmds.html cmds</B></DD>
 <DD>-- Copy the contents of the binary object named <I>cmds</I> into the file named <i>/home/jim/cmds.html.</i></DD>
 </dl>
 <DT><HR ALIGN="RIGHT"></DT>

Modified: brlcad/trunk/regress/gqa.sh
===================================================================
--- brlcad/trunk/regress/gqa.sh	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/regress/gqa.sh	2008-08-06 04:33:50 UTC (rev 32275)
@@ -29,7 +29,7 @@
 
 cat > gqa.mged <<EOF
 units m
-binary -i u c _DENSITIES density_table.txt
+bo -i u c _DENSITIES density_table.txt
 
 in box1.s rpp 0 10 0 10 0 10
 in box2.s rpp 1  9 1  9 1  9

Modified: brlcad/trunk/src/gtools/g_qa.1
===================================================================
--- brlcad/trunk/src/gtools/g_qa.1	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/src/gtools/g_qa.1	2008-08-06 04:33:50 UTC (rev 32275)
@@ -151,10 +151,10 @@
 it is easier to rectify the situation using the external file.
 Once the table has been verified as correct and complete, it is imported to the database as the binary object
 \fB_DENSITIES\fR.
-To import the text file into the database, the following comand is used:
+To import the text file into the database, the following command is used:
 .IP
 mged>
-.B binary \-i u c _DENSITIES
+.B bo \-i u c _DENSITIES
 .I filename
 
 .SH GEOMETRY ERROR DETECTION

Modified: brlcad/trunk/src/libged/wdb_obj.c
===================================================================
--- brlcad/trunk/src/libged/wdb_obj.c	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/src/libged/wdb_obj.c	2008-08-06 04:33:50 UTC (rev 32275)
@@ -255,7 +255,7 @@
 static int wdb_pathlist_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]);
 static int wdb_lt_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]);
 static int wdb_version_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]);
-static int wdb_binary_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]);
+static int wdb_bo_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]);
 static int wdb_bot_face_sort_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]);
 static int wdb_bot_decimate_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]);
 static int wdb_move_arb_edge_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]);
@@ -316,7 +316,7 @@
     {"adjust",	wdb_adjust_tcl},
     {"arced",	wdb_newcmds_tcl},
     {"attr",	wdb_attr_tcl},
-    {"binary",	wdb_binary_tcl},
+    {"bo",	wdb_bo_tcl},
     {"bot_face_sort", wdb_bot_face_sort_tcl},
     {"bot_decimate", wdb_bot_decimate_tcl},
     {"c",		wdb_comb_std_tcl},
@@ -8622,7 +8622,7 @@
  *
  */
 int
-wdb_binary_cmd(struct rt_wdb	*wdbp,
+wdb_bo_cmd(struct rt_wdb	*wdbp,
 	       Tcl_Interp	*interp,
 	       int		argc,
 	       char 		*argv[])
@@ -8672,7 +8672,7 @@
 
     if ( input_mode + output_mode != 1 ) {
 	bu_vls_init(&vls);
-	bu_vls_printf(&vls, "helplib_alias binary %s", cname);
+	bu_vls_printf(&vls, "helplib_alias bo %s", cname);
 	Tcl_Eval(interp, bu_vls_addr(&vls));
 	bu_vls_free(&vls);
 	return TCL_ERROR;
@@ -8683,7 +8683,7 @@
 
     if ( (input_mode && argc != 4) || (output_mode && argc != 2) ) {
 	bu_vls_init(&vls);
-	bu_vls_printf(&vls, "helplib_alias binary %s", cname);
+	bu_vls_printf(&vls, "helplib_alias bo %s", cname);
 	Tcl_Eval(interp, bu_vls_addr(&vls));
 	bu_vls_free(&vls);
 	return TCL_ERROR;
@@ -8753,7 +8753,7 @@
 
 	if ( minor_type == 0 ) {
 	    bu_vls_init(&vls);
-	    bu_vls_printf(&vls, "helplib_alias binary %s", cname);
+	    bu_vls_printf(&vls, "helplib_alias bo %s", cname);
 	    Tcl_Eval(interp, bu_vls_addr(&vls));
 	    bu_vls_free(&vls);
 	    return TCL_ERROR;
@@ -8845,7 +8845,7 @@
 	return TCL_OK;
     } else {
 	bu_vls_init(&vls);
-	bu_vls_printf(&vls, "helplib_alias binary %s", cname);
+	bu_vls_printf(&vls, "helplib_alias bo %s", cname);
 	Tcl_Eval(interp, bu_vls_addr(&vls));
 	bu_vls_free(&vls);
 	return TCL_ERROR;
@@ -8857,17 +8857,17 @@
 
 /**
  * Usage:
- *        procname binary args
+ *        procname bo args
  */
 static int
-wdb_binary_tcl(ClientData	clientData,
+wdb_bo_tcl(ClientData	clientData,
 	       Tcl_Interp	*interp,
 	       int		argc,
 	       char		*argv[])
 {
     struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
 
-    return wdb_binary_cmd(wdbp, interp, argc-1, argv+1);
+    return wdb_bo_cmd(wdbp, interp, argc-1, argv+1);
 }
 
 /**
@@ -9284,7 +9284,7 @@
 		    len = 6;
 		    break;
 		case DB5_MAJORTYPE_BINARY_MIME:
-		    len = strlen( "binary (mime)" );
+		    len = strlen( "binary(mime)" );
 		    break;
 		case DB5_MAJORTYPE_BINARY_UNIF:
 		    len = strlen( binu_types[list_of_names[i]->d_minor_type] );

Modified: brlcad/trunk/src/mged/chgmodel.c
===================================================================
--- brlcad/trunk/src/mged/chgmodel.c	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/src/mged/chgmodel.c	2008-08-06 04:33:50 UTC (rev 32275)
@@ -1239,14 +1239,14 @@
 
 
 int
-f_binary(ClientData	clientData,
+f_bo(ClientData	clientData,
 	 Tcl_Interp	*interp,
 	 int		argc,
 	 char 		**argv)
 {
     CHECK_DBI_NULL;
 
-    return wdb_binary_cmd(wdbp, interp, argc, argv);
+    return wdb_bo_cmd(wdbp, interp, argc, argv);
 }
 
 int cmd_bot_smooth( ClientData	clientData,

Modified: brlcad/trunk/src/mged/cmd.h
===================================================================
--- brlcad/trunk/src/mged/cmd.h	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/src/mged/cmd.h	2008-08-06 04:33:50 UTC (rev 32275)
@@ -155,7 +155,7 @@
 MGED_EXTERN(int f_area, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv));
 MGED_EXTERN(int f_attach, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv));
 MGED_EXTERN(int f_bev, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv));
-MGED_EXTERN(int f_binary, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv));
+MGED_EXTERN(int f_bo, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv));
 MGED_EXTERN(int f_bomb, (ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[]));
 MGED_EXTERN(int f_bot_condense, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv));
 MGED_EXTERN(int f_bot_face_fuse, (ClientData clientData, Tcl_Interp *interp, int argc, char **argv));

Modified: brlcad/trunk/src/mged/setup.c
===================================================================
--- brlcad/trunk/src/mged/setup.c	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/src/mged/setup.c	2008-08-06 04:33:50 UTC (rev 32275)
@@ -81,7 +81,7 @@
     {"attr", cmd_attr},
     {"autoview", cmd_autoview},
     {"bev", f_bev},
-    {"binary", f_binary},
+    {"bo", f_bo},
 #if 0
     {"import_body", cmd_import_body},
     {"export_body", cmd_export_body},

Modified: brlcad/trunk/src/tclscripts/mged/help.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/help.tcl	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/src/tclscripts/mged/help.tcl	2008-08-06 04:33:50 UTC (rev 32275)
@@ -54,7 +54,7 @@
 set mged_help_data(autoview)	{{}	{set view size and center so that all displayed solids are in view}}
 set mged_help_data(B)		$helplib_data(dgo_blast)
 set mged_help_data(bev)		{{"[-t] [-P#] new_obj obj1 op obj2 op obj3 op ..."}	{boolean evaluation of objects via NMG's}}
-set mged_help_data(binary)	{{{-i major_type minor_type | -o} dest source}
+set mged_help_data(bo)	{{{-i major_type minor_type | -o} dest source}
     {manipulate opaque objects.
 	Must specify one of -i (for creating or adjusting objects (input))
 	or -o for extracting objects (output).

Modified: brlcad/trunk/src/tclscripts/mged/make_solid.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/make_solid.tcl	2008-08-06 03:46:40 UTC (rev 32274)
+++ brlcad/trunk/src/tclscripts/mged/make_solid.tcl	2008-08-06 04:33:50 UTC (rev 32275)
@@ -100,7 +100,7 @@
 	return
     }
 
-    if { [catch {binary -i u $binunif_types($type) $name $fileName} ret] != 0 } {
+    if { [catch {bo -i u $binunif_types($type) $name $fileName} ret] != 0 } {
 	cad_dialog $::tk::Priv(cad_dialog) $mged_gui($id,screen) "ERROR creating BINUNIF" $ret "" 0 OK
 	return
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




[brlcad-commits] SF.net SVN: brlcad:[32275] brlcad/trunk

Open Source Solid Modeling CAD

[brlcad-commits] SF.net SVN: brlcad:[32275] brlcad/trunk