From 82001df75329fcda0010b825a0a10024755b5e04 Mon Sep 17 00:00:00 2001
From: esea_info <info@eseaoptics.com>
Date: Tue, 13 Jun 2023 15:31:14 +0800
Subject: [PATCH] savedir

---
 awrams.py | 70 -------------------------------------------------------
 1 file changed, 70 deletions(-)

diff --git a/awrams.py b/awrams.py
index 7c2818e..41b4169 100644
--- a/awrams.py
+++ b/awrams.py
@@ -702,77 +702,7 @@ class HandheldHandle(object):
         pass
 
     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:
-                # 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
-        self.__set_msg('notice', '处理文件完成')
-        pub.sendMessage('update' , msg=self.msg)
-        log.info(f"Finished !! ", __name__, "dealAllMeasurements")
-        return True,self.error_result
-        pass
 
-    def dealOneHandheldMeasurement(self, fpath:Path):
-        '''handheld一次测量包含多组数据'''
-        # 调用handheldbuf 处理，将一组数据提交出来
-        log.info(f" 处理一个文件，多组测量数据", __name__, "dealOneHandheldMeasurement")
-        if len(self.filelist)<1:
-            pass
-
-        # 当前文件名 
-        self.output_path = OUTPUT_DIR
-        self.current_filepath = fpath
-        self.current_measure_time = self.hhp.getCurrentMeasureTimeFromPath(fpath)    
-        self.get_ymdhms()
-        self.output_path = self.output_path.joinpath( self.ymdhms )
-        log.debug(f"current_measure_time: {self.current_measure_time}", __name__, "dealOneHandheldMeasurement")
-        
-        self.hhb.readFile2Buf(fpath)
-        log.debug(f"buf: {self.hhb.get_buf_size()}", __name__, "dealOneHandheldMeasurement")
-        self.decode_sensor_buf()
-
-        # 解析Buf, 对buf分组，获得[{lsky: esky : lwater} ....  ]
-        len_total = len(self.intensity_before_avg)
-        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 
- """
     
 class ExternalFun(object):
     def __init__(self, aw:AWRAMSData=None):