Skip to content

Commit

Permalink
Custom primaries and version bump
Browse files Browse the repository at this point in the history 
Added user definable primaries
  • Loading branch information
zoyd000 committed Jun 24, 2014
1 parent 35d269b commit 2d7f2d1
Show file tree
Hide file tree
Showing 15 changed files with 368 additions and 145 deletions.
84 changes: 51 additions & 33 deletions CHCFR21_DEUTSCH.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,41 +580,56 @@ BEGIN
CTEXT "Verbinde...",IDC_STATIC1,7,18,172,8
END

IDD_REFERENCE_PROP_PAGE DIALOGEX 0, 0, 213, 191
IDD_REFERENCE_PROP_PAGE DIALOGEX 0, 0, 213, 225
STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Referenzen"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
GROUPBOX "Farben",IDC_STATIC,7,7,198,43,WS_GROUP
GROUPBOX "Farben",IDC_STATIC,7,7,198,71,WS_GROUP
LTEXT "Standard:",IDC_STATIC,14,19,32,8
COMBOBOX IDC_COLORREF_COMBO,47,16,98,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
CONTROL "Wei� �ndern",IDC_CHANGEWHITE_CHECK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,14,33,66,10
COMBOBOX IDC_WHITETARGET_COMBO,88,32,57,84,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_GROUP | WS_TABSTOP
GROUPBOX "Gamma Kalkulation",IDC_STATIC,7,51,198,73,WS_GROUP
GROUPBOX "Gamma Kalkulation",IDC_STATIC,7,79,198,73,WS_GROUP
CONTROL "Anzeige Gamma (power law)",IDC_GAMMA_OFFSET_RADIO1,
"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,61,115,10
"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,89,115,10
CONTROL "Anzeige Gamma mit Schwarzkompensation",IDC_GAMMA_OFFSET_RADIO2,
"Button",BS_AUTORADIOBUTTON,12,73,154,10
"Button",BS_AUTORADIOBUTTON,12,101,154,10
CONTROL "Kamera Gamma (Standard Offset)",IDC_GAMMA_OFFSET_RADIO3,
"Button",BS_AUTORADIOBUTTON,12,85,153,10
"Button",BS_AUTORADIOBUTTON,12,113,153,10
CONTROL "Kamera Gamma, manuelles Offset",IDC_GAMMA_OFFSET_RADIO4,
"Button",BS_AUTORADIOBUTTON,12,97,118,10,WS_EX_TRANSPARENT
CONTROL "ITU-R BT.1886",IDC_GAMMA_OFFSET_RADIO5,"Button",BS_AUTORADIOBUTTON,12,109,93,10,WS_EX_TRANSPARENT
EDITTEXT IDC_EDIT_MANUAL_GOFFSET,135,95,41,13,ES_AUTOHSCROLL | WS_GROUP
GROUPBOX "Gamma Referenz",IDC_STATIC,7,126,84,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_REF,18,137,58,12,ES_AUTOHSCROLL | WS_GROUP
GROUPBOX "Color Checker Patterns",IDC_STATIC,7,156,198,30,WS_GROUP
COMBOBOX IDC_CCMODE_COMBO,15,168,110,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
GROUPBOX "Average Gamma",IDC_STATIC,97,126,84,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_AVERAGE,106,136,61,14,ES_AUTOHSCROLL | WS_GROUP
CONTROL "Use measured gamma",IDC_USE_MEASURED_GAMMA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,143,163,60,23
EDITTEXT IDC_WHITE_X,164,19,36,14,ES_AUTOHSCROLL
EDITTEXT IDC_WHITE_Y,164,35,36,14,ES_AUTOHSCROLL
LTEXT "Custom White",IDC_STATIC,158,11,45,8,SS_SUNKEN
LTEXT "x",IDC_STATIC,154,21,8,8
LTEXT "y",IDC_STATIC,154,36,8,8
EDITTEXT IDC_EDIT_GAMMA_REL,85,107,33,14,ES_AUTOHSCROLL | WS_GROUP
LTEXT "Relative [0=Absolute]",IDC_STATIC,123,109,77,8
"Button",BS_AUTORADIOBUTTON,12,125,118,10,WS_EX_TRANSPARENT
CONTROL "ITU-R BT.1886",IDC_GAMMA_OFFSET_RADIO5,"Button",BS_AUTORADIOBUTTON,12,137,93,10,WS_EX_TRANSPARENT
EDITTEXT IDC_EDIT_MANUAL_GOFFSET,135,123,41,13,ES_AUTOHSCROLL | WS_GROUP
GROUPBOX "Gamma Referenz",IDC_STATIC,7,155,84,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_REF,18,166,58,12,ES_AUTOHSCROLL | WS_GROUP
GROUPBOX "Color Checker Patterns",IDC_STATIC,7,188,198,30,WS_GROUP
COMBOBOX IDC_CCMODE_COMBO,15,200,110,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
GROUPBOX "Average Gamma",IDC_STATIC,97,155,84,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_AVERAGE,106,165,61,14,ES_AUTOHSCROLL | WS_GROUP
CONTROL "Use measured gamma",IDC_USE_MEASURED_GAMMA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,143,195,60,23
EDITTEXT IDC_EDIT_GAMMA_REL,85,135,33,14,ES_AUTOHSCROLL | WS_GROUP
LTEXT "Relative [0=Absolute]",IDC_STATIC,123,137,77,8
EDITTEXT IDC_WHITE_X,163,21,36,14,ES_AUTOHSCROLL
EDITTEXT IDC_WHITE_Y,163,35,36,14,ES_AUTOHSCROLL
CTEXT "White",IDC_STATIC,167,11,26,10
LTEXT "x",IDC_STATIC,155,22,8,8
LTEXT "y",IDC_STATIC,155,37,8,8
EDITTEXT IDC_RED_X,11,61,29,14,ES_AUTOHSCROLL
EDITTEXT IDC_RED_Y,39,61,30,14,ES_AUTOHSCROLL
EDITTEXT IDC_GREEN_X,71,61,32,14,ES_AUTOHSCROLL
EDITTEXT IDC_GREEN_Y,101,61,32,14,ES_AUTOHSCROLL
EDITTEXT IDC_BLUE_X,137,61,31,14,ES_AUTOHSCROLL
EDITTEXT IDC_BLUE_Y,167,61,33,14,ES_AUTOHSCROLL
LTEXT "Red",IDC_STATIC,33,51,17,8
LTEXT "Green",IDC_STATIC,91,51,23,8
LTEXT "Blue",IDC_STATIC,159,51,17,8
LTEXT "x",IDC_STATIC,83,53,8,8
LTEXT "x",IDC_STATIC,23,53,8,8
LTEXT "x",IDC_STATIC,149,52,8,8
LTEXT "y",IDC_STATIC,115,52,8,8
LTEXT "y",IDC_STATIC,181,52,8,8
LTEXT "y",IDC_STATIC,53,52,8,8
END

IDD_I1SENSOR_PROP_PAGE DIALOGEX 0, 0, 212, 174
Expand Down Expand Up @@ -2267,8 +2282,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,3,0
PRODUCTVERSION 3,1,3,0
FILEVERSION 3, 1, 4
PRODUCTVERSION 3, 1, 4
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -2286,12 +2301,12 @@ BEGIN
VALUE "Comments", "Under GPL Licence"
VALUE "CompanyName", "Association Homecinema Francophone"
VALUE "FileDescription", "HCFR Colorimeter resources"
VALUE "FileVersion", "3, 1, 3"
VALUE "FileVersion", "3, 1, 4"
VALUE "InternalName", "CHCFR21_DEUTSCH"
VALUE "LegalCopyright", "Copyright (C) 2005-2008"
VALUE "OriginalFilename", "CHCFR21_DEUTSCH.DLL"
VALUE "ProductName", "HCFR Colorimeter German language"
VALUE "ProductVersion", "3, 1, 3"
VALUE "ProductVersion", "3, 1, 4"
END
END
BLOCK "VarFileInfo"
Expand Down Expand Up @@ -2349,7 +2364,7 @@ BEGIN
IDD_REFERENCE_PROP_PAGE, DIALOG
BEGIN
RIGHTMARGIN, 212
BOTTOMMARGIN, 161
BOTTOMMARGIN, 222
END

IDD_SCALESIZES, DIALOG
Expand Down Expand Up @@ -2870,6 +2885,14 @@ BEGIN
IDS_TEMPERATURE "Temperatur"
END

STRINGTABLE
BEGIN
IDS_LCHLEVELS "HSV Levels"
IDS_CUSTREDREF "Custom Rot Referenz"
IDS_CUSTGREENREF "Custom Gr�n Referenz"
IDS_CUSTBLUEREF "Custom Blau Referenz"
END

STRINGTABLE
BEGIN
IDS_PALREDREF "PAL Rot Referenz"
Expand Down Expand Up @@ -3261,11 +3284,6 @@ BEGIN
IDS_MEASURESINGLE_SIM "Eine einmalige freie Messung in allen Dokumenten simultan ausf�hren ?"
END

STRINGTABLE
BEGIN
IDS_LCHLEVELS "HSV Levels"
END

STRINGTABLE
BEGIN
IDM_TAB_CLOSE "Reiter schlie�en"
Expand Down
88 changes: 54 additions & 34 deletions CHCFR21_ENGLISH.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,41 +233,56 @@ BEGIN
PUSHBUTTON "Help",IDHELP,140,154,49,14,WS_GROUP
END

IDD_REFERENCE_PROP_PAGE DIALOGEX 0, 0, 212, 191
IDD_REFERENCE_PROP_PAGE DIALOGEX 0, 0, 212, 229
STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "References"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
GROUPBOX "Color Space",IDC_STATIC,7,7,198,43,WS_GROUP
GROUPBOX "Color Space",IDC_STATIC,7,3,198,75,WS_GROUP
LTEXT "Standard:",IDC_STATIC,14,18,32,8
COMBOBOX IDC_COLORREF_COMBO,47,16,100,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
CONTROL "Change White",IDC_CHANGEWHITE_CHECK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,14,33,66,10
CONTROL "Change White",IDC_CHANGEWHITE_CHECK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,23,34,59,10
COMBOBOX IDC_WHITETARGET_COMBO,88,32,60,84,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_GROUP | WS_TABSTOP
GROUPBOX "Gamma calculation",IDC_STATIC,7,51,198,73,WS_GROUP
GROUPBOX "Gamma calculation",IDC_STATIC,7,81,198,73,WS_GROUP
CONTROL "Display Gamma (power law)",IDC_GAMMA_OFFSET_RADIO1,
"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,61,115,10
"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,91,115,10
CONTROL "Display Gamma with black compensation",IDC_GAMMA_OFFSET_RADIO2,
"Button",BS_AUTORADIOBUTTON,12,73,144,10
"Button",BS_AUTORADIOBUTTON,12,103,144,10
CONTROL "Camera Gamma (Standard Offset)",IDC_GAMMA_OFFSET_RADIO3,
"Button",BS_AUTORADIOBUTTON,12,85,153,10
"Button",BS_AUTORADIOBUTTON,12,115,153,10
CONTROL "Camera Gamma, Manual Offset :",IDC_GAMMA_OFFSET_RADIO4,
"Button",BS_AUTORADIOBUTTON,12,97,117,10,WS_EX_TRANSPARENT
CONTROL "ITU-R BT.1886",IDC_GAMMA_OFFSET_RADIO5,"Button",BS_AUTORADIOBUTTON,12,109,64,10,WS_EX_TRANSPARENT
EDITTEXT IDC_EDIT_MANUAL_GOFFSET,131,95,41,13,ES_AUTOHSCROLL | WS_GROUP
GROUPBOX "Reference Gamma",IDC_STATIC,7,126,84,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_REF,17,136,61,14,ES_AUTOHSCROLL | WS_GROUP
GROUPBOX "Color Checker Patterns",IDC_STATIC,7,156,198,30,WS_GROUP
COMBOBOX IDC_CCMODE_COMBO,15,168,110,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
GROUPBOX "Average Gamma",IDC_STATIC,97,126,84,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_AVERAGE,106,136,61,14,ES_AUTOHSCROLL | WS_GROUP
CONTROL "Use measured gamma",IDC_USE_MEASURED_GAMMA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,143,163,60,23
EDITTEXT IDC_WHITE_X,164,19,36,14,ES_AUTOHSCROLL
EDITTEXT IDC_WHITE_Y,164,35,36,14,ES_AUTOHSCROLL
LTEXT "Custom White",IDC_STATIC,158,11,45,8,SS_SUNKEN
LTEXT "x",IDC_STATIC,154,21,8,8
LTEXT "y",IDC_STATIC,154,36,8,8
EDITTEXT IDC_EDIT_GAMMA_REL,85,107,33,14,ES_AUTOHSCROLL | WS_GROUP
LTEXT "Relative [0=Absolute]",IDC_STATIC,123,109,77,8
"Button",BS_AUTORADIOBUTTON,12,127,117,10,WS_EX_TRANSPARENT
CONTROL "ITU-R BT.1886",IDC_GAMMA_OFFSET_RADIO5,"Button",BS_AUTORADIOBUTTON,12,139,64,10,WS_EX_TRANSPARENT
EDITTEXT IDC_EDIT_MANUAL_GOFFSET,131,125,41,13,ES_AUTOHSCROLL | WS_GROUP
GROUPBOX "Reference Gamma",IDC_STATIC,18,157,84,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_REF,28,167,61,14,ES_AUTOHSCROLL | WS_GROUP
GROUPBOX "Color Checker Patterns",IDC_STATIC,7,194,198,30,WS_GROUP
COMBOBOX IDC_CCMODE_COMBO,17,204,110,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP
GROUPBOX "Average Gamma",IDC_STATIC,108,157,84,29,WS_GROUP
EDITTEXT IDC_EDIT_GAMMA_AVERAGE,117,167,61,14,ES_AUTOHSCROLL | WS_GROUP
CONTROL "Use measured gamma",IDC_USE_MEASURED_GAMMA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,143,201,60,23
EDITTEXT IDC_WHITE_X,164,21,36,14,ES_AUTOHSCROLL
EDITTEXT IDC_WHITE_Y,163,35,36,14,ES_AUTOHSCROLL
CTEXT "White",IDC_STATIC,167,11,26,10
LTEXT "x",IDC_STATIC,155,22,8,8
LTEXT "y",IDC_STATIC,155,37,8,8
EDITTEXT IDC_EDIT_GAMMA_REL,85,137,33,14,ES_AUTOHSCROLL | WS_GROUP
LTEXT "Relative [0=Absolute]",IDC_STATIC,123,139,77,8
EDITTEXT IDC_RED_X,11,61,29,14,ES_AUTOHSCROLL
EDITTEXT IDC_RED_Y,40,61,30,14,ES_AUTOHSCROLL
EDITTEXT IDC_GREEN_X,71,61,32,14,ES_AUTOHSCROLL
EDITTEXT IDC_GREEN_Y,102,61,32,14,ES_AUTOHSCROLL
EDITTEXT IDC_BLUE_X,137,61,31,14,ES_AUTOHSCROLL
EDITTEXT IDC_BLUE_Y,168,61,33,14,ES_AUTOHSCROLL
LTEXT "Red",IDC_STATIC,34,51,17,8
LTEXT "Green",IDC_STATIC,92,51,23,8
LTEXT "Blue",IDC_STATIC,160,51,17,8
LTEXT "x",IDC_STATIC,84,53,8,8
LTEXT "x",IDC_STATIC,24,53,8,8
LTEXT "x",IDC_STATIC,150,52,8,8
LTEXT "y",IDC_STATIC,116,52,8,8
LTEXT "y",IDC_STATIC,182,52,8,8
LTEXT "y",IDC_STATIC,53,52,8,8
END

IDD_GENERAL_PROP_PAGE DIALOGEX 0, 0, 209, 209
Expand Down Expand Up @@ -1075,6 +1090,8 @@ BEGIN
0x4343, 0x2836, 0x434d, 0x2944, "\000"
IDC_COLORREF_COMBO, 0x403, 5, 0
0x5273, 0x4247, "\000"
IDC_COLORREF_COMBO, 0x403, 7, 0
0x7543, 0x7473, 0x6d6f, "\000"
IDC_WHITETARGET_COMBO, 0x403, 4, 0
0x3644, 0x0035,
IDC_WHITETARGET_COMBO, 0x403, 4, 0
Expand Down Expand Up @@ -2262,8 +2279,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,3,0
PRODUCTVERSION 3,1,3,0
FILEVERSION 3, 1, 4
PRODUCTVERSION 3, 1, 4
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -2281,12 +2298,12 @@ BEGIN
VALUE "Comments", "Under GPL Licence"
VALUE "CompanyName", "Association Homecinema Francophone"
VALUE "FileDescription", "HCFR Colorimeter resources"
VALUE "FileVersion", "3, 1, 3"
VALUE "FileVersion", "3, 1, 4"
VALUE "InternalName", "CHCFR21_ENGLISH"
VALUE "LegalCopyright", "Copyright (C) 2005-2008"
VALUE "OriginalFilename", "CHCFR21_ENGLISH.DLL"
VALUE "ProductName", "HCFR Colorimeter English langage"
VALUE "ProductVersion", "3, 1, 3"
VALUE "ProductVersion", "3, 1, 4"
END
END
BLOCK "VarFileInfo"
Expand Down Expand Up @@ -2340,7 +2357,7 @@ BEGIN

IDD_REFERENCE_PROP_PAGE, DIALOG
BEGIN
BOTTOMMARGIN, 161
BOTTOMMARGIN, 224
END

IDD_GENERAL_PROP_PAGE, DIALOG
Expand Down Expand Up @@ -2963,6 +2980,14 @@ BEGIN
IDS_TEMPERATURE "Temperature"
END

STRINGTABLE
BEGIN
IDS_LCHLEVELS "HSV Levels"
IDS_CUSTREDREF "Custom Red Reference"
IDS_CUSTGREENREF "Custom Green Reference"
IDS_CUSTBLUEREF "Custon Blue Reference"
END

STRINGTABLE
BEGIN
IDS_PALREDREF "PAL Red Reference"
Expand Down Expand Up @@ -3364,11 +3389,6 @@ BEGIN
IDS_MEASURESINGLE_SIM "Perform a unique free measure on all documents simultaneously ?"
END

STRINGTABLE
BEGIN
IDS_LCHLEVELS "HSV Levels"
END

STRINGTABLE
BEGIN
IDM_TAB_CLOSE "Close tab"
Expand Down
Loading

0 comments on commit 2d7f2d1

Please sign in to comment.