versie
This commit is contained in:
parent
dcb57bf756
commit
e2ea06cda6
2 changed files with 10 additions and 10 deletions
|
|
@ -458,14 +458,14 @@ int EpdBaseClr::Epd2::WriteCalibration(EpdBase::Epd2U* epd)
|
||||||
|
|
||||||
int EpdBaseClr::Epd2::WriteCalibration(Epd3Base::Epd3U* epd)
|
int EpdBaseClr::Epd2::WriteCalibration(Epd3Base::Epd3U* epd)
|
||||||
{
|
{
|
||||||
epd->K1 = K1;
|
epd->K1 = (float)K1;
|
||||||
epd->K2 = K2;
|
epd->K2 = (float)K2;
|
||||||
|
|
||||||
epd->K3 = K3;
|
epd->K3 = (float)K3;
|
||||||
epd->K4 = K4;
|
epd->K4 = (float)K4;
|
||||||
|
|
||||||
epd->K5 = K5;
|
epd->K5 = (float)K5;
|
||||||
epd->K6 = K6;
|
epd->K6 = (float)K6;
|
||||||
|
|
||||||
//epd->K1 = 903;
|
//epd->K1 = 903;
|
||||||
//epd->K2 = 613;
|
//epd->K2 = 613;
|
||||||
|
|
@ -555,12 +555,12 @@ int EpdBaseClr::Epd2::AfterReadTresholds(Epd3Base::Epd3U* epd)
|
||||||
Hp07Total = (double)epd->Hp07Total;
|
Hp07Total = (double)epd->Hp07Total;
|
||||||
|
|
||||||
|
|
||||||
K1 = epd->K1;
|
K1 = (int)epd->K1;
|
||||||
K2 = epd->K2;
|
K2 = epd->K2;
|
||||||
K3 = epd->K3;
|
K3 = epd->K3;
|
||||||
K4 = epd->K4;
|
K4 = epd->K4;
|
||||||
K5 = epd->K5;
|
K5 = epd->K5;
|
||||||
K6 = epd->K6;
|
K6 = (int)epd->K6;
|
||||||
SG = epd->SG;
|
SG = epd->SG;
|
||||||
BC = epd->BC;
|
BC = epd->BC;
|
||||||
FB = epd->FB;
|
FB = epd->FB;
|
||||||
|
|
|
||||||
|
|
@ -51,5 +51,5 @@ using System.Windows;
|
||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("2.5.1.0")]
|
[assembly: AssemblyVersion("2.5.2.0")]
|
||||||
[assembly: AssemblyFileVersion("2.5.1.0")]
|
[assembly: AssemblyFileVersion("2.5.2.0")]
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue