diff --git a/__pycache__/myconfig.cpython-38.pyc b/__pycache__/myconfig.cpython-38.pyc index 6e2cc58..40582b8 100644 Binary files a/__pycache__/myconfig.cpython-38.pyc and b/__pycache__/myconfig.cpython-38.pyc differ diff --git a/__pycache__/yiwinframe.cpython-38.pyc b/__pycache__/yiwinframe.cpython-38.pyc index 231960e..eee0e44 100644 Binary files a/__pycache__/yiwinframe.cpython-38.pyc and b/__pycache__/yiwinframe.cpython-38.pyc differ diff --git a/data/output/A05D.csv b/data/output/A05D.csv index f7417c1..d871fee 100644 --- a/data/output/A05D.csv +++ b/data/output/A05D.csv @@ -18,4 +18,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: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 +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/myViper.py b/myViper.py index f859a70..4e4d95a 100644 --- a/myViper.py +++ b/myViper.py @@ -10,7 +10,7 @@ import math import time from myconfig import TOKEN, DATA_DIR, FILE_MARK, OUTPUT_DIR, CAL_DIR -from myconfig import PURE_WATER_FNAME, SAVE_EXT_NAME +from myconfig import PURE_WATER_FNAME, SAVE_EXT_NAME,FLOAT_RESERVE_BIT from myexception import MyException from mypath import MyDir @@ -48,15 +48,16 @@ class SerialPort : @dataclass class Registers : - slaveaddress: int - functioncode: int - DataBeginAddress: int - SNAddress: int - SNLen: int - WLBeginAddress: int - count: int - wavelengthBuf: bytes - intensityBuf: bytes + slaveaddress: int = 1 + functioncode: int = 3 + DataBeginAddress: int = 2614 + SNAddress: int = 2980 # 10 + SNLen: int = 5 + WLBeginAddress: int = 2102 + count: int = 3 + snBuf:bytes = b'' + wavelengthBuf: bytes = b'' + intensityBuf: bytes = b'' def __post_init__(self): pass @@ -113,6 +114,7 @@ class ConfigViper : lightPath: float = None mode:WorkMode = None filePath: Path = None + deviceSN:str = None rawWavelength: list = None rawIntensity: list = None Wavelength: list = None @@ -145,6 +147,8 @@ class MyViper(object): self.cfg= None self.file_lst =[] self.mydir = MyDir() + self.ui_sn = "" + self.devicesn_ok = False pass def set_SN(self, sn :str): @@ -158,7 +162,7 @@ class MyViper(object): if self.viper.mode == WorkMode.DEVICEMODE: self.viper.serailPort =SerialPort() self.viper.serailPort.set_serial_port_( self.cfg['comsetting']) - self.viper.register =Registers() + self.viper.register = Registers() self.viper.register.set_register( self.cfg['register']) pass @@ -210,11 +214,9 @@ class MyViper(object): # 浊度校正 data = self.correction_turbidity( np.array(self.viper.rawIntensity) ) - # 计算 吸收系数 data = data * (1000 * math.log(10,math.e) / self.viper.lightPath ) - # 对纯水系数系数进行校正 data = self.correction_pure_water( data ) @@ -231,8 +233,8 @@ class MyViper(object): def set_pure_water(self,wavelength, atten): self.viper.purewaterWavelength = [float(i) for i in wavelength] self.viper.purewaterAttenuation = [float(i) for i in atten] - print(f"== {self.viper.purewaterWavelength}") - print(f"== {self.viper.purewaterAttenuation}") + # print(f"== {self.viper.purewaterWavelength}") + # print(f"== {self.viper.purewaterAttenuation}") if self.viper.rawWavelength is None: raise MyException(f" 没有波长数据。") self.interpo_pure_water() @@ -269,32 +271,6 @@ class MyViper(object): pass pass - # def deal_sn_time_data(self, sn, time_str, data): - # if sn!= self.viper.SN: - # raise Exception(f" wrong SN file") - - # # 浊度校正 - # data = self.correction_turbidity( np.array(data) ) - - # # 取有效波长范围数据 - # data = data[self.viper.beginSite:self.viper.endsite] - - # # 计算 吸收系数 - # data = data * (1000 * math.log(10,math.e) / self.viper.lightPath ) - - # # 对纯水系数系数进行校正 - # data = self.correction_pure_water( data ) - - # data = data.tolist() - # self.viper.measureTime = time_str - # self.viper.absorptionCoef = data - - # self.__set_msg( "data", {"time":time_str, "data":data } ) - # pub.sendMessage("update", msg=self.msg) - - # # 保存数据 ？？？ - # self.mydir.setContent(self.viper.absorptionCoef,TOKEN,self.viper.measureTime) - # self.mydir.writeContent() def distribute_data(self, time_str, data, mode =0): self.__set_msg( "data", {"time":time_str, "data":data } ) @@ -358,8 +334,9 @@ class MyViper(object): 0 : 不变 1 : 加纯水衰减系数 ''' - # log.info(f"... {self.cfg['algorithm']['PureWater']}",__name__,'correction_pure_water') - # print( self.purewater_after_interp ) + print(f" ==== {data} ") + print(f" ==== {self.viper.purewaterAttAfterInterp} ") + if self.viper.algorithm.PureWater == 0: return data pass @@ -386,4 +363,44 @@ class MyViper(object): self.msg = {} self.msg.update( {"type":typ} ) self.msg.update( {"data":d} ) + pass + + def get_device_sn_from_buf(self ): + print( f" 000000 {self.viper.register.snBuf}") + self.viper.deviceSN = self.viper.register.snBuf[-6:-2].decode() + + if self.viper.SN == self.viper.deviceSN: + self.devicesn_ok = True + + def get_raw_wavelength_from_buf(self ): + rawWavelength = self.convert_buf_2_float(self.viper.register.wavelengthBuf,FLOAT_RESERVE_BIT ) + self.set_raw_wavelength( rawWavelength) + print(f" === {len(self.viper.rawWavelength)} {self.viper.rawWavelength}" ) + + def get_raw_intensity_from_buf(self ): + intens =self.convert_buf_2_float(self.viper.register.intensityBuf,FLOAT_RESERVE_BIT ) + time_str = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) + self.set_raw_intensity(self.viper.deviceSN,time_str ,intens) + + def convert_buf_2_float(self, buff, bit = 3 ,byteOrder= "big" )-> None: + res = [] + len_ = len(buff) + if len_%4 != 0: + return res + if byteOrder == "big": + for i in range( int(len_/4) ): + tmp = struct.unpack(">f", buff[i*4: i*4+4] ) + res.append( round(tmp[0],bit) ) + else: + for i in range( int(len_/4) ): + tmp = struct.unpack(">f", buff[i*4: i*4+4] ) + res.append(round(tmp[0],bit)) + return res + pass + + def convert_str_2_float_list(self, lst )-> None: + res = [] + for l in lst: + res.append(float(l)) + return res pass \ No newline at end of file diff --git a/myconfig.py b/myconfig.py index aa77446..1d615d5 100644 --- a/myconfig.py +++ b/myconfig.py @@ -29,6 +29,7 @@ INTERVAL = 1.0 SEPARATOR = ";" TOKEN = ";" NEWLINE = "\n" +FLOAT_RESERVE_BIT = 8 class DeviceType(Enum) : diff --git a/yiwinframe.py b/yiwinframe.py index 329f6ae..77f6610 100644 --- a/yiwinframe.py +++ b/yiwinframe.py @@ -29,7 +29,7 @@ from configuration import Configuration from myexception import MyException from mylogger import log from mypath import MyDir -from mythread import Mythead +from mythread import Mythead,Multithread from readcal import ReadCal from uart import Uart # from viper import Viper @@ -58,6 +58,8 @@ ID_LOG_SETTING = 10 ID_DEVICE_STOP = 11 +ID_OPEN_SERIAL = 12 + ID_PLOT_ONE = 15 ID_PLOT_SEVEN = 16 ID_PLOT_RULE = 17 @@ -159,8 +161,10 @@ class YiwinFrame( wx.Frame ): self.menubar.Append(fileMenu, u'&文件 ') deviceMenu = wx.Menu() - deviceMenu.Append(ID_DEVICE_SN, u'&序列号', '...') + deviceMenu.Append(ID_OPEN_SERIAL, u'&打开串口', '...') deviceMenu.AppendSeparator() + deviceMenu.Append(ID_DEVICE_SN, u'&序列号', '...') + deviceMenu.AppendSeparator() deviceMenu.Append(ID_DEVICE_WL, u'&波长', '...') deviceMenu.AppendSeparator() deviceMenu.Append(ID_DEVICE_LOG, u'&采集数据', '...') @@ -210,6 +214,7 @@ class YiwinFrame( wx.Frame ): ''' self.Bind(wx.EVT_MENU, self.OnDealFile, id = ID_DEAL_FILE) + self.Bind(wx.EVT_MENU, self.OnOpenSerial, id = ID_OPEN_SERIAL) self.Bind(wx.EVT_MENU, self.OnDeviceSN, id = ID_DEVICE_SN) self.Bind(wx.EVT_MENU, self.OnDeviceWL, id = ID_DEVICE_WL) self.Bind(wx.EVT_MENU, self.OnDeviceLog, id = ID_DEVICE_LOG) @@ -385,63 +390,100 @@ class YiwinFrame( wx.Frame ): fl, FILE_MARK, self.myviper.deal_measure_time_data, 1) + def OnOpenSerial(self, e)-> None: + self.myviper.set_mode(mode = WorkMode.DEVICEMODE) + self.uart = Uart() + self.uart.set_serial_para( + self.myviper.viper.serailPort.port + ,self.myviper.viper.serailPort.baudrate + ,self.myviper.viper.serailPort.bytesize + ,self.myviper.viper.serailPort.parity + ,self.myviper.viper.serailPort.stopbit + ) + if not self.uart.connect(): + raise MyException(f" 串口不可用 ") + if self.uart.IsOpen(): + self.uart.disconnect() + self.uart_thread = Multithread() + pass + def OnDeviceSN(self, e)-> None: self.__OnDeviceStop() log.info(f"OnDeviceSN: 获取device sn ", __name__, "", "") - # self.mt = Mythead() - self.viper.set_cfg(self.syscfg) - self.viper.set_serial() - # self.viper.set_modbus(self.syscfg['register']['SNAddress'], self.syscfg['register']['SNLen']) - try: - self.viper.sn_uart_thread( self.get_device_sn ) - except Exception as e: - self.alterStatus_0(e ) - self.popDialog( e ) - self.alterStatus_0(" SN 匹配一致" ) + self.alterStatus_0( "正在获取 SN....") + if self.myviper.viper.register is None: + raise MyException(f" 请先打开串口,再试") + + self.myviper.viper.rawWavelength =None + + self.uart.set_modbus( + self.myviper.viper.register.slaveaddress + ,self.myviper.viper.register.functioncode + ,self.myviper.viper.register.SNAddress + ,self.myviper.viper.register.SNLen) + self.uart_thread.remove_tasks() + self.uart_thread.add_task( self.__device_sn, args=() ) + self.uart_thread.sequently_execute_tasks() + self.myviper.viper.register.snBuf = self.res + self.myviper.get_device_sn_from_buf() + self.alterStatus_0( f" SN : {self.myviper.viper.deviceSN} ") pass - - def get_device_sn(self,sn): - self.device_sn = sn - if self.device_sn != self.ui_sn: - log.error( " 设备SN 与系统设置不一致 错误 " ) - pass - else: - log.info(" sn 匹配成功 ! ") - pass + + def __device_sn(self)-> None: + self.res =b'' + self.uart.disconnect() + self.uart.connect() + self.uart.write() + self.res = self.uart.OneMeasure() + def OnDeviceWL(self, e)-> None: self.__OnDeviceStop() log.info(f"OnDeviceWL: 获得device wavelength ... ", __name__, "", "") - if self.device_sn != '': - self.viper.set_cfg( self.syscfg ) - self.viper.set_serial() - try: - self.viper.wl_uart_thread( self.get_device_wl ) - except Exception as e: - self.alterStatus_0(e ) - self.popDialog( e ) - self.alterStatus_0(" 获取波长成功！" ) - else: - self.popDialog('请获取设备序列号SN信息再试') - pass + self.alterStatus_0( "正在获取波长....") + if self.myviper.viper.register is None: + raise MyException(f" 请先打开串口,再试") + if not self.myviper.devicesn_ok: + raise MyException(f"设备SN {self.myviper.viper.deviceSN} 与系统SN {self.myviper.viper.SN} 不匹配") + + self.uart_thread.remove_tasks() + + self.res = b'' + for i in range(self.myviper.viper.register.count): + log.debug(f" -> i {i}", __name__,"OnDeviceWL") + self.uart.set_modbus( self.myviper.viper.register.slaveaddress,self.myviper.viper.register.functioncode + ,self.myviper.viper.register.WLBeginAddress + i*122, 122 ) + log.debug(f" command -> {self.uart.command.hex()} ") + self.uart_thread.add_task( self.__device_wl, args=() ) + self.uart_thread.sequently_execute_tasks() + # 处理self.res, 将self.res 返回 myviper + self.myviper.viper.register.wavelengthBuf = self.res + self.myviper.get_raw_wavelength_from_buf() + + def __device_wl(self, )-> None: + self.uart.disconnect() + self.uart.connect() + self.uart.write() + tmp = self.uart.OneMeasure() + self.res = self.res + tmp[3:len(tmp)-2] - def get_device_wl(self, wl_buf): - if len(wl_buf) != 0: - self.output_wavelength = wl_buf - self.output_wl_ndarray = np.array(self.output_wavelength) - else: - log.error( " 获取设备波长出错 " ) - raise MyException( " 获取设备波长出错 " ) - pass def OnDeviceLog(self, e)-> None: self.__OnDeviceStop() log.info( f"OnDeviceLog: 采集数据 定时器采集", __name__, "", "" ) - # !!!! 判断是否有波长和sn - if self.output_wavelength == []: - self.alterStatus_0( " 没有设备波长信息，请获取设备波长") - self.popDialog( " 没有设备波长信息，请获取设备波长") - raise MyException(" 没有设备波长信息，请获取设备波长") + self.alterStatus_0( "开始采集数据....") + if self.myviper.viper.register is None: + self.alterStatus_0( " 请先打开串口,再试") + raise MyException(f" 请先打开串口,再试") + if not self.myviper.devicesn_ok: + self.alterStatus_0( " 设备SN 与系统不匹配") + raise MyException(f"设备SN 与系统不匹配") + if self.myviper.viper.rawWavelength is None: + raise MyException(f"没有波长信息") + + ## 获取纯水标定文件 + self.__read_cal_file() + self.__OnDeviceLog() # 如何整点获取，如何快速获取 @@ -449,30 +491,42 @@ class YiwinFrame( wx.Frame ): pass def __OnDeviceLog(self,)-> None: - self.device_data = b'' - self.mt = Mythead() - self.viper.set_cfg( self.syscfg ) - self.viper.set_serial() - try: - self.viper.log_uart_thread( self.get_device_data ) - except Exception as e: - self.alterStatus_0(e ) - self.popDialog( e ) - pass - - def get_device_data( self,tm, data_buf ): - if len(data_buf) != 0: - self.device_data = self.viper.convert_buf_2_float( data_buf,8 ) - self.plotpanel.clear_past() - self.plotpanel.plot_one( - tm - , self.output_wl_ndarray - ,np.array(data_buf) - ) - else: - log.error( " 采集设备数据出错 " ) - raise MyException(" 采集设备数据出错 ") - pass + self.uart_thread.remove_tasks() + + self.res = b'' + for i in range(self.myviper.viper.register.count): + log.debug(f" -> i {i}", __name__,"OnDeviceWL") + self.uart.set_modbus( self.myviper.viper.register.slaveaddress,self.myviper.viper.register.functioncode + ,self.myviper.viper.register.DataBeginAddress + i*122, 122 ) + log.debug(f" command -> {self.uart.command.hex()} ") + self.uart_thread.add_task( self.__device_log, args=() ) + self.uart_thread.sequently_execute_tasks() + # 处理self.res, 将self.res 返回 myviper + self.myviper.viper.register.intensityBuf = self.res + self.myviper.get_raw_intensity_from_buf() + + + def __device_log(self, )-> None: + # self.res =b'' + self.uart.disconnect() + self.uart.connect() + self.uart.write() + tmp = self.uart.OneMeasure() + self.res = self.res + tmp[3:len(tmp)-2] + + # def get_device_data( self,tm, data_buf ): + # if len(data_buf) != 0: + # self.device_data = self.viper.convert_buf_2_float( data_buf,8 ) + # self.plotpanel.clear_past() + # self.plotpanel.plot_one( + # tm + # , self.output_wl_ndarray + # ,np.array(data_buf) + # ) + # else: + # log.error( " 采集设备数据出错 " ) + # raise MyException(" 采集设备数据出错 ") + # pass def OnDeviceStop(self, e)-> None: self.__OnDeviceStop() @@ -680,186 +734,4 @@ class YiwinFrame( wx.Frame ): with wx.MessageDialog( self, msg, msg_type, wx.OK )as dlg: dlg.ShowModal() - - - -# class SerialThread(threading.Thread): -# """进度条类 """ -# def __init__(self, parent): -# """ -# :param parent: 主线程UI -# """ -# super(SerialThread, self).__init__() # 继承 -# self.parent = parent -# # log.info(f"SerialThread ... {self.parent.kh}") -# self.start() -# self.join() -# # self.setDaemon(True) # 设置为守护线程， 即子线程是守护进程，主线程结束子线程也随之结束。 - - -# def stop(self): -# self.parent.kh.disconnect() -# log.info(" Serial stop.... ") -# pass - - # def run(self): - # log.info(" Serial run.... ") - # wx.CallAfter(self.parent.OnRcv) - - # wx.CallAfter(self.parent.update_process_bar, count) # 调用parent的函数 - # wx.CallAfter(self.parent.close_process_bar) # destroy进度条 - - # def OnSerialThreadStart(self): - # self.m = SerialThread(self) - # pass - - # def OnSerialThreadStop(self): - # self.m.stop() - # pass - - # def OnDisplaySave(self): - # ''' - # 保存数据 self.result - # ''' - # log.info(f"OnDisplaySave ....") - # # self.m = SerialThread(self) - # # self.kh.flush() - # self.OnSerialThreadStart() - - - # def OnRcv( self ): - # log.info(f"OnRcv....") - # self.kh.setPort(self.port) - # if not self.OnDetectPort: - # MyException(f"Can not find port : {self.port}") - # log.info(f"{self.port} ok!") - # # if not self.kh: - # # self.kh = KH3000(self.port) - # # self.result = self.kh.OneMeasure() - # log.info( f"OnRcv success {self.result}", __class__.__name__ ) - # self.OnSave() - # self.OnDisplay() - # pass - - - # def __get_data_files(self,) -> list: - # # 读取配置文件 - # file_lst = [] - # self.mydir.setBaseDir( Path(self.datadir) ) - # file_lst = self.mydir.get_files_from_currentdir(fmt= "*/*.DAT") - # return file_lst - - # def __check_sn_from_datafile(self,fpath) -> bool: - # # 读取配置文件 - # sn = ReadCal.readFileSNbyIDDevice(fpath) - # if sn == self.ui_sn: - # return True - # return False - - # def __get_raw_wl_from_datafile(self,fpath) -> list: - # # 读取配置文件 - # _,raw_wl = ReadCal.read_columns_set_by_mark(fpath, FILE_MARK,0) - # return raw_wl - - # def __deal_file_lst(self,file_lst): - - # for fl in file_lst: - # # 判断序列号是否一致file_lst - # if not self.__check_sn_from_datafile(fl): - # self.onNotify("文件的序列号和系统设置不一致" ) - # self.popDialog(" 文件的序列号和系统设置不一致") - # raise MyException("文件的序列号和系统设置不一致") - - # # 判断原始波长是否为空 - # if self.raw_wavelength == []: - # res = self.__get_raw_wl_from_datafile(file_lst[0]) - # self.raw_wavelength = res[0] - - # # 处理输出文件 - # self.mydir.setBaseDir(self.output_dir) - # self.mydir.newDirIfNot() - # self.mydir.newFileIfNot(self.ui_sn+SAVE_EXT_NAME) - # if self.syscfg['retrieve']['enable'] == 0: - # self.mydir.setHeader(self.raw_wavelength,TOKEN,self.ui_sn) - # if self.mydir.checkHeader()==0: - # self.mydir.writeHeader() - # if self.mydir.checkHeader()==-1: - # self.popDialog(" 文件头不一致， 请备份到其他目录，并在该目录下删除") - # raise MyException(" 文件头不一致， 请备份到其他目录，并在该目录下删除") - # res_time,res_data = ReadCal.read_columns_sets_by_mark( fl, FILE_MARK, 1 ) - # for i in range( len(res_time) ): - # self.__deal_one_measure_time_data(res_time[i], res_data[i]) - # pass - # pass - # # 需要插值处理波长 - # if self.syscfg['retrieve']['enable'] == 1: - # self.mydir.setHeader(self.new_wavelength.tolist(),TOKEN,self.ui_sn) - # if self.mydir.checkHeader()==0: - # self.mydir.writeHeader() - # if self.mydir.checkHeader()==-1: - # self.popDialog(" 文件头不一致， 请备份到其他目录，并在该目录下删除") - # raise MyException(" 文件头不一致， 请备份到其他目录，并在该目录下删除") - - # # res_data 不用带回调的函数callback 会导致多组数据拼接？？ - # res_time,res_data = ReadCal.read_columns_sets_by_mark( fl, FILE_MARK, 1 ) - - # log.warning(f" ==== {len(res_time)}" ) - # log.warning(res_time) - # log.warning(f" ==== {len(res_data[0])}" ) - # log.warning(f" ==== { res_data[0] }" ) - - # for i in range( len(res_time) ): - # self.__deal_one_measure_time_data(res_time[i], res_data[0][i]) - # pass - # pass - - # def __deal_one_measure_time_data(self,res_time,res_data): - # if self.syscfg['retrieve']['enable'] == 0: - # self.mydir.setContent(res_data ,TOKEN,res_time ) - # self.mydir.writeContent() - # # 插值处理 - # if self.syscfg['retrieve']['enable'] == 1: - # # tmp_data = np.interp( self.new_wavelength, np.array(self.raw_wavelength) , np.array(res_data) ) - - # x = self.new_wavelength - # xp = np.array(self.raw_wavelength).astype(np.float32) - # fp = np.array(res_data).astype(np.float32) - # log.warning(f" {x}") - # log.warning(f" {xp.shape }") - # log.warning(f" { fp.shape }") - # tmp_data = np.interp( x, xp , fp ) - # # tmp_data = np.interp( self.new_wavelength.tolist(), self.raw_wavelength , res_data[0] ) - # self.mydir.setContent( tmp_data ,TOKEN, res_time ) - # self.mydir.writeContent() - # pass - - - # def __deal_one_file(self,fpath): - # res_time,res_data = ReadCal.read_columns_sets_by_mark( fpath, FILE_MARK, 1 ) - # for i in range( len(res_time) ): - # if self.syscfg['retrieve']['enable'] == 0: - # self.mydir.setContent(res_data[i],TOKEN,res_time[i]) - # self.mydir.writeContent() - # # 插值处理 - # if self.syscfg['retrieve']['enable'] == 1: - # self.mydir.setContent(res_data[i],TOKEN,res_time[i]) - # self.mydir.writeContent() - # pass - # pass - - # def __set_serial(self, )-> None: - # self.uart.set_serial_para( - # self.syscfg['comsetting']['port'] - # ,self.syscfg['comsetting']['baudrate'] - # ,self.syscfg['comsetting']['bytesize'] - # ,self.syscfg['comsetting']['parity'] - # ,self.syscfg['comsetting']['stopbit'] - # ) - - # def __set_modbus(self, beginaddress, step)-> None: - # self.uart.set_modbus( - # self.syscfg['register']['slaveadress'] - # ,self.syscfg['register']['functioncode'] - # ,beginaddress - # ,step - # ) \ No newline at end of file + \ No newline at end of file