diff --git a/handheld.py b/handheld.py index 12154db..433b7eb 100644 --- a/handheld.py +++ b/handheld.py @@ -500,7 +500,7 @@ class Handheld(object): # self.output_path 定位到 /data/output 目录? self.output_path = OUTPUT_DIR.joinpath( self.ymdhms) - log.debug(f"current_measure_time: {self.current_measure_time}", __name__, "dealOneMeasurement_Handheld") + log.warning(f"current_measure_time: {self.current_measure_time}", __name__, "dealOneMeasurement_Handheld") self.hhb.readFile2Buf(sensor_path) log.debug(f"buf: {self.hhb.get_buf_size()}", __name__, "dealOneMeasurement_Handheld") @@ -526,8 +526,9 @@ class Handheld(object): # 分组进行处理 for i in range(group_num): self.current_group_num = i - # 重设当前测量时间 - self.current_measure_time = "" + # 重设当前测量时间 ,measurement_interval 间隔为s + self.real_time = self.get_current_time_by_i_interval( i,self.measurement_interval) + log.warning(f" real time -> {self.real_time}") self.res = {} tmp_before_avg = [] for j in range( self.measurement_repeat ): @@ -543,6 +544,11 @@ class Handheld(object): path_info_txt = self.output_path.joinpath( "info.txt" ) self.save_dict_to_file( self.info_dict, path_info_txt ) + def get_current_time_by_i_interval(self, i, interval): + self.my_time.setCurrentTimeStr(self.current_measure_time) + self.my_time.timeDelta(seconds=i*interval) + return self.my_time.cur_time_str + pass def dealOneGroup(self, ): # 分组,并获得平均值, 255个未插值结果 (依据 measurement_interval measurement_repeat) @@ -580,7 +586,7 @@ class Handheld(object): + str(self.info_dict['minute']) + '_' \ + str(self.info_dict['second']) self.output_path = self.output_path.joinpath( self.ymdhms ) - log.debug(f"current_measure_time: {self.current_measure_time}", __name__, "dealOneHandheldMeasurement") + log.warning(f"current_measure_time: {self.current_measure_time}", __name__, "dealOneHandheldMeasurement") self.hhb.readFile2Buf(fpath) self.decode_sensor_buf() @@ -795,12 +801,13 @@ class Handheld(object): pass # 写入数据content - self.mydir.setContent(self.res[func].tolist(), TOKEN, self.current_measure_time) + log.warning(f" write content time {self.real_time}") + self.mydir.setContent(self.res[func].tolist(), TOKEN, self.real_time) self.mydir.writeContent() def appendFileByFunc(self, func:str) -> None: # 追加写入数据content - self.mydir.setContent(self.res[func].tolist(), TOKEN, self.current_measure_time) + self.mydir.setContent(self.res[func].tolist(), TOKEN, self.real_time) self.mydir.writeContent() def clearRes(self, ) -> None: