diff --git a/.gitignore b/.gitignore index b315aa5..a3f6ab6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /dist/ /build/ /*/__pycache__ +/data/output/ *.log \ No newline at end of file diff --git a/__pycache__/dataplot.cpython-38.pyc b/__pycache__/dataplot.cpython-38.pyc index 9958cf5..408efc8 100644 Binary files a/__pycache__/dataplot.cpython-38.pyc and b/__pycache__/dataplot.cpython-38.pyc differ diff --git a/__pycache__/yiwinframe.cpython-38.pyc b/__pycache__/yiwinframe.cpython-38.pyc index 9b7e759..dce2de7 100644 Binary files a/__pycache__/yiwinframe.cpython-38.pyc and b/__pycache__/yiwinframe.cpython-38.pyc differ diff --git a/config.yml b/config.yml index 703ac9b..8c47612 100644 --- a/config.yml +++ b/config.yml @@ -1,7 +1,6 @@ algorithm: A720: 0 PureWater: 1 - PureWater2: 0 comsetting: baudrate: 9600 bytesize: 8 diff --git a/data/output/A05D.csv b/data/output/A05D.csv index 2af49db..a30ef85 100644 --- a/data/output/A05D.csv +++ b/data/output/A05D.csv @@ -22,4 +22,8 @@ A05D;361.239;363.37;365.499;367.629;369.757;371.886;374.014;376.141;378.268;380. 2011-01-28 00:00:32;0.8305056633026656;0.8325321223666662;0.8477343375953059;0.8601924590104929;0.8530328354333705;0.8378920897036354;0.8278074911784873;0.8281535772736721;0.8417669229372159;0.8473064396407075;0.8451939009990256;0.8410243863409358;0.8479581706965038;0.8676094047653992;0.8806548654683316;0.8875074181220398;0.8755968269842033;0.8777756237790573;0.8748735428020378;0.8676597912829026;0.8704645496346483;0.8727319781313622;0.8649909567571952;0.8721575362183431;0.886225999256613;0.9099807102527446;0.9088359728118274;0.8916444191236714;0.8681689931461386;0.8425965254793315;0.8346772021921453;0.8585663394574234;0.8862767799770718;0.8932636649579137;0.9016317118599789;0.9027624687336095;0.9206516865749377;0.9327846116837807;0.9602005701082441;0.9749891716558136;0.9822944403965026;0.9980056154719704;0.9971909884161739;0.9953411369380588;0.980520016102744;0.963201502501569;0.9451480182379225;0.922528030922861;0.8934585007801298;0.8735535833075148;0.8568626944267983;0.846250552191586;0.8461889028458536;0.8409568386226679;0.8328901277495963;0.8483302297194842;0.8456103705892927;0.8914627131614281;0.8849406412861658;0.8925392667763073;0.8682470089065448;0.8921760017495045;0.858390169114441;0.8810786335268779;0.8647374668201232;0.85690573098644;0.8405116083956596;0.8617405341002237;0.8449614552030993;0.8315423161484212;0.8288571519252356;0.8391334842228164;0.8259496474372849;0.8471735149886767;0.8669084157988203;0.8636174656790235;0.8621669493064881;0.8672941380017757;0.8717982089000185;0.8741990630034071;0.8807292197068987;0.879892511276376;0.897020726571207;0.8726308550865656;0.878554371723866;0.875596437065776;0.8734230914842722;0.859859624976091;0.8561093411090327;0.8479426564886996;0.8451858934662784;0.8380022320259202;0.8271645355713448;0.8294739360598545;0.828021188697714;0.8143999709099917;0.8196652203175339;0.8161645324006923;0.8267073210046172;0.8307557596462992;0.8360231304121594;0.8354486131287958;0.834551856913814;0.8451021977332801;0.8526591779318539;0.8581371739734327;0.8579392174274951;0.8705774573361329;0.864887645088894;0.8760630862896586;0.8715859290156174;0.8694462134308505;0.8491883740797094;0.8477291317378446;0.8520118593582244;0.8382094189056998;0.8434800583068083;0.8342736274210578;0.8443139134138795;0.8391470329473713;0.8040621199041593;0.8026041595590329;0.8036283456825588;0.8131726969574389;0.794921410649323;0.7743657931703682;0.7777447552614511;0.7966044992420602;0.7744360262982289;0.7678296693929938;0.7545534490887005;0.7811929239565515;0.793525285169995;0.7886861168733466;0.7870419062303593;0.7887618277147204;0.7964518241361067;0.83321518746133;0.816002956206773;0.8186066971506032;0.8143945713688479;0.8290437211608577;0.8360384903681481;0.8432741387654823;0.8530485889104499;0.8385138438976305;0.8501032066931371;0.8486977553063845;0.9263518656726755;0.8951313435071966;0.8797814969438251;0.8769019958942749;0.9329430134806274;0.9240753624656644;0.8860313572020637;0.9104167759321247;0.9236090419674579;0.9039283935350704;0.858165736452889;0.8265244773128144;0.9091412984432874;0.8431365236315567;0.8448562434611381;0.9290461664919509;0.8911707503961119;0.865979555097736;0.8959972168515246;0.9552104309849322;0.9481920484111184;0.9263735367210038;0.8707014812076432;1.0786663244566084;0.9369920092400867;0.7793586775626422;1.0350866890705963 2011-01-28 00:01:14;0.8305056633026656;0.8325321223666662;0.8477343375953059;0.8601924590104929;0.8530328354333705;0.8378920897036354;0.8278074911784873;0.8281535772736721;0.8417669229372159;0.8473064396407075;0.8451939009990256;0.8410243863409358;0.8479581706965038;0.8676094047653992;0.8806548654683316;0.8875074181220398;0.8755968269842033;0.8777756237790573;0.8748735428020378;0.8676597912829026;0.8704645496346483;0.8727319781313622;0.8649909567571952;0.8721575362183431;0.886225999256613;0.9099807102527446;0.9088359728118274;0.8916444191236714;0.8681689931461386;0.8425965254793315;0.8346772021921453;0.8585663394574234;0.8862767799770718;0.8932636649579137;0.9016317118599789;0.9027624687336095;0.9206516865749377;0.9327846116837807;0.9602005701082441;0.9749891716558136;0.9822944403965026;0.9980056154719704;0.9971909884161739;0.9953411369380588;0.980520016102744;0.963201502501569;0.9451480182379225;0.922528030922861;0.8934585007801298;0.8735535833075148;0.8568626944267983;0.846250552191586;0.8461889028458536;0.8409568386226679;0.8328901277495963;0.8483302297194842;0.8456103705892927;0.8914627131614281;0.8849406412861658;0.8925392667763073;0.8682470089065448;0.8921760017495045;0.858390169114441;0.8810786335268779;0.8647374668201232;0.85690573098644;0.8405116083956596;0.8617405341002237;0.8449614552030993;0.8315423161484212;0.8288571519252356;0.8391334842228164;0.8259496474372849;0.8471735149886767;0.8669084157988203;0.8636174656790235;0.8621669493064881;0.8672941380017757;0.8717982089000185;0.8741990630034071;0.8807292197068987;0.879892511276376;0.897020726571207;0.8726308550865656;0.878554371723866;0.875596437065776;0.8734230914842722;0.859859624976091;0.8561093411090327;0.8479426564886996;0.8451858934662784;0.8380022320259202;0.8271645355713448;0.8294739360598545;0.828021188697714;0.8143999709099917;0.8196652203175339;0.8161645324006923;0.8267073210046172;0.8307557596462992;0.8360231304121594;0.8354486131287958;0.834551856913814;0.8451021977332801;0.8526591779318539;0.8581371739734327;0.8579392174274951;0.8705774573361329;0.864887645088894;0.8760630862896586;0.8715859290156174;0.8694462134308505;0.8491883740797094;0.8477291317378446;0.8520118593582244;0.8382094189056998;0.8434800583068083;0.8342736274210578;0.8443139134138795;0.8391470329473713;0.8040621199041593;0.8026041595590329;0.8036283456825588;0.8131726969574389;0.794921410649323;0.7743657931703682;0.7777447552614511;0.7966044992420602;0.7744360262982289;0.7678296693929938;0.7545534490887005;0.7811929239565515;0.793525285169995;0.7886861168733466;0.7870419062303593;0.7887618277147204;0.7964518241361067;0.83321518746133;0.816002956206773;0.8186066971506032;0.8143945713688479;0.8290437211608577;0.8360384903681481;0.8432741387654823;0.8530485889104499;0.8385138438976305;0.8501032066931371;0.8486977553063845;0.9263518656726755;0.8951313435071966;0.8797814969438251;0.8769019958942749;0.9329430134806274;0.9240753624656644;0.8860313572020637;0.9104167759321247;0.9236090419674579;0.9039283935350704;0.858165736452889;0.8265244773128144;0.9091412984432874;0.8431365236315567;0.8448562434611381;0.9290461664919509;0.8911707503961119;0.865979555097736;0.8959972168515246;0.9552104309849322;0.9481920484111184;0.9263735367210038;0.8707014812076432;1.0786663244566084;0.9369920092400867;0.7793586775626422;1.0350866890705963 2011-01-28 00:04:15;0.8305056633026656;0.8325321223666662;0.8477343375953059;0.8601924590104929;0.8530328354333705;0.8378920897036354;0.8278074911784873;0.8281535772736721;0.8417669229372159;0.8473064396407075;0.8451939009990256;0.8410243863409358;0.8479581706965038;0.8676094047653992;0.8806548654683316;0.8875074181220398;0.8755968269842033;0.8777756237790573;0.8748735428020378;0.8676597912829026;0.8704645496346483;0.8727319781313622;0.8649909567571952;0.8721575362183431;0.886225999256613;0.9099807102527446;0.9088359728118274;0.8916444191236714;0.8681689931461386;0.8425965254793315;0.8346772021921453;0.8585663394574234;0.8862767799770718;0.8932636649579137;0.9016317118599789;0.9027624687336095;0.9206516865749377;0.9327846116837807;0.9602005701082441;0.9749891716558136;0.9822944403965026;0.9980056154719704;0.9971909884161739;0.9953411369380588;0.980520016102744;0.963201502501569;0.9451480182379225;0.922528030922861;0.8934585007801298;0.8735535833075148;0.8568626944267983;0.846250552191586;0.8461889028458536;0.8409568386226679;0.8328901277495963;0.8483302297194842;0.8456103705892927;0.8914627131614281;0.8849406412861658;0.8925392667763073;0.8682470089065448;0.8921760017495045;0.858390169114441;0.8810786335268779;0.8647374668201232;0.85690573098644;0.8405116083956596;0.8617405341002237;0.8449614552030993;0.8315423161484212;0.8288571519252356;0.8391334842228164;0.8259496474372849;0.8471735149886767;0.8669084157988203;0.8636174656790235;0.8621669493064881;0.8672941380017757;0.8717982089000185;0.8741990630034071;0.8807292197068987;0.879892511276376;0.897020726571207;0.8726308550865656;0.878554371723866;0.875596437065776;0.8734230914842722;0.859859624976091;0.8561093411090327;0.8479426564886996;0.8451858934662784;0.8380022320259202;0.8271645355713448;0.8294739360598545;0.828021188697714;0.8143999709099917;0.8196652203175339;0.8161645324006923;0.8267073210046172;0.8307557596462992;0.8360231304121594;0.8354486131287958;0.834551856913814;0.8451021977332801;0.8526591779318539;0.8581371739734327;0.8579392174274951;0.8705774573361329;0.864887645088894;0.8760630862896586;0.8715859290156174;0.8694462134308505;0.8491883740797094;0.8477291317378446;0.8520118593582244;0.8382094189056998;0.8434800583068083;0.8342736274210578;0.8443139134138795;0.8391470329473713;0.8040621199041593;0.8026041595590329;0.8036283456825588;0.8131726969574389;0.794921410649323;0.7743657931703682;0.7777447552614511;0.7966044992420602;0.7744360262982289;0.7678296693929938;0.7545534490887005;0.7811929239565515;0.793525285169995;0.7886861168733466;0.7870419062303593;0.7887618277147204;0.7964518241361067;0.83321518746133;0.816002956206773;0.8186066971506032;0.8143945713688479;0.8290437211608577;0.8360384903681481;0.8432741387654823;0.8530485889104499;0.8385138438976305;0.8501032066931371;0.8486977553063845;0.9263518656726755;0.8951313435071966;0.8797814969438251;0.8769019958942749;0.9329430134806274;0.9240753624656644;0.8860313572020637;0.9104167759321247;0.9236090419674579;0.9039283935350704;0.858165736452889;0.8265244773128144;0.9091412984432874;0.8431365236315567;0.8448562434611381;0.9290461664919509;0.8911707503961119;0.865979555097736;0.8959972168515246;0.9552104309849322;0.9481920484111184;0.9263735367210038;0.8707014812076432;1.0786663244566084;0.9369920092400867;0.7793586775626422;1.0350866890705963 -2011-01-28 00:04:28;0.8305056633026656;0.8325321223666662;0.8477343375953059;0.8601924590104929;0.8530328354333705;0.8378920897036354;0.8278074911784873;0.8281535772736721;0.8417669229372159;0.8473064396407075;0.8451939009990256;0.8410243863409358;0.8479581706965038;0.8676094047653992;0.8806548654683316;0.8875074181220398;0.8755968269842033;0.8777756237790573;0.8748735428020378;0.8676597912829026;0.8704645496346483;0.8727319781313622;0.8649909567571952;0.8721575362183431;0.886225999256613;0.9099807102527446;0.9088359728118274;0.8916444191236714;0.8681689931461386;0.8425965254793315;0.8346772021921453;0.8585663394574234;0.8862767799770718;0.8932636649579137;0.9016317118599789;0.9027624687336095;0.9206516865749377;0.9327846116837807;0.9602005701082441;0.9749891716558136;0.9822944403965026;0.9980056154719704;0.9971909884161739;0.9953411369380588;0.980520016102744;0.963201502501569;0.9451480182379225;0.922528030922861;0.8934585007801298;0.8735535833075148;0.8568626944267983;0.846250552191586;0.8461889028458536;0.8409568386226679;0.8328901277495963;0.8483302297194842;0.8456103705892927;0.8914627131614281;0.8849406412861658;0.8925392667763073;0.8682470089065448;0.8921760017495045;0.858390169114441;0.8810786335268779;0.8647374668201232;0.85690573098644;0.8405116083956596;0.8617405341002237;0.8449614552030993;0.8315423161484212;0.8288571519252356;0.8391334842228164;0.8259496474372849;0.8471735149886767;0.8669084157988203;0.8636174656790235;0.8621669493064881;0.8672941380017757;0.8717982089000185;0.8741990630034071;0.8807292197068987;0.879892511276376;0.897020726571207;0.8726308550865656;0.878554371723866;0.875596437065776;0.8734230914842722;0.859859624976091;0.8561093411090327;0.8479426564886996;0.8451858934662784;0.8380022320259202;0.8271645355713448;0.8294739360598545;0.828021188697714;0.8143999709099917;0.8196652203175339;0.8161645324006923;0.8267073210046172;0.8307557596462992;0.8360231304121594;0.8354486131287958;0.834551856913814;0.8451021977332801;0.8526591779318539;0.8581371739734327;0.8579392174274951;0.8705774573361329;0.864887645088894;0.8760630862896586;0.8715859290156174;0.8694462134308505;0.8491883740797094;0.8477291317378446;0.8520118593582244;0.8382094189056998;0.8434800583068083;0.8342736274210578;0.8443139134138795;0.8391470329473713;0.8040621199041593;0.8026041595590329;0.8036283456825588;0.8131726969574389;0.794921410649323;0.7743657931703682;0.7777447552614511;0.7966044992420602;0.7744360262982289;0.7678296693929938;0.7545534490887005;0.7811929239565515;0.793525285169995;0.7886861168733466;0.7870419062303593;0.7887618277147204;0.7964518241361067;0.83321518746133;0.816002956206773;0.8186066971506032;0.8143945713688479;0.8290437211608577;0.8360384903681481;0.8432741387654823;0.8530485889104499;0.8385138438976305;0.8501032066931371;0.8486977553063845;0.9263518656726755;0.8951313435071966;0.8797814969438251;0.8769019958942749;0.9329430134806274;0.9240753624656644;0.8860313572020637;0.9104167759321247;0.9236090419674579;0.9039283935350704;0.858165736452889;0.8265244773128144;0.9091412984432874;0.8431365236315567;0.8448562434611381;0.9290461664919509;0.8911707503961119;0.865979555097736;0.8959972168515246;0.9552104309849322;0.9481920484111184;0.9263735367210038;0.8707014812076432;1.0786663244566084;0.9369920092400867;0.7793586775626422;1.0350866890705963 \ No newline at end of file +2011-01-28 00:04:28;0.8305056633026656;0.8325321223666662;0.8477343375953059;0.8601924590104929;0.8530328354333705;0.8378920897036354;0.8278074911784873;0.8281535772736721;0.8417669229372159;0.8473064396407075;0.8451939009990256;0.8410243863409358;0.8479581706965038;0.8676094047653992;0.8806548654683316;0.8875074181220398;0.8755968269842033;0.8777756237790573;0.8748735428020378;0.8676597912829026;0.8704645496346483;0.8727319781313622;0.8649909567571952;0.8721575362183431;0.886225999256613;0.9099807102527446;0.9088359728118274;0.8916444191236714;0.8681689931461386;0.8425965254793315;0.8346772021921453;0.8585663394574234;0.8862767799770718;0.8932636649579137;0.9016317118599789;0.9027624687336095;0.9206516865749377;0.9327846116837807;0.9602005701082441;0.9749891716558136;0.9822944403965026;0.9980056154719704;0.9971909884161739;0.9953411369380588;0.980520016102744;0.963201502501569;0.9451480182379225;0.922528030922861;0.8934585007801298;0.8735535833075148;0.8568626944267983;0.846250552191586;0.8461889028458536;0.8409568386226679;0.8328901277495963;0.8483302297194842;0.8456103705892927;0.8914627131614281;0.8849406412861658;0.8925392667763073;0.8682470089065448;0.8921760017495045;0.858390169114441;0.8810786335268779;0.8647374668201232;0.85690573098644;0.8405116083956596;0.8617405341002237;0.8449614552030993;0.8315423161484212;0.8288571519252356;0.8391334842228164;0.8259496474372849;0.8471735149886767;0.8669084157988203;0.8636174656790235;0.8621669493064881;0.8672941380017757;0.8717982089000185;0.8741990630034071;0.8807292197068987;0.879892511276376;0.897020726571207;0.8726308550865656;0.878554371723866;0.875596437065776;0.8734230914842722;0.859859624976091;0.8561093411090327;0.8479426564886996;0.8451858934662784;0.8380022320259202;0.8271645355713448;0.8294739360598545;0.828021188697714;0.8143999709099917;0.8196652203175339;0.8161645324006923;0.8267073210046172;0.8307557596462992;0.8360231304121594;0.8354486131287958;0.834551856913814;0.8451021977332801;0.8526591779318539;0.8581371739734327;0.8579392174274951;0.8705774573361329;0.864887645088894;0.8760630862896586;0.8715859290156174;0.8694462134308505;0.8491883740797094;0.8477291317378446;0.8520118593582244;0.8382094189056998;0.8434800583068083;0.8342736274210578;0.8443139134138795;0.8391470329473713;0.8040621199041593;0.8026041595590329;0.8036283456825588;0.8131726969574389;0.794921410649323;0.7743657931703682;0.7777447552614511;0.7966044992420602;0.7744360262982289;0.7678296693929938;0.7545534490887005;0.7811929239565515;0.793525285169995;0.7886861168733466;0.7870419062303593;0.7887618277147204;0.7964518241361067;0.83321518746133;0.816002956206773;0.8186066971506032;0.8143945713688479;0.8290437211608577;0.8360384903681481;0.8432741387654823;0.8530485889104499;0.8385138438976305;0.8501032066931371;0.8486977553063845;0.9263518656726755;0.8951313435071966;0.8797814969438251;0.8769019958942749;0.9329430134806274;0.9240753624656644;0.8860313572020637;0.9104167759321247;0.9236090419674579;0.9039283935350704;0.858165736452889;0.8265244773128144;0.9091412984432874;0.8431365236315567;0.8448562434611381;0.9290461664919509;0.8911707503961119;0.865979555097736;0.8959972168515246;0.9552104309849322;0.9481920484111184;0.9263735367210038;0.8707014812076432;1.0786663244566084;0.9369920092400867;0.7793586775626422;1.0350866890705963 +2011-01-28 00:00:32;0.8305056633026656;0.8325321223666662;0.8477343375953059;0.8601924590104929;0.8530328354333705;0.8378920897036354;0.8278074911784873;0.8281535772736721;0.8417669229372159;0.8473064396407075;0.8451939009990256;0.8410243863409358;0.8479581706965038;0.8676094047653992;0.8806548654683316;0.8875074181220398;0.8755968269842033;0.8777756237790573;0.8748735428020378;0.8676597912829026;0.8704645496346483;0.8727319781313622;0.8649909567571952;0.8721575362183431;0.886225999256613;0.9099807102527446;0.9088359728118274;0.8916444191236714;0.8681689931461386;0.8425965254793315;0.8346772021921453;0.8585663394574234;0.8862767799770718;0.8932636649579137;0.9016317118599789;0.9027624687336095;0.9206516865749377;0.9327846116837807;0.9602005701082441;0.9749891716558136;0.9822944403965026;0.9980056154719704;0.9971909884161739;0.9953411369380588;0.980520016102744;0.963201502501569;0.9451480182379225;0.922528030922861;0.8934585007801298;0.8735535833075148;0.8568626944267983;0.846250552191586;0.8461889028458536;0.8409568386226679;0.8328901277495963;0.8483302297194842;0.8456103705892927;0.8914627131614281;0.8849406412861658;0.8925392667763073;0.8682470089065448;0.8921760017495045;0.858390169114441;0.8810786335268779;0.8647374668201232;0.85690573098644;0.8405116083956596;0.8617405341002237;0.8449614552030993;0.8315423161484212;0.8288571519252356;0.8391334842228164;0.8259496474372849;0.8471735149886767;0.8669084157988203;0.8636174656790235;0.8621669493064881;0.8672941380017757;0.8717982089000185;0.8741990630034071;0.8807292197068987;0.879892511276376;0.897020726571207;0.8726308550865656;0.878554371723866;0.875596437065776;0.8734230914842722;0.859859624976091;0.8561093411090327;0.8479426564886996;0.8451858934662784;0.8380022320259202;0.8271645355713448;0.8294739360598545;0.828021188697714;0.8143999709099917;0.8196652203175339;0.8161645324006923;0.8267073210046172;0.8307557596462992;0.8360231304121594;0.8354486131287958;0.834551856913814;0.8451021977332801;0.8526591779318539;0.8581371739734327;0.8579392174274951;0.8705774573361329;0.864887645088894;0.8760630862896586;0.8715859290156174;0.8694462134308505;0.8491883740797094;0.8477291317378446;0.8520118593582244;0.8382094189056998;0.8434800583068083;0.8342736274210578;0.8443139134138795;0.8391470329473713;0.8040621199041593;0.8026041595590329;0.8036283456825588;0.8131726969574389;0.794921410649323;0.7743657931703682;0.7777447552614511;0.7966044992420602;0.7744360262982289;0.7678296693929938;0.7545534490887005;0.7811929239565515;0.793525285169995;0.7886861168733466;0.7870419062303593;0.7887618277147204;0.7964518241361067;0.83321518746133;0.816002956206773;0.8186066971506032;0.8143945713688479;0.8290437211608577;0.8360384903681481;0.8432741387654823;0.8530485889104499;0.8385138438976305;0.8501032066931371;0.8486977553063845;0.9263518656726755;0.8951313435071966;0.8797814969438251;0.8769019958942749;0.9329430134806274;0.9240753624656644;0.8860313572020637;0.9104167759321247;0.9236090419674579;0.9039283935350704;0.858165736452889;0.8265244773128144;0.9091412984432874;0.8431365236315567;0.8448562434611381;0.9290461664919509;0.8911707503961119;0.865979555097736;0.8959972168515246;0.9552104309849322;0.9481920484111184;0.9263735367210038;0.8707014812076432;1.0786663244566084;0.9369920092400867;0.7793586775626422;1.0350866890705963 +2011-01-28 00:01:04;0.8305056633026656;0.8325321223666662;0.8477343375953059;0.8601924590104929;0.8530328354333705;0.8378920897036354;0.8278074911784873;0.8281535772736721;0.8417669229372159;0.8473064396407075;0.8451939009990256;0.8410243863409358;0.8479581706965038;0.8676094047653992;0.8806548654683316;0.8875074181220398;0.8755968269842033;0.8777756237790573;0.8748735428020378;0.8676597912829026;0.8704645496346483;0.8727319781313622;0.8649909567571952;0.8721575362183431;0.886225999256613;0.9099807102527446;0.9088359728118274;0.8916444191236714;0.8681689931461386;0.8425965254793315;0.8346772021921453;0.8585663394574234;0.8862767799770718;0.8932636649579137;0.9016317118599789;0.9027624687336095;0.9206516865749377;0.9327846116837807;0.9602005701082441;0.9749891716558136;0.9822944403965026;0.9980056154719704;0.9971909884161739;0.9953411369380588;0.980520016102744;0.963201502501569;0.9451480182379225;0.922528030922861;0.8934585007801298;0.8735535833075148;0.8568626944267983;0.846250552191586;0.8461889028458536;0.8409568386226679;0.8328901277495963;0.8483302297194842;0.8456103705892927;0.8914627131614281;0.8849406412861658;0.8925392667763073;0.8682470089065448;0.8921760017495045;0.858390169114441;0.8810786335268779;0.8647374668201232;0.85690573098644;0.8405116083956596;0.8617405341002237;0.8449614552030993;0.8315423161484212;0.8288571519252356;0.8391334842228164;0.8259496474372849;0.8471735149886767;0.8669084157988203;0.8636174656790235;0.8621669493064881;0.8672941380017757;0.8717982089000185;0.8741990630034071;0.8807292197068987;0.879892511276376;0.897020726571207;0.8726308550865656;0.878554371723866;0.875596437065776;0.8734230914842722;0.859859624976091;0.8561093411090327;0.8479426564886996;0.8451858934662784;0.8380022320259202;0.8271645355713448;0.8294739360598545;0.828021188697714;0.8143999709099917;0.8196652203175339;0.8161645324006923;0.8267073210046172;0.8307557596462992;0.8360231304121594;0.8354486131287958;0.834551856913814;0.8451021977332801;0.8526591779318539;0.8581371739734327;0.8579392174274951;0.8705774573361329;0.864887645088894;0.8760630862896586;0.8715859290156174;0.8694462134308505;0.8491883740797094;0.8477291317378446;0.8520118593582244;0.8382094189056998;0.8434800583068083;0.8342736274210578;0.8443139134138795;0.8391470329473713;0.8040621199041593;0.8026041595590329;0.8036283456825588;0.8131726969574389;0.794921410649323;0.7743657931703682;0.7777447552614511;0.7966044992420602;0.7744360262982289;0.7678296693929938;0.7545534490887005;0.7811929239565515;0.793525285169995;0.7886861168733466;0.7870419062303593;0.7887618277147204;0.7964518241361067;0.83321518746133;0.816002956206773;0.8186066971506032;0.8143945713688479;0.8290437211608577;0.8360384903681481;0.8432741387654823;0.8530485889104499;0.8385138438976305;0.8501032066931371;0.8486977553063845;0.9263518656726755;0.8951313435071966;0.8797814969438251;0.8769019958942749;0.9329430134806274;0.9240753624656644;0.8860313572020637;0.9104167759321247;0.9236090419674579;0.9039283935350704;0.858165736452889;0.8265244773128144;0.9091412984432874;0.8431365236315567;0.8448562434611381;0.9290461664919509;0.8911707503961119;0.865979555097736;0.8959972168515246;0.9552104309849322;0.9481920484111184;0.9263735367210038;0.8707014812076432;1.0786663244566084;0.9369920092400867;0.7793586775626422;1.0350866890705963 +2011-01-28 00:04:05;0.8305056633026656;0.8325321223666662;0.8477343375953059;0.8601924590104929;0.8530328354333705;0.8378920897036354;0.8278074911784873;0.8281535772736721;0.8417669229372159;0.8473064396407075;0.8451939009990256;0.8410243863409358;0.8479581706965038;0.8676094047653992;0.8806548654683316;0.8875074181220398;0.8755968269842033;0.8777756237790573;0.8748735428020378;0.8676597912829026;0.8704645496346483;0.8727319781313622;0.8649909567571952;0.8721575362183431;0.886225999256613;0.9099807102527446;0.9088359728118274;0.8916444191236714;0.8681689931461386;0.8425965254793315;0.8346772021921453;0.8585663394574234;0.8862767799770718;0.8932636649579137;0.9016317118599789;0.9027624687336095;0.9206516865749377;0.9327846116837807;0.9602005701082441;0.9749891716558136;0.9822944403965026;0.9980056154719704;0.9971909884161739;0.9953411369380588;0.980520016102744;0.963201502501569;0.9451480182379225;0.922528030922861;0.8934585007801298;0.8735535833075148;0.8568626944267983;0.846250552191586;0.8461889028458536;0.8409568386226679;0.8328901277495963;0.8483302297194842;0.8456103705892927;0.8914627131614281;0.8849406412861658;0.8925392667763073;0.8682470089065448;0.8921760017495045;0.858390169114441;0.8810786335268779;0.8647374668201232;0.85690573098644;0.8405116083956596;0.8617405341002237;0.8449614552030993;0.8315423161484212;0.8288571519252356;0.8391334842228164;0.8259496474372849;0.8471735149886767;0.8669084157988203;0.8636174656790235;0.8621669493064881;0.8672941380017757;0.8717982089000185;0.8741990630034071;0.8807292197068987;0.879892511276376;0.897020726571207;0.8726308550865656;0.878554371723866;0.875596437065776;0.8734230914842722;0.859859624976091;0.8561093411090327;0.8479426564886996;0.8451858934662784;0.8380022320259202;0.8271645355713448;0.8294739360598545;0.828021188697714;0.8143999709099917;0.8196652203175339;0.8161645324006923;0.8267073210046172;0.8307557596462992;0.8360231304121594;0.8354486131287958;0.834551856913814;0.8451021977332801;0.8526591779318539;0.8581371739734327;0.8579392174274951;0.8705774573361329;0.864887645088894;0.8760630862896586;0.8715859290156174;0.8694462134308505;0.8491883740797094;0.8477291317378446;0.8520118593582244;0.8382094189056998;0.8434800583068083;0.8342736274210578;0.8443139134138795;0.8391470329473713;0.8040621199041593;0.8026041595590329;0.8036283456825588;0.8131726969574389;0.794921410649323;0.7743657931703682;0.7777447552614511;0.7966044992420602;0.7744360262982289;0.7678296693929938;0.7545534490887005;0.7811929239565515;0.793525285169995;0.7886861168733466;0.7870419062303593;0.7887618277147204;0.7964518241361067;0.83321518746133;0.816002956206773;0.8186066971506032;0.8143945713688479;0.8290437211608577;0.8360384903681481;0.8432741387654823;0.8530485889104499;0.8385138438976305;0.8501032066931371;0.8486977553063845;0.9263518656726755;0.8951313435071966;0.8797814969438251;0.8769019958942749;0.9329430134806274;0.9240753624656644;0.8860313572020637;0.9104167759321247;0.9236090419674579;0.9039283935350704;0.858165736452889;0.8265244773128144;0.9091412984432874;0.8431365236315567;0.8448562434611381;0.9290461664919509;0.8911707503961119;0.865979555097736;0.8959972168515246;0.9552104309849322;0.9481920484111184;0.9263735367210038;0.8707014812076432;1.0786663244566084;0.9369920092400867;0.7793586775626422;1.0350866890705963 +2011-01-28 00:04:17;0.8305056633026656;0.8325321223666662;0.8477343375953059;0.8601924590104929;0.8530328354333705;0.8378920897036354;0.8278074911784873;0.8281535772736721;0.8417669229372159;0.8473064396407075;0.8451939009990256;0.8410243863409358;0.8479581706965038;0.8676094047653992;0.8806548654683316;0.8875074181220398;0.8755968269842033;0.8777756237790573;0.8748735428020378;0.8676597912829026;0.8704645496346483;0.8727319781313622;0.8649909567571952;0.8721575362183431;0.886225999256613;0.9099807102527446;0.9088359728118274;0.8916444191236714;0.8681689931461386;0.8425965254793315;0.8346772021921453;0.8585663394574234;0.8862767799770718;0.8932636649579137;0.9016317118599789;0.9027624687336095;0.9206516865749377;0.9327846116837807;0.9602005701082441;0.9749891716558136;0.9822944403965026;0.9980056154719704;0.9971909884161739;0.9953411369380588;0.980520016102744;0.963201502501569;0.9451480182379225;0.922528030922861;0.8934585007801298;0.8735535833075148;0.8568626944267983;0.846250552191586;0.8461889028458536;0.8409568386226679;0.8328901277495963;0.8483302297194842;0.8456103705892927;0.8914627131614281;0.8849406412861658;0.8925392667763073;0.8682470089065448;0.8921760017495045;0.858390169114441;0.8810786335268779;0.8647374668201232;0.85690573098644;0.8405116083956596;0.8617405341002237;0.8449614552030993;0.8315423161484212;0.8288571519252356;0.8391334842228164;0.8259496474372849;0.8471735149886767;0.8669084157988203;0.8636174656790235;0.8621669493064881;0.8672941380017757;0.8717982089000185;0.8741990630034071;0.8807292197068987;0.879892511276376;0.897020726571207;0.8726308550865656;0.878554371723866;0.875596437065776;0.8734230914842722;0.859859624976091;0.8561093411090327;0.8479426564886996;0.8451858934662784;0.8380022320259202;0.8271645355713448;0.8294739360598545;0.828021188697714;0.8143999709099917;0.8196652203175339;0.8161645324006923;0.8267073210046172;0.8307557596462992;0.8360231304121594;0.8354486131287958;0.834551856913814;0.8451021977332801;0.8526591779318539;0.8581371739734327;0.8579392174274951;0.8705774573361329;0.864887645088894;0.8760630862896586;0.8715859290156174;0.8694462134308505;0.8491883740797094;0.8477291317378446;0.8520118593582244;0.8382094189056998;0.8434800583068083;0.8342736274210578;0.8443139134138795;0.8391470329473713;0.8040621199041593;0.8026041595590329;0.8036283456825588;0.8131726969574389;0.794921410649323;0.7743657931703682;0.7777447552614511;0.7966044992420602;0.7744360262982289;0.7678296693929938;0.7545534490887005;0.7811929239565515;0.793525285169995;0.7886861168733466;0.7870419062303593;0.7887618277147204;0.7964518241361067;0.83321518746133;0.816002956206773;0.8186066971506032;0.8143945713688479;0.8290437211608577;0.8360384903681481;0.8432741387654823;0.8530485889104499;0.8385138438976305;0.8501032066931371;0.8486977553063845;0.9263518656726755;0.8951313435071966;0.8797814969438251;0.8769019958942749;0.9329430134806274;0.9240753624656644;0.8860313572020637;0.9104167759321247;0.9236090419674579;0.9039283935350704;0.858165736452889;0.8265244773128144;0.9091412984432874;0.8431365236315567;0.8448562434611381;0.9290461664919509;0.8911707503961119;0.865979555097736;0.8959972168515246;0.9552104309849322;0.9481920484111184;0.9263735367210038;0.8707014812076432;1.0786663244566084;0.9369920092400867;0.7793586775626422;1.0350866890705963 \ No newline at end of file diff --git a/uiconfig/ui_algorithm.py b/uiconfig/ui_algorithm.py index 50ba6d7..aeaa929 100644 --- a/uiconfig/ui_algorithm.py +++ b/uiconfig/ui_algorithm.py @@ -40,7 +40,7 @@ class UI_Algorithm(wx.Dialog): self.staticText2 = wx.StaticText(self.panel, label='包含纯水: ' ,size=(60, -1)) # self.staticText2_1 = wx.StaticText(self.panel, label='分钟 ' ,size=(60, -1)) self.textCtrl2 = wx.TextCtrl(self.panel, value="",size=(250,25)) - tmp = self.get_str_from_config( "algorithm", "2" ) + tmp = self.get_str_from_config( "algorithm", "PureWater" ) if tmp is not None: self.textCtrl2.SetValue(tmp) self.hbox2.Add(self.staticText2, flag=wx.TOP|wx.LEFT, border=5) @@ -48,17 +48,17 @@ class UI_Algorithm(wx.Dialog): # self.hbox2.Add(self.staticText2_1, flag=wx.TOP|wx.LEFT, border=5) self.sbs.Add(self.hbox2, flag=wx.TOP|wx.LEFT, border=5) - self.hbox3 = wx.BoxSizer(wx.HORIZONTAL) - self.staticText3 = wx.StaticText(self.panel, label='纯水: ' ,size=(60, -1)) - # self.staticText2_1 = wx.StaticText(self.panel, label='分钟 ' ,size=(60, -1)) - self.textCtrl3 = wx.TextCtrl(self.panel, value="",size=(250,25)) - tmp = self.get_str_from_config( "algorithm", "3" ) - if tmp is not None: - self.textCtrl3.SetValue(tmp) - self.hbox3.Add(self.staticText3, flag=wx.TOP|wx.LEFT, border=5) - self.hbox3.Add(self.textCtrl3,flag=wx.TOP|wx.LEFT, border=5) - # self.hbox2.Add(self.staticText2_1, flag=wx.TOP|wx.LEFT, border=5) - self.sbs.Add(self.hbox3, flag=wx.TOP|wx.LEFT, border=5) + # self.hbox3 = wx.BoxSizer(wx.HORIZONTAL) + # self.staticText3 = wx.StaticText(self.panel, label='纯水: ' ,size=(60, -1)) + # # self.staticText2_1 = wx.StaticText(self.panel, label='分钟 ' ,size=(60, -1)) + # self.textCtrl3 = wx.TextCtrl(self.panel, value="",size=(250,25)) + # tmp = self.get_str_from_config( "algorithm", "PureWater2" ) + # if tmp is not None: + # self.textCtrl3.SetValue(tmp) + # self.hbox3.Add(self.staticText3, flag=wx.TOP|wx.LEFT, border=5) + # self.hbox3.Add(self.textCtrl3,flag=wx.TOP|wx.LEFT, border=5) + # # self.hbox2.Add(self.staticText2_1, flag=wx.TOP|wx.LEFT, border=5) + # self.sbs.Add(self.hbox3, flag=wx.TOP|wx.LEFT, border=5) self.panel.SetSizer(self.sbs) @@ -101,9 +101,9 @@ class UI_Algorithm(wx.Dialog): def OnSave(self, e): success = True # 赋值字典，写入文件 - self.set_config_by_section_key_val( 'algorithm',"1",self.textCtrl1.GetValue( ) ) - self.set_config_by_section_key_val( 'algorithm',"2",self.textCtrl2.GetValue( ) ) - self.set_config_by_section_key_val( 'algorithm',"3",self.textCtrl2.GetValue( ) ) + self.set_config_by_section_key_val( 'algorithm',"A720",self.textCtrl1.GetValue( ) ) + self.set_config_by_section_key_val( 'algorithm',"PureWater",self.textCtrl2.GetValue( ) ) + # self.set_config_by_section_key_val( 'algorithm',"3",self.textCtrl2.GetValue( ) ) self.config.write_yaml(self.config_yml) del self.config if success: diff --git a/yiwinframe.py b/yiwinframe.py index 53927c2..c8088f5 100644 --- a/yiwinframe.py +++ b/yiwinframe.py @@ -16,6 +16,7 @@ from uiconfig.ui_filepath_setting import UI_Filepath_Setting from uiconfig.ui_pathsn_setting import UI_PathSN_Setting from uiconfig.ui_plot_setting import UI_Plot_Setting from uiconfig.ui_log_setting import UI_Log_Setting +from uiconfig.ui_algorithm import UI_Algorithm from uiconfig.uiabout import About from uiconfig.uihelp import Help @@ -62,7 +63,7 @@ ID_PLOT_RULE = 17 ID_HELP = 21 ID_ABOUT = 22 - +ID_ALGORITHM = 30 class YiwinFrame( wx.Frame ): '''将buf类传进来''' def __init__(self, title, parent, size=(900, 750)): @@ -166,6 +167,8 @@ class YiwinFrame( wx.Frame ): settingMenu.Append(ID_PLOT_SETTING, u'&绘图设置', ' ') settingMenu.AppendSeparator() settingMenu.Append(ID_LOG_SETTING, u'&采集设置', ' ') + settingMenu.AppendSeparator() + settingMenu.Append(ID_ALGORITHM, u'&算法配置', ' ') self.menubar.Append(settingMenu, u'&系统设置') plotMenu = wx.Menu() @@ -205,6 +208,7 @@ class YiwinFrame( wx.Frame ): self.Bind(wx.EVT_MENU, self.OnFilePathSetting, id = ID_FILE_PATH) self.Bind(wx.EVT_MENU, self.OnPlotSetting, id = ID_PLOT_SETTING) self.Bind(wx.EVT_MENU, self.OnLogSetting, id = ID_LOG_SETTING) + self.Bind(wx.EVT_MENU, self.OnAlgorithm, id = ID_ALGORITHM) self.Bind(wx.EVT_MENU, self.OnPlotOne, id = ID_PLOT_ONE) self.Bind(wx.EVT_MENU, self.OnPlotSeven, id = ID_PLOT_SEVEN) @@ -559,6 +563,18 @@ class YiwinFrame( wx.Frame ): self.__read_config() pass + def OnAlgorithm(self,e): + with UI_Algorithm( + self, + -1 ) as Dialog_Sensor_Setting: + Dialog_Sensor_Setting.CenterOnParent() + resultLog = Dialog_Sensor_Setting.ShowModal() + + if resultLog == wx.ID_OK: + log.info( " Algorithm config dialog confirm, call back " ) + self.__read_config() + pass + def OnHelpConfig(self, e): with Help( self,