[brlcad-commits] SF.net SVN: brlcad:[32953] brlcad/trunk/src/liboptical/sh_prj.c
Revision: 32953
http://brlcad.svn.sourceforge.net/brlcad/?rev=32953view=rev
Author: brlcad
Date: 2008-10-14 06:14:23 + (Tue, 14 Oct 2008)
Log Message:
---
ws
Modified Paths:
--
brlcad/trunk/src/liboptical/sh_prj.c
Modified: brlcad/trunk/src/liboptical/sh_prj.c
===
--- brlcad/trunk/src/liboptical/sh_prj.c2008-10-14 02:11:20 UTC (rev
32952)
+++ brlcad/trunk/src/liboptical/sh_prj.c2008-10-14 06:14:23 UTC (rev
32953)
@@ -392,7 +392,7 @@
*/
struct bu_structparse img_parse_tab[] = {
{%V, 1, image, IMG_O(i_name),
BU_STRUCTPARSE_FUNC_NULL},
-{%V, 1, file, IMG_O(i_name), img_source_hook},
+{%V, 1, file, IMG_O(i_name),
img_source_hook},
{%V, 1, obj, IMG_O(i_name),
img_source_hook},
{%V, 1, object,IMG_O(i_name),
img_source_hook},
{%d, 1, w, IMG_O(i_width), dimen_hook},
@@ -444,6 +444,7 @@
prj_setup(register struct region *rp, struct bu_vls *matparm, char **dpp,
struct mfuncs *mfp, struct rt_i *rtip)
+
/* pointer to reg_udata in *rp */
/* New since 4.4 release */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[32954] brlcad/trunk/src/util/bombardier.c
Revision: 32954
http://brlcad.svn.sourceforge.net/brlcad/?rev=32954view=rev
Author: brlcad
Date: 2008-10-14 06:31:31 + (Tue, 14 Oct 2008)
Log Message:
---
emphasize if the appname is not known
Modified Paths:
--
brlcad/trunk/src/util/bombardier.c
Modified: brlcad/trunk/src/util/bombardier.c
===
--- brlcad/trunk/src/util/bombardier.c 2008-10-14 06:14:23 UTC (rev 32953)
+++ brlcad/trunk/src/util/bombardier.c 2008-10-14 06:31:31 UTC (rev 32954)
@@ -235,7 +235,7 @@
if (bu_vls_addr(appname)[0] != '\0') {
Tcl_SetVar(interp, application, bu_vls_addr(appname), 0);
} else {
- Tcl_SetVar(interp, application, unknown, 0);
+ Tcl_SetVar(interp, application, [UNKNOWN], 0);
}
bu_vls_free(appname);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[32958] brlcad/trunk/src/tclscripts/mged/man.tcl
Revision: 32958
http://brlcad.svn.sourceforge.net/brlcad/?rev=32958view=rev
Author: starseeker
Date: 2008-10-14 19:18:54 + (Tue, 14 Oct 2008)
Log Message:
---
upgrade the doc viewer to list available man pages on the side. For now this
will only trigger via the man command, but next step is to point the menu to
this functionality.
Modified Paths:
--
brlcad/trunk/src/tclscripts/mged/man.tcl
Modified: brlcad/trunk/src/tclscripts/mged/man.tcl
===
--- brlcad/trunk/src/tclscripts/mged/man.tcl2008-10-14 16:25:33 UTC (rev
32957)
+++ brlcad/trunk/src/tclscripts/mged/man.tcl2008-10-14 19:18:54 UTC (rev
32958)
@@ -21,10 +21,38 @@
package require Tkhtml 3.0
+proc handle_select { w y } {
+set curr_sel [$w curselection]
+if { $curr_sel != } {
+$w selection clear $curr_sel
+}
+$w selection set [$w nearest $y]
+}
+
+proc get_html_data {cmdname} {
+global man_data
+
+# get file data
+set man_fd [open [bu_brlcad_data html/man1/en/$cmdname.html]]
+set man_data [read $man_fd]
+close $man_fd
+}
+
+proc re_display {w} {
+
+global man_data
+$w reset;
+$w configure -parsemode html
+$w parse $man_data
+
+}
+
+
proc man {cmdname} {
global mged_gui
global ::tk::Priv
global mged_players
+global man_data
if [winfo exists .man] {
catch {destroy .man}
@@ -45,10 +73,7 @@
puts No man page found for $cmdname
return
} else {
- # get file data
-set man_fd [open [bu_brlcad_data html/man1/en/$cmdname.html]]
-set man_data [read $man_fd]
-close $man_fd
+ get_html_data $cmdname
# make dialog
toplevel .man -screen $mged_gui($_mgedFramebufferId,screen)
wm title .man $cmdname
@@ -68,6 +93,18 @@
grid rowconfigure .man.top.msgF 0 -weight 1
pack .man.top.msgF -side right -expand yes -fill both -padx 2m -pady 2m
+ frame .man.top.listing
+ scrollbar .man.top.s -command .man.top.l yview
+ listbox .man.top.l -bd 2 -yscroll .man.top.s set -width 16
-exportselection false
+ grid .man.top.l .man.top.s -sticky nsew -in .man.top.listing
+ grid columnconfigure .man.top.listing 0 -weight 0
+ grid rowconfigure .man.top.listing 0 -weight 1
+ set cmds [concat [?]]
+ foreach cmd $cmds {
+ if {[file exists [bu_brlcad_data html/man1/en/$cmd.html ]]}
{.man.top.l insert end $cmd}
+ }
+ pack .man.top.listing -side left -expand no -fill y
+
button .man.bot.buttonOK -text OK -command catch {destroy .man}
frame .man.bot.default -relief sunken -bd 1
raise .man.bot.buttonOK
@@ -75,6 +112,8 @@
pack .man.bot.buttonOK -in .man.bot.default -side left -padx 1m \
-pady 1m -ipadx 1m -ipady 1
+ bind .man.top.l Button-1 {handle_select %W %y; get_html_data [%W get
[%W curselection]]; re_display .man.top.msgT}
+
bind .man Return catch {destroy .man}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[32957] brlcad/trunk/include
Revision: 32957 http://brlcad.svn.sourceforge.net/brlcad/?rev=32957view=rev Author: brlcad Date: 2008-10-14 16:25:33 + (Tue, 14 Oct 2008) Log Message: --- dumb me. add the frelling gcv.h interface header and unbreak the build Modified Paths: -- brlcad/trunk/include/Makefile.am Added Paths: --- brlcad/trunk/include/gcv.h Modified: brlcad/trunk/include/Makefile.am === --- brlcad/trunk/include/Makefile.am2008-10-14 15:17:07 UTC (rev 32956) +++ brlcad/trunk/include/Makefile.am2008-10-14 16:25:33 UTC (rev 32957) @@ -43,6 +43,7 @@ fb.h \ fbio.h \ fbserv_obj.h \ + gcv.h \ libtermio.h \ light.h \ mater.h \ Added: brlcad/trunk/include/gcv.h === --- brlcad/trunk/include/gcv.h (rev 0) +++ brlcad/trunk/include/gcv.h 2008-10-14 16:25:33 UTC (rev 32957) @@ -0,0 +1,76 @@ +/* G C V . H + * BRL-CAD + * + * Copyright (c) 2008 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. + */ +/** @file ged.h + * + * Functions provided by the LIBGCV geometry conversion library. + * + */ + +#ifndef __GCV_H__ +#define __GCV_H__ + +#include raytrace.h + +__BEGIN_DECLS + +#ifndef GCV_EXPORT +# if defined(_WIN32) !defined(__CYGWIN__) defined(BRLCAD_DLL) +#ifdef GCV_EXPORT_DLL +# define GCV_EXPORT __declspec(dllexport) +#else +# define GCV_EXPORT __declspec(dllimport) +#endif +# else +#define GCV_EXPORT +# endif +#endif + + +/** + * G C V _ R E G I O N _ E N D + * + * Usually specified as the db_walk_tree() region_end callback, + * calling this routine for each positive region encountered. + * + * The client_data parameter is expected to be a function pointer for + * a routine that will write out the region in a given file format: + * [EMAIL PROTECTED] +void (*write_region)(struct nmgregion *r, struct db_full_path *pathp, int region_id, int material_id, float color[3]); [EMAIL PROTECTED] + * + * This routine must be prepared to run in parallel. + */ +GCV_EXPORT BU_EXTERN(union tree *gcv_region_end, (struct db_tree_state *tsp, struct db_full_path *pathp, union tree *curtree, genptr_t client_data)); + + +__END_DECLS + +#endif /* __GED_H__ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: stroustrup + * End: + * ex: shiftwidth=4 tabstop=8 + */ Property changes on: brlcad/trunk/include/gcv.h ___ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[32956] brlcad/trunk
Revision: 32956
http://brlcad.svn.sourceforge.net/brlcad/?rev=32956view=rev
Author: bob1961
Date: 2008-10-14 15:17:07 + (Tue, 14 Oct 2008)
Log Message:
---
Added the inside command to libged.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
brlcad/trunk/src/libged/Makefile.am
brlcad/trunk/src/libtclcad/ged_obj.c
Added Paths:
---
brlcad/trunk/src/libged/inside.c
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2008-10-14 12:20:55 UTC (rev 32955)
+++ brlcad/trunk/include/ged.h 2008-10-14 15:17:07 UTC (rev 32956)
@@ -1593,6 +1593,14 @@
GED_EXPORT BU_EXTERN(int ged_in, (struct ged *gedp, int argc, const char
*argv[]));
/**
+ * Finds the inside primitive per the specified thickness.
+ *
+ * Usage:
+ * inside out_prim in_prim th(s)
+ */
+GED_EXPORT BU_EXTERN(int ged_inside, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
* Add instance of obj to comb
*
* Usage:
Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-10-14 12:20:55 UTC
(rev 32955)
+++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-10-14 15:17:07 UTC
(rev 32956)
@@ -518,6 +518,10 @@
/File
File
+ RelativePath=..\..\..\src\libged\inside.c
+
+ /File
+ File
RelativePath=..\..\..\src\libged\instance.c
/File
Modified: brlcad/trunk/src/libged/Makefile.am
===
--- brlcad/trunk/src/libged/Makefile.am 2008-10-14 12:20:55 UTC (rev 32955)
+++ brlcad/trunk/src/libged/Makefile.am 2008-10-14 15:17:07 UTC (rev 32956)
@@ -76,6 +76,7 @@
how.c \
illum.c \
importFg4Section.c \
+ inside.c \
instance.c \
isize.c \
item.c \
Added: brlcad/trunk/src/libged/inside.c
===
--- brlcad/trunk/src/libged/inside.c(rev 0)
+++ brlcad/trunk/src/libged/inside.c2008-10-14 15:17:07 UTC (rev 32956)
@@ -0,0 +1,1197 @@
+/*I N S I D E . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008 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.
+ */
+/** @file inside.c
+ *
+ * The inside command.
+ *
+ */
+
+#include common.h
+#include bio.h
+
+#include stdlib.h
+#include ctype.h
+#include math.h
+#include string.h
+
+#include bu.h
+#include vmath.h
+#include bn.h
+#include nmg.h
+#include rtgeom.h
+#include raytrace.h
+#include db.h
+#include ged_private.h
+
+static char *p_arb4[] = {
+Enter thickness for face 123: ,
+Enter thickness for face 124: ,
+Enter thickness for face 234: ,
+Enter thickness for face 134: ,
+};
+
+static char *p_arb5[] = {
+Enter thickness for face 1234: ,
+Enter thickness for face 125: ,
+Enter thickness for face 235: ,
+Enter thickness for face 345: ,
+Enter thickness for face 145: ,
+};
+
+static char *p_arb6[] = {
+Enter thickness for face 1234: ,
+Enter thickness for face 2356: ,
+Enter thickness for face 1564: ,
+Enter thickness for face 125: ,
+Enter thickness for face 346: ,
+};
+
+static char *p_arb7[] = {
+Enter thickness for face 1234: ,
+Enter thickness for face 567: ,
+Enter thickness for face 145: ,
+Enter thickness for face 2376: ,
+Enter thickness for face 1265: ,
+Enter thickness for face 3475: ,
+};
+
+static char *p_arb8[] = {
+Enter thickness for face 1234: ,
+Enter thickness for face 5678: ,
+Enter thickness for face 1485: ,
+Enter thickness for face 2376: ,
+Enter thickness for face 1265: ,
+Enter thickness for face 3478: ,
+};
+
+static char *p_tgcin[] = {
+Enter thickness for base (AxB): ,
+Enter thickness for top (CxD): ,
+Enter thickness for side: ,
+};
+
+static char *p_partin[] = {
+Enter thickness for body: ,
+};
+
[brlcad-commits] SF.net SVN: brlcad:[32961] brlcad/trunk/doc/docbook/system/man1/en
Revision: 32961 http://brlcad.svn.sourceforge.net/brlcad/?rev=32961view=rev Author: starseeker Date: 2008-10-15 00:04:22 + (Wed, 15 Oct 2008) Log Message: --- Add first stab at an MGED man page that is a tad more current - needs some more work. Modified Paths: -- brlcad/trunk/doc/docbook/system/man1/en/Makefile.am Added Paths: --- brlcad/trunk/doc/docbook/system/man1/en/mged.xml Modified: brlcad/trunk/doc/docbook/system/man1/en/Makefile.am === --- brlcad/trunk/doc/docbook/system/man1/en/Makefile.am 2008-10-14 22:24:34 UTC (rev 32960) +++ brlcad/trunk/doc/docbook/system/man1/en/Makefile.am 2008-10-15 00:04:22 UTC (rev 32961) @@ -24,6 +24,7 @@ alias-pix.xml \ all_sf.xml \ bwscale.xml \ + mged.xml \ nirt.xml \ rt.xml \ rtarea.xml \ Added: brlcad/trunk/doc/docbook/system/man1/en/mged.xml === --- brlcad/trunk/doc/docbook/system/man1/en/mged.xml (rev 0) +++ brlcad/trunk/doc/docbook/system/man1/en/mged.xml2008-10-15 00:04:22 UTC (rev 32961) @@ -0,0 +1,281 @@ +?xml version=1.0 encoding=ISO-8859-1? +!DOCTYPE refentry PUBLIC -//OASIS//DTD DocBook XML V4.1.2//EN + ../../../resources/standard/dtd/docbookx.dtd + +!-- Copyright (c) 2005-2008 United States Government as represented by -- +!-- the U.S. Army Research Laboratory. -- +!---- +!-- Redistribution and use in source (Docbook format) and 'compiled' -- +!-- forms (PDF, PostScript, HTML, RTF, etc), with or without -- +!-- modification, are permitted provided that the following conditions -- +!-- are met: -- +!---- +!-- 1. Redistributions of source code (Docbook format) must retain the -- +!-- above copyright notice, this list of conditions and the following -- +!-- disclaimer.-- +!---- +!-- 2. Redistributions in compiled form (transformed to other DTDs,-- +!-- converted to PDF, PostScript, HTML, RTF, and other formats) must -- +!-- reproduce the above copyright notice, this list of conditions and -- +!-- the following disclaimer in the documentation and/or other -- +!-- materials provided with the distribution. -- +!---- +!-- 3. The name of the author may not be used to endorse or promote-- +!-- products derived from this documentation without specific prior-- +!-- written permission.-- +!---- +!-- THIS DOCUMENTATION IS PROVIDED BY THE AUTHOR AS IS AND ANY -- +!-- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- +!-- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -- +!-- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -- +!-- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -- +!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -- +!-- OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -- +!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -- +!-- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- +!-- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -- +!-- USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF -- +!-- SUCH DAMAGE. -- + +refentry id='mged1' + refmeta +refentrytitleMGED/refentrytitle +manvolnum1/manvolnum +refmiscinfo class='source'BRL-CAD/refmiscinfo +refmiscinfo class='manual'BRL-CAD User Commands/refmiscinfo + /refmeta + refnamediv id='name' +refnamemged/refname +refpurposemulti-display interactive combinatorial solid geometry editor/refpurpose + /refnamediv + + !-- body begins here -- + refsynopsisdiv id='synopsis' +cmdsynopsis + commandmged/command + arg choice='opt'-b /arg + arg choice='opt'-c /arg + arg choice='opt'-d display/arg + arg choice='opt'-h /arg + arg choice='opt'-r /arg + arg choice='opt'-x#/arg + arg choice='opt'-X#/arg + arg choice='opt'replaceabledatabase.g/replaceable/arg + arg choice='opt'replaceablemged_command/replaceable/arg +/cmdsynopsis + /refsynopsisdiv + + + refsect1 id='description' +titleDESCRIPTION/title +para + applicationMGED/application, a.k.a the Multi-Device Geometry Editor is the +
