UV photos - Wish from LarsHP Increased green (tint) value from 10 to 100 (#7043)
* Change limits green to 40 instead of 10 * Publish uvgreen in pre-dev appimage.yml windows.yml * Change range setLogScale * Revert change to observer 2 - format * Set maxgreen 60 * Set maxgreen 100 and minequal 0.5 maxequal 1.8 * Set maxgreen 1000 minequal 0.4 maxequal 2.5 * Set maxgreen 100 minequal 0.5 maxequal 2
This commit is contained in:
parent
46531c7eca
commit
30cf3f721f
4
.github/workflows/appimage.yml
vendored
4
.github/workflows/appimage.yml
vendored
@ -15,8 +15,8 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
publish_pre_dev_labels: '[]'
|
publish_pre_dev_labels: '[]'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
|
1
.github/workflows/windows.yml
vendored
1
.github/workflows/windows.yml
vendored
@ -17,6 +17,7 @@ on:
|
|||||||
env:
|
env:
|
||||||
publish_pre_dev_labels: '[]'
|
publish_pre_dev_labels: '[]'
|
||||||
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
|
|
||||||
namespace rtengine
|
namespace rtengine
|
||||||
{
|
{
|
||||||
|
|
||||||
static const color_match_type cie_colour_match_jd2 = {//350nm to 830nm 5 nm J.Desmis 2° Standard Observer.
|
static const color_match_type cie_colour_match_jd2 = {//350nm to 830nm 5 nm J.Desmis 2° Standard Observer.
|
||||||
{0.0000000, 0.000000, 0.000000}, {0.0000000, 0.000000, 0.000000}, {0.0001299, 0.0003917, 0.0006061},
|
{0.0000000, 0.000000, 0.000000}, {0.0000000, 0.000000, 0.000000}, {0.0001299, 0.0003917, 0.0006061},
|
||||||
{0.0002321, 0.000006965, 0.001086}, {0.0004149, 0.00001239, 0.001946}, {0.0007416, 0.00002202, 0.003846},
|
{0.0002321, 0.000006965, 0.001086}, {0.0004149, 0.00001239, 0.001946}, {0.0007416, 0.00002202, 0.003846},
|
||||||
|
@ -31,9 +31,9 @@ using color_match_type = double [97][3];
|
|||||||
constexpr double MINTEMP = 1500.0;
|
constexpr double MINTEMP = 1500.0;
|
||||||
constexpr double MAXTEMP = 60000.0;
|
constexpr double MAXTEMP = 60000.0;
|
||||||
constexpr double MINGREEN = 0.02;
|
constexpr double MINGREEN = 0.02;
|
||||||
constexpr double MAXGREEN = 10.0;
|
constexpr double MAXGREEN = 100.0;
|
||||||
constexpr double MINEQUAL = 0.8;
|
constexpr double MINEQUAL = 0.5;
|
||||||
constexpr double MAXEQUAL = 1.5;
|
constexpr double MAXEQUAL = 2.;
|
||||||
constexpr double INITIALBLACKBODY = 4000.0;
|
constexpr double INITIALBLACKBODY = 4000.0;
|
||||||
|
|
||||||
enum class StandardObserver {
|
enum class StandardObserver {
|
||||||
|
@ -31,9 +31,9 @@
|
|||||||
#define MAXTEMP 60000 //12000
|
#define MAXTEMP 60000 //12000
|
||||||
#define CENTERTEMP 4750
|
#define CENTERTEMP 4750
|
||||||
#define MINGREEN 0.02
|
#define MINGREEN 0.02
|
||||||
#define MAXGREEN 10.0
|
#define MAXGREEN 100.0
|
||||||
#define MINEQUAL 0.8
|
#define MINEQUAL 0.5
|
||||||
#define MAXEQUAL 1.5
|
#define MAXEQUAL 2.
|
||||||
|
|
||||||
using namespace rtengine;
|
using namespace rtengine;
|
||||||
using namespace rtengine::procparams;
|
using namespace rtengine::procparams;
|
||||||
@ -396,7 +396,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, TOOL_NAME, M("TP_WBALANC
|
|||||||
pack_start(*StudLabel);
|
pack_start(*StudLabel);
|
||||||
pack_start(*PatchLabel);
|
pack_start(*PatchLabel);
|
||||||
pack_start(*PatchlevelLabel);
|
pack_start(*PatchlevelLabel);
|
||||||
|
green->setLogScale(MAXGREEN / MINGREEN, MINGREEN);
|
||||||
pack_start (*temp);
|
pack_start (*temp);
|
||||||
//pack_start (*boxgreen);
|
//pack_start (*boxgreen);
|
||||||
pack_start (*green);
|
pack_start (*green);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user