Revision: 41009
http://brlcad.svn.sourceforge.net/brlcad/?rev=41009&view=rev
Author: starseeker
Date: 2010-10-15 21:21:50 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
Update cmake branch to trunk r41008
Modified Paths:
--------------
brlcad/branches/cmake/BUGS
brlcad/branches/cmake/NEWS
brlcad/branches/cmake/configure.ac
brlcad/branches/cmake/m4/compiler.m4
brlcad/branches/cmake/m4/epsilon.m4
brlcad/branches/cmake/misc/Makefile.am
brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
brlcad/branches/cmake/misc/win32-msvc8/tkhtml/tkhtml.vcproj
brlcad/branches/cmake/misc/win32-msvc8/tktable/tktable.vcproj
brlcad/branches/cmake/src/archer/archer
brlcad/branches/cmake/src/libbn/mat.c
brlcad/branches/cmake/src/libbn/plane.c
brlcad/branches/cmake/src/libged/rt.c
brlcad/branches/cmake/src/librt/primitives/nmg/nmg_mk.c
brlcad/branches/cmake/src/rt/view.c
brlcad/branches/cmake/src/tclscripts/archer/Archer.tcl
brlcad/branches/cmake/src/tclscripts/archer/ArcherCore.tcl
brlcad/branches/cmake/src/tclscripts/archer/DataUtils.tcl
brlcad/branches/cmake/src/tclscripts/mged/text.tcl
Removed Paths:
-------------
brlcad/branches/cmake/misc/archlinux/Makefile.am
brlcad/branches/cmake/misc/debian/Makefile.am
brlcad/branches/cmake/misc/nsis/Makefile.am
brlcad/branches/cmake/misc/win32-msvc/Dll/Makefile.am
brlcad/branches/cmake/misc/win32-msvc/Makefile.am
Modified: brlcad/branches/cmake/BUGS
===================================================================
--- brlcad/branches/cmake/BUGS 2010-10-15 21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/BUGS 2010-10-15 21:21:50 UTC (rev 41009)
@@ -15,6 +15,10 @@
Recent Bugs
-----------
+* mged/tcl "gets" command doesn't work if you run the "source" command
+ to read in a script that uses gets on stdin. it just hangs until
+ muliple sigint's are received.
+
* mged 'cd' on Windows results in the rt* commands failing.
* menu invocation seems to be broken again (ArchLinux)
Modified: brlcad/branches/cmake/NEWS
===================================================================
--- brlcad/branches/cmake/NEWS 2010-10-15 21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/NEWS 2010-10-15 21:21:50 UTC (rev 41009)
@@ -13,6 +13,8 @@
--- 2010-09-XX Release 7.18.0 ---
----------------------------------------------------------------------
+* fixed crash when raytracing multiple frames - Keith Bowman
+* fixed mged zap crash while using preview - Keith Bowman, Bob Parker
* added ability to toggle mged status bar via .mgedrc - Rob Shinn
* new mged 'bot' command for accessing BoT properties - Nicholas Reed
Modified: brlcad/branches/cmake/configure.ac
===================================================================
--- brlcad/branches/cmake/configure.ac 2010-10-15 21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/configure.ac 2010-10-15 21:21:50 UTC (rev 41009)
@@ -2279,6 +2279,7 @@
[ AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_BASENAME], [1], [Define to 1 if you have the `basename'
function.])
],
+[ AC_MSG_RESULT(no) ],
[ AC_MSG_RESULT(no) ])
LIBS="$PRELIBS"
@@ -2297,6 +2298,7 @@
[ AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_DIRNAME], [1], [Define to 1 if you have the `dirname'
function.])
],
+[ AC_MSG_RESULT(no) ],
[ AC_MSG_RESULT(no) ])
LIBS="$PRELIBS"
@@ -2380,7 +2382,7 @@
int i = png_access_version_number();
return 0;
}
-], [png_works=yes])
+], [png_works=yes], [png_works=no], [png_works=no])
LIBS="$PRELIBS"
AC_MSG_RESULT($png_works)
@@ -2436,7 +2438,7 @@
regexec(&re, "", 0, 0, 0);
return 0;
}
-], [regex_works=yes])
+], [regex_works=yes], [regex_works=no], [regex_works=no])
LIBS="$PRELIBS"
AC_MSG_RESULT($regex_works)
@@ -2486,7 +2488,7 @@
char *zlibver = ZLIB_VERSION;
return 0;
}
-], [zlib_works=yes])
+], [zlib_works=yes], [zlib_works=no], [zlib_works=no])
LIBS="$PRELIBS"
AC_MSG_RESULT($zlib_works)
@@ -2539,7 +2541,7 @@
pt.x = pt.y = 0;
return pt.x;
}
- ],[x11_works=yes])
+ ], [x11_works=yes], [x11_works=no], [x11_works=yes])
AC_MSG_RESULT($x11_works)
if test "x$x11_works" = "xyes" ; then
LIBS="$LIBS $X_LIBS"
@@ -2551,7 +2553,7 @@
xmkm=XNewModifiermap(1);
return xmkm==NULL;
}
- ],,x11_works=no)
+ ], [x11_works=yes], [x11_works=no], [x11_works=yes])
AC_MSG_RESULT($x11_works)
fi
LIBS="$PRELIBS"
@@ -2605,7 +2607,7 @@
rle_hdr header = *rle_hdr_init( NULL );
return 0;
}
-], [urt_works=yes])
+], [urt_works=yes], [urt_works=no], [urt_works=no])
if test "x$utahrle_link_works" = "xyes" ; then
LIBS="$PRELIBS"
fi
@@ -2660,7 +2662,7 @@
int version = ON::Version();
return 0;
}
-], [opennurbs_works=yes])
+], [opennurbs_works=yes], [opennurbs_works=no], [opennurbs_works=no])
AC_LANG_POP
LIBS="$PRELIBS"
AC_MSG_RESULT($opennurbs_works)
@@ -2754,7 +2756,7 @@
#endif
return 0;
}
-], [tcl_works=yes])
+], [tcl_works=yes], [tcl_works=no], [tcl_works=no])
if test "x$tcl_link_works" = "xyes" ; then
LIBS="$PRELIBS"
fi
@@ -2878,7 +2880,7 @@
#endif
return 0;
}
-], [tk_works=yes])
+], [tk_works=yes], [tk_works=no], [tk_works=no])
if test "x$tk_link_works" = "xyes" ; then
LIBS="$PRELIBS"
fi
@@ -3001,7 +3003,7 @@
#endif
return 0;
}
-], [itcl_works=yes])
+], [itcl_works=yes], [itcl_works=no], [itcl_works=no])
if test "x$itcl_link_works" = "xyes" ; then
LIBS="$PRELIBS"
fi
@@ -3129,7 +3131,7 @@
}
return 0;
}
-], [iwidgets_works=yes])
+], [iwidgets_works=yes], [iwidgets_works=no], [iwidgets_works=no])
if test "x$tcl_link_works" = "xyes" ; then
LIBS="$PRELIBS"
fi
@@ -3246,7 +3248,7 @@
}
return 0;
}
-], [tnt_works=yes])
+], [tnt_works=yes], [tnt_works=no], [tnt_works=no])
AC_LANG_POP(C++)
AC_MSG_RESULT($tnt_works)
@@ -3300,7 +3302,7 @@
pthread_join(thread, NULL);
return 0;
}
-], [thread_works=yes])
+], [thread_works=yes], [thread_works=no], [thread_works=no])
AC_MSG_RESULT($thread_works)
@@ -3342,7 +3344,7 @@
int result = tgetent(buffer, "vt100");
return 0;
}
-], [termlib_works=yes])
+], [termlib_works=yes], [termlib_works=no], [termlib_works=no])
LIBS="$PRELIBS"
AC_MSG_RESULT($termlib_works)
@@ -3631,7 +3633,7 @@
}
return 0;
}
- ], [opengl_works=yes])
+ ], [opengl_works=yes], [opengl_works=no], [opengl_works=no])
LIBS="$PRELIBS"
CPPFLAGS="$PRECPPFLAGS"
LDFLAGS="$PRELDFLAGS"
@@ -3677,7 +3679,7 @@
}
return 0;
}
- ], [agl_works=yes])
+ ], [agl_works=yes], [agl_works=no], [agl_works=no])
LIBS="$PRELIBS"
CPPFLAGS="$PRECPPFLAGS"
LDFLAGS="$PRELDFLAGS"
@@ -3722,7 +3724,7 @@
}
return 0;
}
- ], [wgl_works=yes])
+ ], [wgl_works=yes], [wgl_works=no], [wgl_works=no])
LIBS="$PRELIBS"
AC_MSG_RESULT($wgl_works)
@@ -3772,7 +3774,7 @@
}
return 1;
}
-], [dials_and_buttons=yes])
+], [dials_and_buttons=yes], [dials_and_buttons=no], [dials_and_buttons=no])
if test "x$dials_and_buttons" = "xyes" ; then
AC_DEFINE(IR_KNOBS, 8, [Turn on SGI knobs])
AC_DEFINE(IR_BUTTONS, 32, [Turn on SGI buttons])
@@ -4206,15 +4208,12 @@
include/conf/Makefile
m4/Makefile
misc/Makefile
- misc/archlinux/Makefile
misc/brlcad-config
misc/brlcad.spec
- misc/debian/Makefile
misc/macosx/Makefile
misc/macosx/Resources/Makefile
misc/macosx/Resources/ReadMe.rtfd/Makefile
misc/macosx/Resources/Welcome.rtfd/Makefile
- misc/nsis/Makefile
misc/pkgconfig/Makefile
misc/pkgconfig/libanalyze.pc
misc/pkgconfig/libbn.pc
@@ -4232,8 +4231,6 @@
misc/pkgconfig/libpkg.pc
misc/pkgconfig/librt.pc
misc/pkgconfig/libwdb.pc
- misc/win32-msvc/Dll/Makefile
- misc/win32-msvc/Makefile
misc/win32-msvc8/Makefile
pix/Makefile
sh/Makefile
Modified: brlcad/branches/cmake/m4/compiler.m4
===================================================================
--- brlcad/branches/cmake/m4/compiler.m4 2010-10-15 21:13:38 UTC (rev
41008)
+++ brlcad/branches/cmake/m4/compiler.m4 2010-10-15 21:21:50 UTC (rev
41009)
@@ -69,7 +69,7 @@
AC_TRY_RUN( [
#include <stdlib.h>
int main(){exit(0);}
-], [], [bc_[$2]_works=no])
+], [], [bc_[$2]_works=no], [bc_[$2]_works=maybe])
AC_MSG_RESULT($bc_[$2]_works)
if test "x$bc_[$2]_works" = "xno" -o "x$__keep" != "x" ; then
CFLAGS="$PRECFLAGS"
@@ -173,7 +173,8 @@
AC_MSG_RESULT(no)
AC_MSG_NOTICE([}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}])
AC_MSG_ERROR([*** compiler cannot create working executables,
check config.log ***])
- ]
+ ],
+ [ AC_MSG_RESULT(dunno, cross-compiling)]
)
])
Modified: brlcad/branches/cmake/m4/epsilon.m4
===================================================================
--- brlcad/branches/cmake/m4/epsilon.m4 2010-10-15 21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/m4/epsilon.m4 2010-10-15 21:21:50 UTC (rev 41009)
@@ -167,7 +167,7 @@
}
return 0;
}
-], [bc_compliant_float=yes], [bc_compliant_float=no])
+], [bc_compliant_float=yes], [bc_compliant_float=no],
[bc_compliant_float=dunno])
AC_MSG_RESULT([$bc_compliant_float])
])
@@ -211,6 +211,6 @@
}
return 0;
}
-], [bc_compliant_double=yes], [bc_compliant_double=no])
+], [bc_compliant_double=yes], [bc_compliant_double=no],
[bc_compliant_double=dunno])
AC_MSG_RESULT([$bc_compliant_double])
])
Modified: brlcad/branches/cmake/misc/Makefile.am
===================================================================
--- brlcad/branches/cmake/misc/Makefile.am 2010-10-15 21:13:38 UTC (rev
41008)
+++ brlcad/branches/cmake/misc/Makefile.am 2010-10-15 21:21:50 UTC (rev
41009)
@@ -1,12 +1,8 @@
SUBDIRS = \
- archlinux \
- debian \
enigma \
macosx \
- nsis \
pkgconfig \
- win32-msvc \
win32-msvc8
sample_applicationsdir = $(SAMPLE_APPLICATIONS_DIR)
@@ -20,21 +16,51 @@
NIST_DENSITIES
EXTRA_DIST = \
- ${DATAFILES} \
$(man_MANS) \
$(sample_applications_DATA) \
+ ${DATAFILES} \
Description.txt \
Doxyfile \
Makefile.defs \
+ archlinux/PKGBUILD \
+ archlinux/brlcad.install \
+ archlinux/brlcad.sh \
batch-indent-region.el \
brlcad-config \
brlcad-config.in \
brlcad.spec \
brlcad.spec.in \
+ debian/brlcad-bin.docs \
+ debian/brlcad-bin.install \
+ debian/brlcad-bin.lintian-overrides \
+ debian/brlcad-data.install \
+ debian/brlcad-dev.install \
+ debian/brlcad-doc.install \
+ debian/changelog \
+ debian/compat \
+ debian/control \
+ debian/copyright \
+ debian/rules \
+ debian/source/format \
+ debian/watch \
doxygen_structure \
flawfinder \
- libtool.m4
+ libtool.m4 \
+ nsis/brlcad.ico \
+ nsis/brlcad.nsi \
+ nsis/header.bmp \
+ nsis/side.bmp \
+ nsis/uninstall.ico \
+ nsis/updateVersion.tcl \
+ win32-msvc/CMakeLists.txt \
+ win32-msvc/Dll/BrlcadCore.def \
+ win32-msvc/Dll/BrlcadCore.rc \
+ win32-msvc/Dll/CMakeLists.txt \
+ win32-msvc/Dll/brlcad.def \
+ win32-msvc/Dll/brlcad.rc \
+ win32-msvc/Dll/TclDummies.c
+
datafilesdir = $(BRLCAD_DATA)/data
datafiles_DATA = \
Deleted: brlcad/branches/cmake/misc/archlinux/Makefile.am
===================================================================
--- brlcad/branches/cmake/misc/archlinux/Makefile.am 2010-10-15 21:13:38 UTC
(rev 41008)
+++ brlcad/branches/cmake/misc/archlinux/Makefile.am 2010-10-15 21:21:50 UTC
(rev 41009)
@@ -1,7 +0,0 @@
-
-EXTRA_DIST = \
- PKGBUILD \
- brlcad.install \
- brlcad.sh
-
-include $(top_srcdir)/misc/Makefile.defs
Deleted: brlcad/branches/cmake/misc/debian/Makefile.am
===================================================================
--- brlcad/branches/cmake/misc/debian/Makefile.am 2010-10-15 21:13:38 UTC
(rev 41008)
+++ brlcad/branches/cmake/misc/debian/Makefile.am 2010-10-15 21:21:50 UTC
(rev 41009)
@@ -1,17 +0,0 @@
-
-EXTRA_DIST = \
- brlcad-bin.docs \
- brlcad-bin.install \
- brlcad-bin.lintian-overrides \
- brlcad-data.install \
- brlcad-dev.install \
- brlcad-doc.install \
- changelog \
- compat \
- control \
- copyright \
- rules \
- source/format \
- watch
-
-include $(top_srcdir)/misc/Makefile.defs
Deleted: brlcad/branches/cmake/misc/nsis/Makefile.am
===================================================================
--- brlcad/branches/cmake/misc/nsis/Makefile.am 2010-10-15 21:13:38 UTC (rev
41008)
+++ brlcad/branches/cmake/misc/nsis/Makefile.am 2010-10-15 21:21:50 UTC (rev
41009)
@@ -1,10 +0,0 @@
-
-EXTRA_DIST = \
- brlcad.ico \
- brlcad.nsi \
- header.bmp \
- side.bmp \
- uninstall.ico \
- updateVersion.tcl
-
-include $(top_srcdir)/misc/Makefile.defs
Deleted: brlcad/branches/cmake/misc/win32-msvc/Dll/Makefile.am
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc/Dll/Makefile.am 2010-10-15
21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/misc/win32-msvc/Dll/Makefile.am 2010-10-15
21:21:50 UTC (rev 41009)
@@ -1,10 +0,0 @@
-
-EXTRA_DIST = \
- BrlcadCore.def \
- BrlcadCore.rc \
- CMakeLists.txt \
- brlcad.def \
- brlcad.rc \
- TclDummies.c
-
-include $(top_srcdir)/misc/Makefile.defs
Deleted: brlcad/branches/cmake/misc/win32-msvc/Makefile.am
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc/Makefile.am 2010-10-15 21:13:38 UTC
(rev 41008)
+++ brlcad/branches/cmake/misc/win32-msvc/Makefile.am 2010-10-15 21:21:50 UTC
(rev 41009)
@@ -1,8 +0,0 @@
-
-SUBDIRS = \
- Dll
-
-EXTRA_DIST = \
- CMakeLists.txt
-
-include $(top_srcdir)/misc/Makefile.defs
Modified: brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
2010-10-15 21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
2010-10-15 21:21:50 UTC (rev 41009)
@@ -155,9 +155,9 @@
catch {
# stub_dir [file join $shareDir pix]
stub_dir [file join $installDir bin]
- stub_dir [file join $installDir bin Tkhtml3.0]
- stub_dir [file join $installDir bin Tktable2.10]
- stub_dir [file join $installDir bin Tktable2.10 html]
+ stub_dir [file join $installDir lib Tkhtml3.0]
+ stub_dir [file join $installDir lib Tktable2.10]
+ stub_dir [file join $installDir lib Tktable2.10 html]
stub_dir [file join $installDir lib iwidgets$iwidgetsVersion]
stub_dir [file join $installDir lib]
stub_dir [file join $installDir share brlcad]
@@ -323,7 +323,7 @@
puts $fd {package ifneeded Tkhtml 3.0 [list load [file join $dir
tkhtml.dll]]}
close $fd
cd $savepwd
- copy_stuff [file join $rootDir src other tkhtml src pkgIndex.tcl] [file join
$installDir bin Tkhtml3.0]
+ copy_stuff [file join $rootDir src other tkhtml src pkgIndex.tcl] [file join
$installDir lib Tkhtml3.0]
}
@@ -350,10 +350,10 @@
puts $fd {package ifneeded Tktable 2.10 [list load [file join $dir
tktable.dll] Tktable]}
close $fd
- copy_stuff [file join $tktabledir pkgIndex.tcl] [file join $installDir bin
Tktable2.10]
- copy_stuff [file join $tktabledir library tkTable.tcl] [file join
$installDir bin Tktable2.10]
- copy_stuff [file join $tktabledir doc tkTable.html] [file join $installDir
bin Tktable2.10 html]
- copy_stuff [file join $tktabledir license.txt] [file join $installDir bin
Tktable2.10]
+ copy_stuff [file join $tktabledir pkgIndex.tcl] [file join $installDir lib
Tktable2.10]
+ copy_stuff [file join $tktabledir library tkTable.tcl] [file join
$installDir lib Tktable2.10]
+ copy_stuff [file join $tktabledir doc tkTable.html] [file join $installDir
lib Tktable2.10 html]
+ copy_stuff [file join $tktabledir license.txt] [file join $installDir lib
Tktable2.10]
}
Modified: brlcad/branches/cmake/misc/win32-msvc8/tkhtml/tkhtml.vcproj
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/tkhtml/tkhtml.vcproj 2010-10-15
21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/misc/win32-msvc8/tkhtml/tkhtml.vcproj 2010-10-15
21:21:50 UTC (rev 41009)
@@ -117,7 +117,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall\bin\Tkhtml3.0
copy
"$(TargetDir)"tkhtml.lib
..\..\..\brlcadInstall\lib

"
+ CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall\lib\Tkhtml3.0
copy
"$(TargetDir)"tkhtml.lib
..\..\..\brlcadInstall\lib

"
/>
</Configuration>
<Configuration
@@ -221,7 +221,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall$(PlatformName)\bin\Tkhtml3.0
copy
"$(TargetDir)"tkhtml.lib
..\..\..\brlcadInstall$(PlatformName)\lib
"
+ CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall$(PlatformName)\lib\Tkhtml3.0
copy
"$(TargetDir)"tkhtml.lib
..\..\..\brlcadInstall$(PlatformName)\lib
"
/>
</Configuration>
</Configurations>
Modified: brlcad/branches/cmake/misc/win32-msvc8/tktable/tktable.vcproj
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/tktable/tktable.vcproj
2010-10-15 21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/misc/win32-msvc8/tktable/tktable.vcproj
2010-10-15 21:21:50 UTC (rev 41009)
@@ -117,7 +117,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall\bin\Tktable2.10
copy
"$(TargetDir)"tktable.lib
..\..\..\brlcadInstall\lib

"
+ CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall\lib\Tktable2.10
copy
"$(TargetDir)"tktable.lib
..\..\..\brlcadInstall\lib

"
/>
</Configuration>
<Configuration
@@ -221,7 +221,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall$(PlatformName)\bin\Tktable2.10
copy
"$(TargetDir)"tktable.lib
..\..\..\brlcadInstall$(PlatformName)\lib
"
+ CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall$(PlatformName)\lib\Tktable2.10
copy
"$(TargetDir)"tktable.lib
..\..\..\brlcadInstall$(PlatformName)\lib
"
/>
</Configuration>
</Configurations>
Modified: brlcad/branches/cmake/src/archer/archer
===================================================================
--- brlcad/branches/cmake/src/archer/archer 2010-10-15 21:13:38 UTC (rev
41008)
+++ brlcad/branches/cmake/src/archer/archer 2010-10-15 21:21:50 UTC (rev
41009)
@@ -65,32 +65,16 @@
::ttk::style theme use clam
}
-# normalize ARCHER_HOME
-if {[info exists env(ARCHER_HOME)]} {
- set dir [file normalize $env(ARCHER_HOME)]
+# normalize dir
+if {[info exists argv0]} {
+ set dir [file normalize [file join [file dir $argv0] ..]]
} else {
- if {[info exists argv0]} {
- set dir [file normalize [file join [file dir $argv0] ..]]
- } else {
- set dir [file normalize [pwd]]
- }
+ set dir [file normalize [pwd]]
}
-set env(ARCHER_HOME) $dir
-# Decide on a parent class for ArcherCore
-#namespace eval ArcherCore {
-# if {0} {
-# set parentClass itk::Toplevel
-# set inheritFromToplevel 1
-# } else {
-# set parentClass itk::Widget
-# set inheritFromToplevel 0
-# }
-#}
-
if {$tcl_platform(platform) == "windows"} {
- lappend auto_path ${env(ARCHER_HOME)}/bin/Tkhtml3.0
- lappend auto_path ${env(ARCHER_HOME)}/bin/Tktable2.10
+ lappend auto_path ${dir}/lib/Tkhtml3.0
+ lappend auto_path ${dir}/lib/Tktable2.10
}
# load archer guts
@@ -103,7 +87,6 @@
set Archer::debug 0
if { [info exists env(DEBUG)] } {
- puts "Using ARCHER_HOME of $env(ARCHER_HOME)"
set Archer::debug $env(DEBUG)
}
Modified: brlcad/branches/cmake/src/libbn/mat.c
===================================================================
--- brlcad/branches/cmake/src/libbn/mat.c 2010-10-15 21:13:38 UTC (rev
41008)
+++ brlcad/branches/cmake/src/libbn/mat.c 2010-10-15 21:21:50 UTC (rev
41009)
@@ -1064,13 +1064,10 @@
register fastf_t f;
register int i;
- if (NEAR_ZERO(in[X], 0.0001)
- && NEAR_ZERO(in[Y], 0.0001)
- && NEAR_ZERO(in[Z], 0.0001))
- {
+ if (NEAR_ZERO(MAGSQ(in), SQRT_SMALL_FASTF)) {
VSETALL(out, 0);
- VPRINT("bn_vec_ortho: zero-length input", in);
- return;
+ bu_log("bn_vec_ortho(): zero magnitude input vector %lf %lf %lf\n",
in[0],in[1],in[2]);
+ bu_bomb("bn_vec_ortho(): zero magnitude input vector\n");
}
/* Find component closest to zero */
@@ -1090,8 +1087,8 @@
k = Y;
}
f = hypot(in[j], in[k]);
- if (NEAR_ZERO(f, SMALL)) {
- VPRINT("bn_vec_ortho: zero hypot on", in);
+ if (NEAR_ZERO(f, SMALL_FASTF)) {
+ bu_log("bn_vec_ortho(): zero hypot on %lf %lf %lf\n",
in[0],in[1],in[2]);
VSETALL(out, 0);
return;
}
@@ -1099,6 +1096,8 @@
out[i] = 0.0;
out[j] = -in[k]*f;
out[k] = in[j]*f;
+
+ return;
}
Modified: brlcad/branches/cmake/src/libbn/plane.c
===================================================================
--- brlcad/branches/cmake/src/libbn/plane.c 2010-10-15 21:13:38 UTC (rev
41008)
+++ brlcad/branches/cmake/src/libbn/plane.c 2010-10-15 21:21:50 UTC (rev
41009)
@@ -2191,33 +2191,34 @@
{
register fastf_t f;
register fastf_t dot;
-
+ vect_t pt_a, pt_b;
BN_CK_TOL(tol);
- /* Check to see if the planes are parallel */
+ if (!NEAR_ZERO(MAGSQ(a) - 1.0, VUNITIZE_TOL) || !NEAR_ZERO(MAGSQ(b) - 1.0,
VUNITIZE_TOL)) {
+ bu_bomb("bn_coplanar(): input vector(s) 'a' and/or 'b' is not a unit
vector.\n");
+ }
+
dot = VDOT(a, b);
- if (dot >= 0) {
- /* Normals head in generally the same directions */
- if (dot < tol->para)
- return 0; /* Planes intersect */
+ VSCALE(pt_a, a, a[3]);
+ VSCALE(pt_b, b, b[3]);
- /* Planes have "exactly" the same normal vector */
- f = a[3] - b[3];
- if (NEAR_ZERO(f, tol->dist)) {
- return 1; /* Coplanar, same direction */
- }
- return -1; /* Parallel but distinct */
+ if (NEAR_ZERO(dot, SMALL_FASTF)) {
+ return 0; /* planes are perpendicular */
}
- /* Normals head in generally opposite directions */
- if (-dot < tol->para)
- return 0; /* Planes intersect */
- /* Planes have "exactly" opposite normal vectors */
- f = a[3] + b[3];
- if (NEAR_ZERO(f, tol->dist)) {
- return 2; /* Coplanar, opposite directions */
+ /* parallel is when dot is within SMALL_FASTF of either -1 or 1 */
+ if ((dot <= -SMALL_FASTF) ? (NEAR_ZERO(dot + 1.0, SMALL_FASTF)) :
(NEAR_ZERO(dot - 1.0, SMALL_FASTF))) {
+ if (bn_pt3_pt3_equal(pt_a, pt_b, tol)) { /* test for coplanar */
+ if ( dot >= SMALL_FASTF) { /* test normals in same direction */
+ return 1;
+ } else {
+ return 2;
+ }
+ } else {
+ return -1;
+ }
}
- return -1; /* Parallel but distinct */
+ return 0;
}
/**
Modified: brlcad/branches/cmake/src/libged/rt.c
===================================================================
--- brlcad/branches/cmake/src/libged/rt.c 2010-10-15 21:13:38 UTC (rev
41008)
+++ brlcad/branches/cmake/src/libged/rt.c 2010-10-15 21:21:50 UTC (rev
41009)
@@ -28,11 +28,11 @@
#include <stdlib.h>
#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
+# include <sys/types.h>
#endif
#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
+# include <sys/wait.h>
#endif
#include "bio.h"
@@ -506,7 +506,7 @@
continue;
if (vp < end)
- *vp++ = bu_vls_addr(&gdlp->gdl_path);
+ *vp++ = gdlp->gdl_dp->d_namep;
else {
bu_vls_printf(&gedp->ged_result_str, "libged: ran out of command
vector space at %s\n", gdlp->gdl_dp->d_namep);
break;
Modified: brlcad/branches/cmake/src/librt/primitives/nmg/nmg_mk.c
===================================================================
--- brlcad/branches/cmake/src/librt/primitives/nmg/nmg_mk.c 2010-10-15
21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/src/librt/primitives/nmg/nmg_mk.c 2010-10-15
21:21:50 UTC (rev 41009)
@@ -2876,8 +2876,13 @@
eusrc->radial_p->radial_p = eusrc_mate->radial_p;
eusrc_mate->radial_p->radial_p = eusrc->radial_p;
} else {
- /* this is the only use of the eusrc edge. Kill edge. */
- FREE_EDGE(e);
+ /* this is the only use of the eusrc edge. kill/free edge but not
+ * here. the edge should be freed by the calling function which can
+ * determine this edge should be freed by its edgeuse pointer
+ * pointing to itself and the magic number set to zero.
+ */
+ e->eu_p = (struct edgeuse *)e;
+ e->magic = 0;
}
eusrc->radial_p = eudst;
Modified: brlcad/branches/cmake/src/rt/view.c
===================================================================
--- brlcad/branches/cmake/src/rt/view.c 2010-10-15 21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/src/rt/view.c 2010-10-15 21:21:50 UTC (rev 41009)
@@ -572,7 +572,10 @@
}
}
- if (scanline) free_scanlines(height, scanline);
+ if (scanline) {
+ free_scanlines(height, scanline);
+ scanline = NULL;
+ }
}
Modified: brlcad/branches/cmake/src/tclscripts/archer/Archer.tcl
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/Archer.tcl 2010-10-15
21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/src/tclscripts/archer/Archer.tcl 2010-10-15
21:21:50 UTC (rev 41009)
@@ -36,11 +36,9 @@
set methodImpls ""
set extraMgedCommands ""
set corePluginInit ""
- set pluginsdir [file join $env(ARCHER_HOME) plugins archer]
+
+ set pluginsdir [file join [bu_brlcad_data "plugins"] archer]
if {![file exists $pluginsdir]} {
- set pluginsdir [file join [bu_brlcad_data "plugins"] archer]
- }
- if {![file exists $pluginsdir]} {
set pluginsdir [file join [bu_brlcad_data "src"] archer plugins]
}
@@ -9242,7 +9240,7 @@
}
::itcl::body Archer::global_undo_callback {_gname} {
- gedCmd refresh
+ gedCmd refresh_all
}
::itcl::body Archer::ledger_cleanup {} {
Modified: brlcad/branches/cmake/src/tclscripts/archer/ArcherCore.tcl
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/ArcherCore.tcl 2010-10-15
21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/src/tclscripts/archer/ArcherCore.tcl 2010-10-15
21:21:50 UTC (rev 41009)
@@ -23,16 +23,6 @@
# This is a BRL-CAD Application Core mega-widget.
#
-if {![info exists env(ARCHER_HOME)]} {
- if {[info exists argv0]} {
- if [catch { set env(ARCHER_HOME) [file normalize [file join [file dir
$argv0] ..]] }] {
- set env(ARCHER_HOME) .
- }
- } else {
- set env(ARCHER_HOME) .
- }
-}
-
LoadArcherCoreLibs
package provide ArcherCore 1.0
Modified: brlcad/branches/cmake/src/tclscripts/archer/DataUtils.tcl
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/DataUtils.tcl 2010-10-15
21:13:38 UTC (rev 41008)
+++ brlcad/branches/cmake/src/tclscripts/archer/DataUtils.tcl 2010-10-15
21:21:50 UTC (rev 41009)
@@ -29,21 +29,63 @@
destructor {}
public {
+ proc appendGlobalData {_ged _archer _group
+ _attr_name _data_cmd _data_subcmd
+ _data _index_begin _index_end}
proc dataPick {_ged _archer _group
_pdata _data_arrows_name _sdata_arrows_name
_data_axes_name _sdata_axes_name
_data_labels_name _sdata_labels_name
_data_lines_name _sdata_lines_name}
+ proc updateData {_ged _archer _group
+ _attr_name _data_cmd _data_subcmd}
+ proc updateGlobalData {_ged _archer _group _attr_name _data_cmd
_data_subcmd}
}
}
################################### Public Section
###################################
+::itcl::body DataUtils::appendGlobalData {_ged _archer _group
+ _attr_name _data_cmd _data_subcmd
+ _data _index_begin _index_end} {
+ if {$_group == ""} {
+ $_archer putString "Please select a group before creating $_attr_name."
+ return
+ }
+
+ if {[catch {$_ged attr get _GLOBAL $_attr_name} dataList]} {
+ set dataList {}
+ }
+
+ set i [lsearch -index 0 $dataList $_group]
+
+ if {$i != -1} {
+ set subDataList [lindex $dataList $i]
+ eval lappend subDataList $_data
+ set dataList [lreplace $dataList $i $i $subDataList]
+ } else {
+ lappend dataList [eval list $_group $_data]
+ set subDataList [lindex $dataList end]
+ }
+
+ set dataList [lsort -index 0 -dictionary $dataList]
+ $_archer attr set _GLOBAL $_attr_name $dataList
+
+ $_ged refresh_off
+ set plist {}
+ foreach item [lrange $subDataList 1 end] {
+ lappend plist [lrange $item $_index_begin $_index_end]
+ }
+ catch {$_ged $_data_cmd $_data_subcmd $plist} msg
+ $_ged refresh_on
+ $_ged refresh_all
+}
+
::itcl::body DataUtils::dataPick {_ged _archer _group
- _pdata _data_arrows_name _sdata_arrows_name
- _data_axes_name _sdata_axes_name
- _data_labels_name _sdata_labels_name
- _data_lines_name _sdata_lines_name} {
+ _pdata _data_arrows_name _sdata_arrows_name
+ _data_axes_name _sdata_axes_name
+ _data_labels_name _sdata_labels_name
+ _data_lines_name _sdata_lines_name} {
if {$_pdata == ""} {
return
@@ -447,6 +489,43 @@
}
}
+::itcl::body DataUtils::updateData {_ged _archer _group
+ _attr_name _data_cmd _data_subcmd} {
+ if {[catch {$_ged attr get _GLOBAL $_attr_name} dal]} {
+ set dal {}
+ }
+
+ set i [lsearch -index 0 $dal $_group]
+ if {$i != -1} {
+ set da [lindex $dal $i]
+ } else {
+ set da {}
+ }
+
+ $_ged refresh_off
+ $_ged $_data_cmd $_data_subcmd [lrange $da 1 end]
+ $_ged refresh_on
+}
+
+::itcl::body DataUtils::updateGlobalData {_ged _archer _group _attr_name
_data_cmd _data_subcmd} {
+ if {[catch {$_ged attr get _GLOBAL $_attr_name} gdl]} {
+ set gdl {}
+ }
+
+ # Get the list for the current group
+ set i [lsearch -index 0 $gdl $_group]
+ if {$i == -1} {
+ # This should never happen
+ return
+ }
+
+ set data [$_ged $_data_cmd $_data_subcmd]
+ set gdl [lreplace $gdl $i $i [eval list $_group $data]]
+ $_ged refresh_off
+ catch {$_archer attr set _GLOBAL $_attr_name $gdl}
+ $_ged refresh_on
+}
+
################################### End Public Section
###################################
Modified: brlcad/branches/cmake/src/tclscripts/mged/text.tcl
===================================================================
--- brlcad/branches/cmake/src/tclscripts/mged/text.tcl 2010-10-15 21:13:38 UTC
(rev 41008)
+++ brlcad/branches/cmake/src/tclscripts/mged/text.tcl 2010-10-15 21:21:50 UTC
(rev 41009)
@@ -292,7 +292,7 @@
# hack to hide the standard tcl gets implementation so we can wrap it.
-if {[catch {info body gets}] == 1} {
+if {[catch {info body gets}] == 1 && [catch {info body tcl_gets}] == 1} {
rename gets tcl_gets
}
@@ -315,6 +315,7 @@
# the line that was input. total hack. total fugly hack.
proc execute_cmd_save {} {}
+ rename execute_cmd_save ""
rename execute_cmd execute_cmd_save
rename gets_execute_cmd execute_cmd
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
