Skip to content

Commit

Permalink
Updates for 3.4.6.1beta
Browse files Browse the repository at this point in the history 
LG tone curves for 2016,2017 models as color checker sequences
D3 LG OLED ccss curve
  • Loading branch information
zoyd000 committed Dec 8, 2017
1 parent fa3655f commit d10be72
Show file tree
Hide file tree
Showing 22 changed files with 541 additions and 173 deletions.
2 changes: 1 addition & 1 deletion CHCFR21_DEUTSCH.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2588,7 +2588,7 @@ END

STRINGTABLE
BEGIN
IDR_MAINFRAME "HCFR Colorimeter - 3,4,6"
IDR_MAINFRAME "HCFR Colorimeter - 3,4,6,1"
IDR_MESURETYPE "\nFarbmessungen\nFarbmessungen\nColorHCFR Datei (*.chc)\n.chc\nCOLORHCFR\nHCFR Farbmessungen"
END

Expand Down
79 changes: 44 additions & 35 deletions CHCFR21_ENGLISH.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ BEGIN
PUSHBUTTON "Help",IDHELP,140,154,49,14,WS_GROUP
END

IDD_REFERENCE_PROP_PAGE DIALOGEX 0, 0, 236, 294
IDD_REFERENCE_PROP_PAGE DIALOGEX 0, 0, 236, 330
STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "References"
FONT 8, "MS Sans Serif", 0, 0, 0x1
Expand All @@ -246,29 +246,29 @@ BEGIN
CONTROL "Display Gamma (black compensation)",IDC_GAMMA_OFFSET_RADIO2,
"Button",BS_AUTORADIOBUTTON,12,101,131,10
CONTROL "Camera Gamma (Standard Offset)",IDC_GAMMA_OFFSET_RADIO3,
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,156,84,54,8
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,18,316,54,8
CONTROL "Camera Gamma, Manual Offset :",IDC_GAMMA_OFFSET_RADIO4,
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,108,84,117,10,WS_EX_TRANSPARENT
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,18,316,117,10,WS_EX_TRANSPARENT
CONTROL "ITU-R BT.1886",IDC_GAMMA_OFFSET_RADIO5,"Button",BS_AUTORADIOBUTTON,12,118,60,10,WS_EX_TRANSPARENT
CONTROL "SMPTE 2084 HDR",IDC_GAMMA_OFFSET_RADIO8,"Button",BS_AUTORADIOBUTTON,12,155,72,10,WS_EX_TRANSPARENT
CONTROL "SMPTE 2084 HDR",IDC_GAMMA_OFFSET_RADIO8,"Button",BS_AUTORADIOBUTTON,12,217,72,10,WS_EX_TRANSPARENT
CONTROL "L*",IDC_GAMMA_OFFSET_RADIO7,"Button",BS_AUTORADIOBUTTON,12,131,23,10,WS_EX_TRANSPARENT
CONTROL "BBC Hybrid Log-Gamma",IDC_GAMMA_OFFSET_RADIO6,"Button",BS_AUTORADIOBUTTON,12,144,90,10,WS_EX_TRANSPARENT
CONTROL "Dolby Vision 500 nits",IDC_GAMMA_OFFSET_RADIO9,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,132,90,90,10,WS_EX_TRANSPARENT
CONTROL "Dolby Vision 400 nits",IDC_GAMMA_OFFSET_RADIO10,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,138,90,90,10,WS_EX_TRANSPARENT
CONTROL "BBC Hybrid Log-Gamma",IDC_GAMMA_OFFSET_RADIO6,"Button",BS_AUTORADIOBUTTON,12,206,90,10,WS_EX_TRANSPARENT
CONTROL "Dolby Vision 500 nits",IDC_GAMMA_OFFSET_RADIO9,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,24,316,90,10,WS_EX_TRANSPARENT
CONTROL "Dolby Vision 400 nits",IDC_GAMMA_OFFSET_RADIO10,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,30,316,90,10,WS_EX_TRANSPARENT
GROUPBOX "Color Space",IDC_STATIC,7,3,198,75,WS_GROUP
LTEXT "Standard:",IDC_STATIC,9,19,32,8
COMBOBOX IDC_COLORREF_COMBO,41,18,109,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
CONTROL "Change White",IDC_CHANGEWHITE_CHECK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,23,34,59,10
COMBOBOX IDC_WHITETARGET_COMBO,87,34,60,84,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_GROUP | WS_TABSTOP
GROUPBOX "Gamma calculation",IDC_STATIC,5,77,223,127,WS_GROUP
EDITTEXT IDC_EDIT_MANUAL_GOFFSET,156,90,21,12,ES_AUTOHSCROLL | NOT WS_VISIBLE | WS_DISABLED | WS_GROUP
GROUPBOX "Power Law Gamma",IDC_STATIC,27,210,84,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_REF,54,221,20,14,ES_AUTOHSCROLL | WS_GROUP
GROUPBOX "Color Checker Patterns",IDC_STATIC,14,248,198,30,WS_GROUP
COMBOBOX IDC_CCMODE_COMBO,22,261,127,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
GROUPBOX "Target Gamma in use",IDC_STATIC,117,211,84,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_AVERAGE,144,221,21,14,ES_AUTOHSCROLL | WS_GROUP
CONTROL "Use measured gamma",IDC_USE_MEASURED_GAMMA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,153,256,60,23
GROUPBOX "Gamma calculation (SDR)",IDC_STATIC,5,78,223,115,BS_CENTER | WS_GROUP
EDITTEXT IDC_EDIT_MANUAL_GOFFSET,60,316,21,12,ES_AUTOHSCROLL | NOT WS_VISIBLE | WS_DISABLED | WS_GROUP
GROUPBOX "Power Law Gamma",IDC_STATIC,30,152,78,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_REF,57,163,20,14,ES_AUTOHSCROLL | WS_GROUP
GROUPBOX "Color Checker Patterns",IDC_STATIC,44,279,134,27,WS_GROUP
COMBOBOX IDC_CCMODE_COMBO,46,290,127,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
GROUPBOX "Target Gamma in use",IDC_STATIC,123,152,75,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_AVERAGE,144,162,21,14,ES_AUTOHSCROLL | WS_GROUP
CONTROL "Use avg measured gamma",IDC_USE_MEASURED_GAMMA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,162,119,60,25
EDITTEXT IDC_WHITE_X,163,21,36,14,ES_AUTOHSCROLL
EDITTEXT IDC_WHITE_Y,163,36,36,14,ES_AUTOHSCROLL
CTEXT "White",IDC_STATIC,167,11,26,10
Expand All @@ -292,22 +292,23 @@ BEGIN
LTEXT "y",IDC_STATIC,53,52,8,8
EDITTEXT IDC_EDIT_SPLIT,74,129,18,12,ES_AUTOHSCROLL | WS_GROUP
LTEXT "% input offset",IDC_STATIC,96,131,46,8
EDITTEXT IDC_EDIT_MANUAL_BLACK,156,113,23,12,ES_AUTOHSCROLL | WS_GROUP
EDITTEXT IDC_EDIT_MANUAL_BLACK,156,106,23,12,ES_AUTOHSCROLL | WS_GROUP
LTEXT "Red",IDC_STATIC,35,51,17,8
LTEXT "cd/m^2",IDC_STATIC,184,115,28,8,NOT WS_GROUP
CONTROL "Override black",IDC_USER_BLACK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,162,100,57,13
EDITTEXT IDC_EDIT_DIFFUSE_WHITE,17,185,27,14,ES_AUTOHSCROLL
LTEXT "Master MinL",IDC_STATIC,59,166,28,18
LTEXT "Diffuse White [nits]",IDC_STATIC,15,166,42,16
LTEXT "Master MaxL",IDC_STATIC,91,166,27,16
LTEXT "Target MaxL",IDC_STATIC,154,166,24,18
LTEXT "Target MinL",IDC_STATIC,122,166,24,18
EDITTEXT IDC_EDIT_MASTER_MINL,56,185,27,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_TARGET_MINL,120,185,27,14,ES_AUTOHSCROLL | WS_GROUP
EDITTEXT IDC_EDIT_MASTER_MAXL,88,185,27,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_TARGET_MAXL,151,185,27,14,ES_AUTOHSCROLL | WS_GROUP
CONTROL "BT.2390 Tone Mapping",IDC_USE_TONEMAP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,182,159,42,32
CONTROL "Override Targets",IDC_USER_OVERRIDE_TARGS,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,117,150,66,16
LTEXT "cd/m^2",IDC_STATIC,184,108,28,8,NOT WS_GROUP
CONTROL "Override black",IDC_USER_BLACK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,162,90,57,13
EDITTEXT IDC_EDIT_DIFFUSE_WHITE,17,247,27,14,ES_AUTOHSCROLL
LTEXT "Master MinL",IDC_STATIC,59,228,28,18
LTEXT "Diffuse White [nits]",IDC_STATIC,15,228,42,16
LTEXT "Master MaxL",IDC_STATIC,91,228,27,16
LTEXT "Target MaxL",IDC_STATIC,154,228,24,18
LTEXT "Target MinL",IDC_STATIC,122,228,24,18
EDITTEXT IDC_EDIT_MASTER_MINL,56,247,27,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_TARGET_MINL,120,247,27,14,ES_AUTOHSCROLL | WS_GROUP
EDITTEXT IDC_EDIT_MASTER_MAXL,88,247,27,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_TARGET_MAXL,151,247,27,14,ES_AUTOHSCROLL | WS_GROUP
CONTROL "BT.2390 Tone Mapping",IDC_USE_TONEMAP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,182,221,42,32
CONTROL "Override Targets",IDC_USER_OVERRIDE_TARGS,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,117,212,66,16
GROUPBOX "EOTF (HDR)",IDC_STATIC,5,194,223,82,BS_CENTER | WS_GROUP
END

IDD_GENERAL_PROP_PAGE DIALOGEX 0, 0, 210, 246
Expand Down Expand Up @@ -1214,14 +1215,22 @@ BEGIN
IDC_CCMODE_COMBO, 0x403, 28, 0
0x4d43, 0x4420, 0x6e79, 0x6d61, 0x6369, 0x5220, 0x6e61, 0x6567, 0x2820,
0x6c43, 0x7069, 0x6970, 0x676e, 0x0029,
IDC_CCMODE_COMBO, 0x403, 16, 0
0x5442, 0x3032, 0x3032, 0x4448, 0x5f52, 0x3035, 0x355f, 0x0030,
IDC_CCMODE_COMBO, 0x403, 12, 0
0x474c, 0x355f, 0x3034, 0x325f, 0x3130, 0x0036,
IDC_CCMODE_COMBO, 0x403, 12, 0
0x474c, 0x355f, 0x3034, 0x325f, 0x3130, 0x0037,
IDC_CCMODE_COMBO, 0x403, 13, 0
0x474c, 0x315f, 0x3030, 0x5f30, 0x3032, 0x3731, "\000"
IDC_CCMODE_COMBO, 0x403, 13, 0
0x474c, 0x345f, 0x3030, 0x5f30, 0x3032, 0x3731, "\000"
IDC_CCMODE_COMBO, 0x403, 11, 0
0x6152, 0x646e, 0x6d6f, 0x3220, 0x3035, "\000"
IDC_CCMODE_COMBO, 0x403, 11, 0
0x6152, 0x646e, 0x6d6f, 0x3520, 0x3030, "\000"
IDC_CCMODE_COMBO, 0x403, 13, 0
0x7355, 0x7265, 0x6420, 0x6665, 0x6e69, 0x6465, "\000"
IDC_CCMODE_COMBO, 0x403, 16, 0
0x5442, 0x3032, 0x3032, 0x4448, 0x5f52, 0x3035, 0x355f, 0x0030,
0
END

Expand Down Expand Up @@ -2581,7 +2590,7 @@ BEGIN
IDD_REFERENCE_PROP_PAGE, DIALOG
BEGIN
RIGHTMARGIN, 235
BOTTOMMARGIN, 289
BOTTOMMARGIN, 325
END

IDD_GENERAL_PROP_PAGE, DIALOG
Expand Down Expand Up @@ -2738,7 +2747,7 @@ END

STRINGTABLE
BEGIN
IDR_MAINFRAME "HCFR Colorimeter - 3.4.6"
IDR_MAINFRAME "HCFR Colorimeter - 3.4.6.1"
IDR_MESURETYPE "\nColor Measures\nColor_Measures\nColorHCFR File (*.chc)\n.chc\nCOLORHCFR\nHCFR Color Measures"
END

Expand Down
2 changes: 1 addition & 1 deletion CHCFR21_ESPANOL.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2722,7 +2722,7 @@ IDC_CURSOR_MEASURE CURSOR "res\\cursor_meas.cur"

STRINGTABLE
BEGIN
IDR_MAINFRAME "Colorim�tre HCFR - 3,4,6"
IDR_MAINFRAME "Colorim�tre HCFR - 3,4,6,1"
IDR_MESURETYPE "\nRelev�\nRelev�\nFichiers ColorHCFR (*.chc)\n.chc\nCOLORHCFR\nRelev� de couleurs HCFR"
END

Expand Down
2 changes: 1 addition & 1 deletion CHCFR21_FRANCAIS.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2709,7 +2709,7 @@ IDC_CURSOR_MEASURE CURSOR "res\\cursor_meas.cur"

STRINGTABLE
BEGIN
IDR_MAINFRAME "Colorim�tre HCFR - 3,4,6"
IDR_MAINFRAME "Colorim�tre HCFR - 3,4,6,1"
IDR_MESURETYPE "\nRelev�\nRelev�\nFichiers ColorHCFR (*.chc)\n.chc\nCOLORHCFR\nRelev� de couleurs HCFR"
END

Expand Down
4 changes: 2 additions & 2 deletions ColorHCFR.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ BEGIN
BEGIN
VALUE "Comments", "Under GPL Licence"
VALUE "FileDescription", "HCFR"
VALUE "FileVersion", "3.4.6"
VALUE "FileVersion", "3.4.6.1"
VALUE "InternalName", "ColorHCFR"
VALUE "LegalCopyright", "Copyright (c) 2005-2017"
VALUE "OriginalFilename", "ColorHCFR.EXE"
VALUE "ProductName", "HCFR"
VALUE "ProductVersion", "3.4.6"
VALUE "ProductVersion", "3.4.6.1"
END
END
BLOCK "VarFileInfo"
Expand Down
15 changes: 14 additions & 1 deletion ColorHCFRConfig.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ void CColorHCFRConfig::InitDefaults()
m_GammaRef=2.2;
m_GammaAvg=2.2;
m_MasterMinL = 0.0;
m_MasterMaxL = 400.0;
m_MasterMaxL = 4000.0;
m_TargetMinL = 0.05;
m_TargetMaxL = 500.;
m_DiffuseL = 94.37844;
Expand Down Expand Up @@ -968,6 +968,18 @@ void CColorHCFRConfig::GetCColors()
case MASCIOR50:
fName=strcat(appPath, "\\color\\Mascior50_50_BT2020_HDR.csv");
break;
case LG54016:
fName=strcat(appPath, "\\color\\LG_540_Base_Tone_Curve_2016.csv");
break;
case LG54017:
fName=strcat(appPath, "\\color\\LG_540_Base_Tone_Curve_2017.csv");
break;
case LG100017:
fName=strcat(appPath, "\\color\\LG_1000_Base_Tone_Curve_2017.csv");
break;
case LG400017:
fName=strcat(appPath, "\\color\\LG_4000_Base_Tone_Curve_2017.csv");
break;
}
ifstream colorFile(fName);
std::string line;
Expand Down Expand Up @@ -1025,6 +1037,7 @@ int CColorHCFRConfig::GetCColorsSize()
{
int cnt = 24;
BOOL isExtPat =( GetConfig()->m_CCMode == USER || GetConfig()->m_CCMode == CM10SAT || GetConfig()->m_CCMode == CM10SAT75 || GetConfig()->m_CCMode == CM5SAT || GetConfig()->m_CCMode == CM5SAT75 || GetConfig()->m_CCMode == CM4SAT || GetConfig()->m_CCMode == CM4SAT75 || GetConfig()->m_CCMode == CM4LUM || GetConfig()->m_CCMode == CM5LUM || GetConfig()->m_CCMode == CM10LUM || GetConfig()->m_CCMode == RANDOM250 || GetConfig()->m_CCMode == RANDOM500 || GetConfig()->m_CCMode == CM6NB || GetConfig()->m_CCMode == CMDNR || GetConfig()->m_CCMode == MASCIOR50);
isExtPat = (isExtPat || GetConfig()->m_CCMode > 19);
if (isExtPat)
cnt = numCC;
else if (GetConfig()->m_CCMode == CCSG)
Expand Down
1 change: 1 addition & 0 deletions Export.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2004,6 +2004,7 @@ bool CExport::SaveCCSheet()

int size;
BOOL isExtPat =( GetConfig()->m_CCMode == USER || GetConfig()->m_CCMode == CM10SAT || GetConfig()->m_CCMode == CM10SAT75 || GetConfig()->m_CCMode == CM5SAT || GetConfig()->m_CCMode == CM5SAT75 || GetConfig()->m_CCMode == CM4SAT || GetConfig()->m_CCMode == CM4SAT75 || GetConfig()->m_CCMode == CM4LUM || GetConfig()->m_CCMode == CM5LUM || GetConfig()->m_CCMode == CM10LUM || GetConfig()->m_CCMode == RANDOM250 || GetConfig()->m_CCMode == RANDOM500 || GetConfig()->m_CCMode == CM6NB || GetConfig()->m_CCMode == CMDNR || GetConfig()->m_CCMode == MASCIOR50);
isExtPat = (isExtPat || GetConfig()->m_CCMode > 19);

if (isExtPat)
size = GetConfig()->GetCColorsSize();
Expand Down
Loading

0 comments on commit d10be72

Please sign in to comment.