From b1b641d28bc13b0443db7e5b1100da778c614e72 Mon Sep 17 00:00:00 2001 From: esea_info Date: Fri, 14 Apr 2023 10:03:22 +0800 Subject: [PATCH] handheld.py yhdhms-self.ymdhms --- handheld.py | 66 ++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/handheld.py b/handheld.py index b48ff69..d056c5a 100644 --- a/handheld.py +++ b/handheld.py @@ -434,38 +434,38 @@ class Handheld(object): # self.printTest(self.filelist) pass - def dealAllMeasurements(self, ): - log.info(f" 所有测量文件", __name__, "dealAllMeasurements", ) - if len(self.filelist)<1: - pass - # 前面已经考虑各种文件错误 - for df in self.filelist: - # 处理信息帧 - self.info_dict = {} - self.info_path_fname:Path = df["info_path"] - self.sensor_path_fname:Path = df["sensor_path"] - hex_info = self.read_bin( self.info_path_fname ) - try: - self.info_dict = self.decode_info( hex_info ) - except: - log.error( f"处理信息文件" - + "/" +self.info_path_fname.stem - + "出现错误", __name__, "dealAllMeasurements" ) - raise MyException( "处理文件"+ self.info_path_fname + "出现错误") - pass + # def dealAllMeasurements(self, ): + # log.info(f" 所有测量文件", __name__, "dealAllMeasurements", ) + # if len(self.filelist)<1: + # pass + # # 前面已经考虑各种文件错误 + # for df in self.filelist: + # # 处理信息帧 + # self.info_dict = {} + # self.info_path_fname:Path = df["info_path"] + # self.sensor_path_fname:Path = df["sensor_path"] + # hex_info = self.read_bin( self.info_path_fname ) + # try: + # self.info_dict = self.decode_info( hex_info ) + # except: + # log.error( f"处理信息文件" + # + "/" +self.info_path_fname.stem + # + "出现错误", __name__, "dealAllMeasurements" ) + # raise MyException( "处理文件"+ self.info_path_fname + "出现错误") + # pass - try: # awrams每次只有一组数据 - self.dealOneMeasurement(self.sensor_path_fname ) - # self.measurement_interval = int(self.info_dict['Measure_Interval']) - # self.measurement_repeat = int(self.info_dict['Measure_Repeat']) - # self.dealOneHandheldMeasurement(self.sensor_path_fname ) - except Exception as e: - log.error( "处理传感器文件" + self.sensor_path_fname.name + " 出现错误",__name__,"dealAllMeasurements") - raise MyException( "处理传感器文件" + self.sensor_path_fname.name + " 出现错误" ) - pass - log.info(f"Finished !! ", __name__, "dealAllMeasurements") - return True,self.error_result - pass + # try: # awrams每次只有一组数据 + # self.dealOneMeasurement(self.sensor_path_fname ) + # # self.measurement_interval = int(self.info_dict['Measure_Interval']) + # # self.measurement_repeat = int(self.info_dict['Measure_Repeat']) + # # self.dealOneHandheldMeasurement(self.sensor_path_fname ) + # except Exception as e: + # log.error( "处理传感器文件" + self.sensor_path_fname.name + " 出现错误",__name__,"dealAllMeasurements") + # raise MyException( "处理传感器文件" + self.sensor_path_fname.name + " 出现错误" ) + # pass + # log.info(f"Finished !! ", __name__, "dealAllMeasurements") + # return True,self.error_result + # pass def dealOneMeasurement_Handheld(self, ): '''handheld一次测量包含多组数据''' @@ -490,7 +490,7 @@ class Handheld(object): self.hhp.setMode(1) self.current_measure_time = self.getCurrentMeasureTimeFromInfoDict() - ymdhms = "20"+ str(self.info_dict['year']) + '_' \ + self.ymdhms = "20"+ str(self.info_dict['year']) + '_' \ + str(self.info_dict['month']) + '_' \ + str(self.info_dict['day']) + '_' \ + str(self.info_dict['hour']) + '_' \ @@ -498,7 +498,7 @@ class Handheld(object): + str(self.info_dict['second']) # self.output_path 定位到 /data/output 目录？ - self.output_path = OUTPUT_DIR.joinpath( ymdhms) + self.output_path = OUTPUT_DIR.joinpath( self.ymdhms) log.debug(f"current_measure_time: {self.current_measure_time}", __name__, "dealOneMeasurement_Handheld")