From 304a758053ea6998551e4573a9fceafd6ea61d5b Mon Sep 17 00:00:00 2001 From: esea_info Date: Wed, 12 Apr 2023 16:23:01 +0800 Subject: [PATCH] algorithm bug --- .gitignore | 1 + __pycache__/dataplot.cpython-38.pyc | Bin 6945 -> 5940 bytes __pycache__/yiwinframe.cpython-38.pyc | Bin 17590 -> 17968 bytes config.yml | 1 - data/output/A05D.csv | 6 +++++- uiconfig/ui_algorithm.py | 30 +++++++++++++------------- yiwinframe.py | 18 +++++++++++++++- 7 files changed, 38 insertions(+), 18 deletions(-) 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 9958cf5efd204f99e6ec47e12cd76225bfd09df6..408efc887490f21f20c022096cc2965a16d4249f 100644 GIT binary patch delta 579 zcmaLSJ4?e*6bJC$#@Z$!MQfE9U#Z~Zwzc)y`hI~53I$(FmO7jig0;d;ba3wGRIj55 zu1-S4)xp8pP5KeU!O7Ws+QC6EaDSYW!@2zLUG6cX9cr2q5TB9Afm74Y$!)Eg=^O7BP@WQQeND7fYTQ(pOAd2A++|DtSL}sYztJ118-XML#KgNB0r5?=wHa^&|NaR; zq`05xyp~9oKj~%{zO~-s+2wLwaw;Cn<5G@)>f3rVvFI)Jv{Z6!ujo`9kFE1U_mv{C zEipML&^Z6@KI$98wIPHe31k!574R=3t};nft>U;QzcGwZd!$#{;m<~r?C}pH{{sO0 BdN=?8 delta 1473 zcmaKsO>7%g5XaxFch_%sy{;P)J5B<18n>|daGOFC6296Ji4ss~Nm0Ojn4obYC#kDE zuMi1q1xSuaB;8{{vde`^91!Nv3nvcTk+}HIfdfY_m5`WOLjqQnUF~mY-^|X=dvE^x zL!mk4zTvvIpkqBZg_#5QL-_7suh2J+HadGylsJJdCdsm}aPafw?Nh|;%yl_xZqX#Hl#HTX09BT>5XK+EM6(2EPIpQt7o z7Z?MKCmByME)wn~)pKme8B>gD#vtQq#tdUNY`BB3Jj3R*jOPiSqa3!+GR7F=gtm3F z(wS|oZK-lCns`mU!2U~&%Z!Q8Ox_-dW=D^F@Tw%~dXcW${qR#~WCvpzQP)>R-Pnii z_X4p74Xr8GVs$exQD4{8)g^((qVRS0p}DK=!x!WAIL7NTkd6qAc!}NK%#7F zAjmeGqHg)|z}kgC=Wnd*6qWKtV4;;2y8yzML2P#i=ES?jy6p?J1Gpnl3$%zaCRzam zT448zjOZ12#8;AE2%LS`-)rY0pyOlO3l%Tx085Shp4NZ>}5uG zSMb<8V}$X4p%e#?sqikv*SIN#o`w|Yplb<`uY#%ZLxN7J^+fk^=mkk3J(>+RSxLGQ za2keaECt*7L!EVhE&M#W)&CNG!HY$+YFjH6Rr4cVUur#i;wLB`2`$nX%gd9;h>H9j zIk5sgv$I$WJlef5t=W^`#HLxpmHQ;R-}%3{pjbcAu6Xey!M1h3ys^=aRjR(4<$#$m z+c)3eksUo3om(p_HTp$Wsuf?&hadOdPHUaL<=+F%?i$^0EO_ZKlYT#6;1uT>XBZyi y9AlXA8lxBj7>AwLh$u|A~ diff --git a/__pycache__/yiwinframe.cpython-38.pyc b/__pycache__/yiwinframe.cpython-38.pyc index 9b7e7597e92a16c284b3da2fd2326c5c71e946ed..dce2de7e5541c5a18a974c388ebe60cf2377b64a 100644 GIT binary patch delta 5445 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 delta 5203 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 dLao@_LJJ{~G`R 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,