Update of /cvsroot/deinterlace/DScaler/DScaler
In directory sc8-pr-cvs1:/tmp/cvs-serv9151
Modified Files:
Calibration.cpp OSD.cpp
Log Message:
Update of the OSD displayed when doing calibration
Index: Calibration.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/Calibration.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -r1.79 -r1.80
*** Calibration.cpp 30 Jan 2003 22:32:39 -0000 1.79
--- Calibration.cpp 26 May 2003 22:04:11 -0000 1.80
***************
*** 19,22 ****
--- 19,25 ----
//
// $Log$
+ // Revision 1.80 2003/05/26 22:04:11 laurentg
+ // Update of the OSD displayed when doing calibration
+ //
// Revision 1.79 2003/01/30 22:32:39 laurentg
// Restriction to maximum range for the settings deleted
***************
*** 1068,1072 ****
initial_step = 12;
nb_steps = 12;
! if (m_Saturation_U != NULL && m_Hue != NULL)
{
OkToStart = TRUE;
--- 1071,1075 ----
initial_step = 12;
nb_steps = 12;
! if (m_Saturation_U != NULL)
{
OkToStart = TRUE;
***************
*** 1076,1080 ****
m_Saturation_V->AdjustDefault();
}
! m_Hue->AdjustDefault();
}
break;
--- 1079,1086 ----
m_Saturation_V->AdjustDefault();
}
! if (m_Hue != NULL)
! {
! m_Hue->AdjustDefault();
! }
}
break;
***************
*** 1082,1086 ****
initial_step = 1;
nb_steps = 23;
! if (m_Brightness != NULL && m_Contrast != NULL && m_Saturation_U != NULL && m_Hue != NULL)
{
OkToStart = TRUE;
--- 1088,1092 ----
initial_step = 1;
nb_steps = 23;
! if (m_Brightness != NULL && m_Contrast != NULL && m_Saturation_U != NULL)
{
OkToStart = TRUE;
***************
*** 1092,1096 ****
m_Saturation_V->AdjustDefault();
}
! m_Hue->AdjustDefault();
}
break;
--- 1098,1105 ----
m_Saturation_V->AdjustDefault();
}
! if (m_Hue != NULL)
! {
! m_Hue->AdjustDefault();
! }
}
break;
***************
*** 1436,1439 ****
--- 1445,1453 ----
case 18:
+ if (m_Saturation_V == NULL)
+ {
+ current_step += 2;
+ break;
+ }
m_Saturation_V->SetFullRange();
if (step_init(ADJ_SATURATION_V, m_Saturation_V, (CCalSetting* )NULL, (CCalSetting* )NULL))
***************
*** 1457,1460 ****
--- 1471,1479 ----
case 20:
+ if (m_Hue == NULL)
+ {
+ current_step += 2;
+ break;
+ }
m_Hue->SetRange(30);
if (step_init(ADJ_HUE, m_Hue, (CCalSetting* )NULL, (CCalSetting* )NULL))
***************
*** 1505,1518 ****
nb2 = 1;
}
! if (m_Hue->GetResult(&mask, &min, &max) > 0)
! {
! m_Hue->SetRange(mask);
! }
! else
! {
! m_Hue->SetRange(0);
! }
! free(mask);
! nb3 = m_Hue->GetRange(NULL, &min, &max);
if ((nb1 == 1) && (nb2 == 1) && (nb3 == 1))
{
--- 1524,1544 ----
nb2 = 1;
}
! if (m_Hue != NULL)
! {
! if (m_Hue->GetResult(&mask, &min, &max) > 0)
! {
! m_Hue->SetRange(mask);
! }
! else
! {
! m_Hue->SetRange(0);
! }
! free(mask);
! nb3 = m_Hue->GetRange(NULL, &min, &max);
! }
! else
! {
! nb3 = 1;
! }
if ((nb1 == 1) && (nb2 == 1) && (nb3 == 1))
{
Index: OSD.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/OSD.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** OSD.cpp 26 Apr 2003 19:39:10 -0000 1.83
--- OSD.cpp 26 May 2003 22:04:17 -0000 1.84
***************
*** 59,62 ****
--- 59,65 ----
//
// $Log$
+ // Revision 1.84 2003/05/26 22:04:17 laurentg
+ // Update of the OSD displayed when doing calibration
+ //
// Revision 1.83 2003/04/26 19:39:10 laurentg
// New character string settings
***************
*** 1871,1890 ****
OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (2, dfMargin, Size));
}
! pSetting = pSource->GetSaturationU();
if(pSetting != NULL)
{
! sprintf (szInfo, "Color U : %03u", pSetting->GetValue());
OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (1, dfMargin, Size));
}
! pSetting = pSource->GetSaturationV();
if(pSetting != NULL)
{
! sprintf (szInfo, "Color V : %03u", pSetting->GetValue());
OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (2, dfMargin, Size));
}
! pSetting = pSource->GetHue();
if(pSetting != NULL)
{
! sprintf (szInfo, "Hue : %+04d", pSetting->GetValue());
OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (3, dfMargin, Size));
}
--- 1874,1899 ----
OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (2, dfMargin, Size));
}
! pSetting = pSource->GetHue();
if(pSetting != NULL)
{
! sprintf (szInfo, "Hue : %+04d", pSetting->GetValue());
! OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (3, dfMargin, Size));
! }
! pSetting = pSource->GetSaturation();
! if(pSetting != NULL)
! {
! sprintf (szInfo, "Color : %03u", pSetting->GetValue());
OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (1, dfMargin, Size));
}
! pSetting = pSource->GetSaturationU();
if(pSetting != NULL)
{
! sprintf (szInfo, "Color U : %03u", pSetting->GetValue());
OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (2, dfMargin, Size));
}
! pSetting = pSource->GetSaturationV();
if(pSetting != NULL)
{
! sprintf (szInfo, "Color V : %03u", pSetting->GetValue());
OSD_AddText(szInfo, Size, -1, -1, OSDB_USERDEFINED, OSD_XPOS_RIGHT, 1 - dfMargin, OSD_GetLineYpos (3, dfMargin, Size));
}
***************
*** 1892,1895 ****
--- 1901,1906 ----
else
{
+ nLine = 8;
+
// do brightness
pSetting = pSource->GetBrightness();
***************
*** 1912,1922 ****
Color = -1;
}
! }
! else
! {
! strcpy(szInfo, "Not Supported on this Source");
}
- OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (8, dfMargin, Size));
// do Contrast
--- 1923,1929 ----
Color = -1;
}
! OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
}
// do Contrast
***************
*** 1940,1949 ****
Color = -1;
}
}
! else
{
! strcpy(szInfo, "Not Supported on this Source");
}
- OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (9, dfMargin, Size));
--- 1947,1979 ----
Color = -1;
}
+ OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
}
!
!
! // do Color
! pSetting = pSource->GetSaturation();
! if(pSetting != NULL)
{
! sprintf (szInfo, "Color : %03u", pSetting->GetValue());
! if ( pCalibration->IsRunning()
! && ( (pCalibration->GetCurrentStep() == 12)
! || (pCalibration->GetCurrentStep() == 13)
! || (pCalibration->GetCurrentStep() == 14)
! || (pCalibration->GetCurrentStep() == 15)
! || (pCalibration->GetCurrentStep() == 16)
! || (pCalibration->GetCurrentStep() == 17)
! || (pCalibration->GetCurrentStep() == 18)
! || (pCalibration->GetCurrentStep() == 19)
! || (pCalibration->GetCurrentStep() == 22)
! || (pCalibration->GetCurrentStep() == 23) ) )
! {
! Color = OSD_COLOR_CURRENT;
! }
! else
! {
! Color = -1;
! }
! OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
}
***************
*** 1967,1976 ****
Color = -1;
}
}
- else
- {
- strcpy(szInfo, "Not Supported on this Source");
- }
- OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (10, dfMargin, Size));
--- 1997,2002 ----
Color = -1;
}
+ OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
}
***************
*** 1994,2003 ****
Color = -1;
}
}
- else
- {
- strcpy(szInfo, "Not Supported on this Source");
- }
- OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (11, dfMargin, Size));
// do Hue
--- 2020,2025 ----
Color = -1;
}
+ OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
}
// do Hue
***************
*** 2018,2027 ****
Color = -1;
}
}
- else
- {
- strcpy(szInfo, "Not Supported on this Source");
- }
- OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (12, dfMargin, Size));
}
}
--- 2040,2045 ----
Color = -1;
}
+ OSD_AddText(szInfo, Size, Color, -1, OSDB_USERDEFINED, OSD_XPOS_LEFT, dfMargin, OSD_GetLineYpos (nLine++, dfMargin, Size));
}
}
}
***************
*** 2064,2076 ****
case 14:
case 15:
- strcpy(szInfo, "Adjusting Saturation U ...");
- break;
case 16:
case 17:
case 18:
case 19:
! strcpy(szInfo, "Adjusting Saturation V ...");
break;
! case 20:
case 21:
strcpy(szInfo, "Adjusting Hue ...");
--- 2082,2092 ----
case 14:
case 15:
case 16:
case 17:
case 18:
case 19:
! strcpy(szInfo, "Adjusting Color ...");
break;
! case 20:
case 21:
strcpy(szInfo, "Adjusting Hue ...");
|