Revision: 76143
http://sourceforge.net/p/brlcad/code/76143
Author: starseeker
Date: 2020-06-15 17:14:36 +0000 (Mon, 15 Jun 2020)
Log Message:
-----------
Merge changes from trunk - r76137 through r76142.
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/INSTALL
brlcad/branches/dm-fb-merge/NEWS
brlcad/branches/dm-fb-merge/include/dm.h
brlcad/branches/dm-fb-merge/src/libdm/scale.c
brlcad/branches/dm-fb-merge/src/libfft/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libtclcad/dm_obj.c
brlcad/branches/dm-fb-merge/src/libtclcad/tclcad_obj.c
brlcad/branches/dm-fb-merge/src/tclscripts/lib/Display.tcl
Property Changed:
----------------
brlcad/branches/dm-fb-merge/
brlcad/branches/dm-fb-merge/NEWS
brlcad/branches/dm-fb-merge/include/
Index: brlcad/branches/dm-fb-merge
===================================================================
--- brlcad/branches/dm-fb-merge 2020-06-15 17:06:25 UTC (rev 76142)
+++ brlcad/branches/dm-fb-merge 2020-06-15 17:14:36 UTC (rev 76143)
Property changes on: brlcad/branches/dm-fb-merge
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75440-76137
\ No newline at end of property
+/brlcad/trunk:75440-76142
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/INSTALL
===================================================================
--- brlcad/branches/dm-fb-merge/INSTALL 2020-06-15 17:06:25 UTC (rev 76142)
+++ brlcad/branches/dm-fb-merge/INSTALL 2020-06-15 17:14:36 UTC (rev 76143)
@@ -53,7 +53,7 @@
For the impatient or simplistic, the following steps should compile,
test, and install an optimized BRL-CAD quickly into the
-/usr/brlcad/rel-VERSION directory if CMake is alrady installed:
+/usr/brlcad/rel-VERSION directory if CMake is already installed:
tar -zxvf brlcad-VERSION.tar
mkdir brlcad-VERSION/build
Modified: brlcad/branches/dm-fb-merge/NEWS
===================================================================
--- brlcad/branches/dm-fb-merge/NEWS 2020-06-15 17:06:25 UTC (rev 76142)
+++ brlcad/branches/dm-fb-merge/NEWS 2020-06-15 17:14:36 UTC (rev 76143)
@@ -13,6 +13,7 @@
--- 20XX-XX-XX Release 7.3X.X ---
----------------------------------------------------------------------
+* added units label to the Archer in-scene scale graphic - Cliff Yapp
* improved output path sorting of search command - Cliff Yapp
* added 3dm-g failure message about supported versions - Cliff Yapp
* fixed bw-png writing corrupted png files on Windows - Sean Morrison
Property changes on: brlcad/branches/dm-fb-merge/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg/NEWS:62110-62113
/brlcad/branches/prep-cache/NEWS:68236-68933
/brlcad/branches/tcltk86/NEWS:68300-75257
-/brlcad/trunk/NEWS:75512-75597,75630-75814,75935-75987
\ No newline at end of property
+/brlcad/trunk/NEWS:75512-75597,75630-75814,75935-75987,76138-76142
\ No newline at end of property
Index: brlcad/branches/dm-fb-merge/include
===================================================================
--- brlcad/branches/dm-fb-merge/include 2020-06-15 17:06:25 UTC (rev 76142)
+++ brlcad/branches/dm-fb-merge/include 2020-06-15 17:14:36 UTC (rev 76143)
Property changes on: brlcad/branches/dm-fb-merge/include
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg/include:62110-62113
/brlcad/branches/prep-cache/include:68236-68933
/brlcad/branches/tcltk86/include:68300-75257
-/brlcad/trunk/include:75463-75467,75630-75814,75880-76137
\ No newline at end of property
+/brlcad/trunk/include:75463-75467,75630-75814,75880-76142
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/include/dm.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm.h 2020-06-15 17:06:25 UTC (rev
76142)
+++ brlcad/branches/dm-fb-merge/include/dm.h 2020-06-15 17:14:36 UTC (rev
76143)
@@ -156,6 +156,7 @@
/* scale.c */
DM_EXPORT extern void dm_draw_scale(struct dm *dmp,
fastf_t viewSize,
+ const char *unit,
int *lineColor,
int *textColor);
Modified: brlcad/branches/dm-fb-merge/src/libdm/scale.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/scale.c 2020-06-15 17:06:25 UTC
(rev 76142)
+++ brlcad/branches/dm-fb-merge/src/libdm/scale.c 2020-06-15 17:14:36 UTC
(rev 76143)
@@ -38,6 +38,7 @@
void
dm_draw_scale(struct dm *dmp,
fastf_t viewSize,
+ const char *unit,
int *lineColor,
int *textColor)
{
@@ -53,6 +54,9 @@
dm_set_line_attr(dmp, dmp->i->dm_lineWidth, 0); /* solid lines */
bu_vls_printf(&vls, "%g", viewSize*0.5);
+ if (unit) {
+ bu_vls_printf(&vls, "%s", unit);
+ }
soffset = (int)(strlen(bu_vls_addr(&vls)) * 0.5);
xpos1 = -0.5;
Modified: brlcad/branches/dm-fb-merge/src/libfft/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libfft/CMakeLists.txt 2020-06-15
17:06:25 UTC (rev 76142)
+++ brlcad/branches/dm-fb-merge/src/libfft/CMakeLists.txt 2020-06-15
17:14:36 UTC (rev 76143)
@@ -10,11 +10,13 @@
BRLCAD_LIB_INCLUDE_DIRS(fft FFT_INCLUDE_DIRS FFT_LOCAL_INCLUDE_DIRS)
add_executable(fftc fftc.c splitditc.c)
+set_property(TARGET fftc APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
SetTargetFolder(fftc "Compilation Utilities")
target_link_libraries(fftc ${M_LIBRARY})
CMAKEFILES(fftc.c splitditc.c)
add_executable(ifftc ifftc.c ditsplitc.c)
+set_property(TARGET ifftc APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
SetTargetFolder(ifftc "Compilation Utilities")
target_link_libraries(ifftc ${M_LIBRARY})
CMAKEFILES(ifftc.c ditsplitc.c)
@@ -57,6 +59,7 @@
set_target_properties(libfft PROPERTIES VERSION 20.0.1 SOVERSION 20)
add_executable(fftest fftest.c)
+set_property(TARGET fftest APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
SetTargetFolder(fftest "Compilation Utilities")
target_link_libraries(fftest libfft ${M_LIBRARY})
CMAKEFILES(fftest.c)
Modified: brlcad/branches/dm-fb-merge/src/libtclcad/dm_obj.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libtclcad/dm_obj.c 2020-06-15 17:06:25 UTC
(rev 76142)
+++ brlcad/branches/dm-fb-merge/src/libtclcad/dm_obj.c 2020-06-15 17:14:36 UTC
(rev 76143)
@@ -1147,7 +1147,7 @@
* Draw a scale.
*
* Usage:
- * drawScale vsize color
+ * drawScale vsize unit color
*
*/
int
@@ -1155,12 +1155,13 @@
int argc,
const char **argv)
{
+ const char *unit;
int color[3];
double scan;
fastf_t viewSize;
struct bu_vls vls = BU_VLS_INIT_ZERO;
- if (argc != 3) {
+ if (argc != 4) {
bu_vls_printf(&vls, "helplib_alias dm_drawScale %s", argv[0]);
Tcl_Eval(dmop->interp, bu_vls_addr(&vls));
bu_vls_free(&vls);
@@ -1177,7 +1178,10 @@
/* convert double to fastf_t */
viewSize = scan;
- if (sscanf(argv[2], "%d %d %d",
+
+ unit = argv[2];
+
+ if (sscanf(argv[3], "%d %d %d",
&color[0],
&color[1],
&color[2]) != 3) {
@@ -1201,7 +1205,7 @@
return BRLCAD_ERROR;
}
- dm_draw_scale(dmop->dmo_dmp, viewSize, color, color);
+ dm_draw_scale(dmop->dmo_dmp, viewSize, unit, color, color);
return BRLCAD_OK;
}
@@ -1209,7 +1213,7 @@
/*
* Usage:
- * objname drawScale vsize color
+ * objname drawScale vsize unit color
*/
HIDDEN int
dmo_drawScale_tcl(void *clientData, int argc, const char **argv)
Modified: brlcad/branches/dm-fb-merge/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libtclcad/tclcad_obj.c 2020-06-15
17:06:25 UTC (rev 76142)
+++ brlcad/branches/dm-fb-merge/src/libtclcad/tclcad_obj.c 2020-06-15
17:14:36 UTC (rev 76143)
@@ -15625,6 +15625,7 @@
if (gdvp->gdv_view->gv_view_scale.gos_draw)
dm_draw_scale(gdvp->gdv_dmp,
gdvp->gdv_view->gv_size*gop->go_gedp->ged_wdbp->dbip->dbi_base2local,
+
bu_units_string(1/gop->go_gedp->ged_wdbp->dbip->dbi_base2local),
gdvp->gdv_view->gv_view_scale.gos_line_color,
gdvp->gdv_view->gv_view_params.gos_text_color);
Modified: brlcad/branches/dm-fb-merge/src/tclscripts/lib/Display.tcl
===================================================================
--- brlcad/branches/dm-fb-merge/src/tclscripts/lib/Display.tcl 2020-06-15
17:06:25 UTC (rev 76142)
+++ brlcad/branches/dm-fb-merge/src/tclscripts/lib/Display.tcl 2020-06-15
17:14:36 UTC (rev 76143)
@@ -750,7 +750,7 @@
}
if {$itk_option(-scaleEnable)} {
- Dm::drawScale [View::size] $itk_option(-scaleColor)
+ Dm::drawScale [View::size] [View::units] $itk_option(-scaleColor)
}
if {$itk_option(-primitiveLabels) != {}} {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
