Revision: 77015
http://sourceforge.net/p/brlcad/code/77015
Author: starseeker
Date: 2020-09-01 14:44:36 +0000 (Tue, 01 Sep 2020)
Log Message:
-----------
Merge from trunk: r76980 through r76991
Modified Paths:
--------------
brlcad/branches/RELEASE/NEWS
brlcad/branches/RELEASE/TODO
brlcad/branches/RELEASE/doc/docbook/system/man1/pix-bw.xml
brlcad/branches/RELEASE/src/qged/TODO.qt
brlcad/branches/RELEASE/src/util/pix-bw.c
Property Changed:
----------------
brlcad/branches/RELEASE/
brlcad/branches/RELEASE/NEWS
brlcad/branches/RELEASE/doc/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-09-01 13:49:46 UTC (rev 77014)
+++ brlcad/branches/RELEASE 2020-09-01 14:44:36 UTC (rev 77015)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76768,76771-76954,76963-76967,76975-76979
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76768,76771-76954,76963-76967,76975-76991
\ No newline at end of property
Modified: brlcad/branches/RELEASE/NEWS
===================================================================
--- brlcad/branches/RELEASE/NEWS 2020-09-01 13:49:46 UTC (rev 77014)
+++ brlcad/branches/RELEASE/NEWS 2020-09-01 14:44:36 UTC (rev 77015)
@@ -13,6 +13,8 @@
--- 2020-08-XX Release 7.32.X ---
----------------------------------------------------------------------
+* improved rtweight density value warnings - Sean Morrison, Cliff Yapp
+* added perception-based hdtv and hdr modes for pix-bw - Sean Morrison
* fixed semi-transparent DM and FB windows on Linux - Cliff Yapp
* improved rtweight manual page - Sean Morrison
* added line reporting TCP listening port to remrt output - Cliff Yapp
Property changes on: brlcad/branches/RELEASE/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/prep-cache/NEWS:68236-68933
/brlcad/branches/tcltk86/NEWS:68300-75257
/brlcad/trunk:68170-68252
-/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74373,74376-75141,75375,75377-75378,75565-75566,75811,76645-76654,76748-76764,76862-76954
\ No newline at end of property
+/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74373,74376-75141,75375,75377-75378,75565-75566,75811,76645-76654,76748-76764,76862-76954,76980-76991
\ No newline at end of property
Modified: brlcad/branches/RELEASE/TODO
===================================================================
--- brlcad/branches/RELEASE/TODO 2020-09-01 13:49:46 UTC (rev 77014)
+++ brlcad/branches/RELEASE/TODO 2020-09-01 14:44:36 UTC (rev 77015)
@@ -1153,9 +1153,6 @@
http://support.echoview.com/WebHelp/Reference/File_formats/
Export_file_formats/Volume_data_set_file_formats.htm
-* turn geometry converters and image converters into libraries
- (started as libraries libgcv and libicv)
-
* add support for querying geometry properties to library including
computing surface area and weight/mass.
Index: brlcad/branches/RELEASE/doc
===================================================================
--- brlcad/branches/RELEASE/doc 2020-09-01 13:49:46 UTC (rev 77014)
+++ brlcad/branches/RELEASE/doc 2020-09-01 14:44:36 UTC (rev 77015)
Property changes on: brlcad/branches/RELEASE/doc
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg/doc:62110-62113
/brlcad/branches/prep-cache/doc:68236-68933
/brlcad/branches/tcltk86/doc:68300-75257
-/brlcad/trunk/doc:76645-76726,76795-76858,76862-76954
\ No newline at end of property
+/brlcad/trunk/doc:76645-76726,76795-76858,76862-76954,76980-76991
\ No newline at end of property
Modified: brlcad/branches/RELEASE/doc/docbook/system/man1/pix-bw.xml
===================================================================
--- brlcad/branches/RELEASE/doc/docbook/system/man1/pix-bw.xml 2020-09-01
13:49:46 UTC (rev 77014)
+++ brlcad/branches/RELEASE/doc/docbook/system/man1/pix-bw.xml 2020-09-01
14:44:36 UTC (rev 77015)
@@ -21,7 +21,7 @@
<arg choice='opt'>-w <replaceable>width</replaceable></arg>
<arg choice='opt'>-n <replaceable>height</replaceable></arg>
<arg choice='opt'>
- <arg choice='opt'>-e <replaceable>ntsc|crt</replaceable></arg>
+ <arg choice='opt'>-e <replaceable>ntsc|crt|hdtv|hdr|avg</replaceable></arg>
<arg choice='opt'>
<arg choice='opt'><arg choice='plain'>-R
</arg><replaceable>r_weight</replaceable></arg>
<arg choice='opt'><arg choice='plain'>-G
</arg><replaceable>g_weight</replaceable></arg>
@@ -64,17 +64,41 @@
<varlistentry>
<term><emphasis remap='B'>ntsc</emphasis></term>
<listitem>
-<para> weighting used is based on the NTSC primaries and the
-D6500 alignment white.</para>
+<para>Weighting used is based on the NTSC primaries and white
+alignment. Conforming with Rec.ITU-R BT.601-7, this uses
+0.299/0.587/0.114 RGB weights. This gives a simplified linear
+conversion of perceived luminance that reflects human physiological
+sensitivity to green and least to blue.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis remap='B'>crt</emphasis></term>
<listitem>
-<para>weighting scheme used will be for "typical" CRT phosphor chromaticities
-and the D6500 white.</para>
+<para>Weighting scheme matches "historic" CRT phosphor chromaticities
+and a D6500 white alignment. Uses 0.26/0.66/0.08 RGB weights.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><emphasis remap='B'>hdtv</emphasis></term>
+ <listitem>
+<para>Weighting scheme matches "modern" HDTV display chromacities.
+Uses 0.2126/0.7152/0.0722 RGB weights per Rec.ITU-R BT.709</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><emphasis remap='B'>hdr</emphasis></term>
+ <listitem>
+<para>Weighting scheme matches high dynamic range (HDR) chromacities.
+Uses 0.2627/0.6780/0.0593 RGB weights per Rec.ITU-R BT.2020</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><emphasis remap='B'>avg</emphasis></term>
+ <listitem>
+<para>Weighting scheme simply takes the average of all three values
+(i.e., R + G + B / 3.0).</para>
+ </listitem>
+ </varlistentry>
</variablelist>
<para>
Individual color plane(s) can be selected via the
@@ -96,15 +120,10 @@
<para>will equally blend the red and blue color planes; because -G is omitted,
the green color plane is not considered.
(Had "-G0.0" been included in this example, the three colors would have been
weighted equally, as in the default condition.)</para>
-<para>pix-bw -R0.30 -G0.59 -B0.11 < <emphasis remap='I'>file.pix</emphasis>
> <emphasis remap='I'>file.bw</emphasis></para>
+<para>pix-bw -R0.3 -G0.6 -B0.1 < <emphasis remap='I'>file.pix</emphasis>
> <emphasis remap='I'>file.bw</emphasis></para>
<para>
-has the same effect as the
-<option>-ntsc</option>
-flag.
-<!-- .br -->
-[The
-<option>-crt</option>
-weights are: 0.26, 0.66, 0.08]</para>
+applies weights close to the <option>-ntsc</option> flag.
+</para>
</refsect1>
<refsect1 xml:id='see_also'><title>SEE ALSO</title>
Modified: brlcad/branches/RELEASE/src/qged/TODO.qt
===================================================================
--- brlcad/branches/RELEASE/src/qged/TODO.qt 2020-09-01 13:49:46 UTC (rev
77014)
+++ brlcad/branches/RELEASE/src/qged/TODO.qt 2020-09-01 14:44:36 UTC (rev
77015)
@@ -31,3 +31,10 @@
Node editor:
https://github.com/paceholder/nodeeditor
+
+
+Might be able to make a decent CAD console widget out of these:
+https://github.com/neovim/libvterm
+https://github.com/jsbronder/sff
+https://github.com/ohwgiles/quilte
+
Modified: brlcad/branches/RELEASE/src/util/pix-bw.c
===================================================================
--- brlcad/branches/RELEASE/src/util/pix-bw.c 2020-09-01 13:49:46 UTC (rev
77014)
+++ brlcad/branches/RELEASE/src/util/pix-bw.c 2020-09-01 14:44:36 UTC (rev
77015)
@@ -21,12 +21,6 @@
*
* Converts a RGB pix file into an 8-bit BW file.
*
- * By default it will weight the RGB values evenly.
- * -ntsc will use weights for NTSC standard primaries and
- * NTSC alignment white.
- * -crt will use weights for "typical" color CRT phosphors and
- * a D6500 alignment white.
- *
*/
#include "common.h"
@@ -63,7 +57,7 @@
static const char usage[] = "\
Usage: pix-bw [-s squaresize] [-w width] [-n height]\n\
- [ [-e ntsc|crt] [[-R red_weight] [-G green_weight] [-B
blue_weight]] ]\n\
+ [ [-e ntsc|crt|hdtv|hdr|avg] [[-R red_weight] [-G green_weight]
[-B blue_weight]] ]\n\
[-o out_file.bw] [[<] file.pix] [> out_file.bw]\n";
int
@@ -75,16 +69,31 @@
while ((c = bu_getopt(argc, argv, "e:s:w:n:R:G:B:o:h?")) != -1) {
switch (c) {
case 'e' :
- if (BU_STR_EQUAL(bu_optarg, "ntsc")) {
- rweight = 0.30;
- gweight = 0.59;
- bweight = 0.11;
+ if (BU_STR_EQUAL(bu_optarg, "avg")) {
+ rweight = 0.0;
+ gweight = 0.0;
+ bweight = 0.0;
}
+ else if (BU_STR_EQUAL(bu_optarg, "ntsc")) {
+ rweight = 0.299;
+ gweight = 0.587;
+ bweight = 0.114;
+ }
else if (BU_STR_EQUAL(bu_optarg, "crt")) {
rweight = 0.26;
gweight = 0.66;
bweight = 0.08;
}
+ else if (BU_STR_EQUAL(bu_optarg, "hdtv")) {
+ rweight = 0.2126;
+ gweight = 0.7152;
+ bweight = 0.0722;
+ }
+ else if (BU_STR_EQUAL(bu_optarg, "hdr")) {
+ rweight = 0.2627;
+ gweight = 0.6780;
+ bweight = 0.0593;
+ }
else {
fprintf(stderr,"pix-bw: invalid -e argument\n");
return 0;
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
