diff --git a/handheld.py b/handheld.py index e03cbdd..e3845ef 100644 --- a/handheld.py +++ b/handheld.py @@ -350,7 +350,11 @@ class HandHeldPath(object): class HandHeld(object): def __init__(self, ): """ - @description : 手持数据初始化 + @description : 手持数据初始化,桌面端 + 入口: dealAllMeasurements() + dealOneHandheldMeasurement() 处理一次测量 + 保存: 一次测量多组不同时间的 Lsky ,只能分文件保存 + 分文件保存优点,一次拿到全部Rs. 服务器端?? """ self.device_type = DeviceType.SURFACE.name self.device_enum = None @@ -445,6 +449,7 @@ class HandHeld(object): try: # 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 ) @@ -485,13 +490,15 @@ class HandHeld(object): if len_total%self.measurement_repeat != 0: self.res = {} return # 返回退出 + + # 依据总的次数 除重复次数,获得总的测了多少组数据 group_num = int(len_total/self.measurement_repeat) log.info(f"group_num -> {group_num}, ervery group -> {self.measurement_repeat} ", __name__, "dealOneHandheldMeasurement") self.real_wavelength = self.getWavelenthDict() - if group_num == 1: - self.dealOneGroup() # self.intensity_before_avg - return + # if group_num == 1: + # self.dealOneGroup() # self.intensity_before_avg + # return self.dealMultiGroup(group_num) @@ -511,6 +518,7 @@ class HandHeld(object): self.getAvg(tmp_before_avg) self.__do_sensor_dict_interpo() + # 选择追加保存, 一个Lsky 可能多组文件,只能单独保存为 Lsky Esky ..Rs self.appendSave() # self.checkAndSaveData( ) # self.getLwRsAndSave()