dev

plot/refill/ChSpeedControlCalc.py

@@ -23,7 +23,7 @@ class ChSpeedControlCalc(ChannelCalc):
         start_period, ratio_period, speed_period, monitor_period, cdf_speed_period = ch_calc_cfgs()
 
         reader = self._reader()
-        end_time = int(time.time()) - 6 * 86400
+        end_time = int(time.time()) #- 6 * 86400
         days, start_time, end_time = self.calc_time(reader, end_time - start_period, end_time)
 
         day_stamp = days[0]

plot/refill/ch_type_spec.py

@@ -56,7 +56,8 @@ class ch_type_spec(object):
     def detail_dim(self):
         result = []
         for key,item in self._detail.items():
-            result.append(key)
+            if key is not 0:
+                result.append(key)
         return result
 
     def is_dim_zero(self):

plot/refill/chs_manager.py

@@ -9,7 +9,7 @@ class chs_manager(object):
         pass
 
     def add(self,name, card_type, spec, data,end_pos):
-        key_gen = lambda card_type,spec: f'{card_type}-{spec}'
+        key_gen = lambda card_type,spec: f'{spec}-{card_type}'
         key = key_gen(card_type,spec)
         if key in self.channels:
             subch = self.channels[key]

plot/refill/chs_type_spec.py

@@ -214,7 +214,7 @@ class type_spec_chs(object):
         total = 0
         for key, item in self._chs.items():
             total += item.cur_speed()
-        logger.debug(f'{self._card_type}-{self._spec} speed={total}')
+        logger.debug(f'{self._spec}-{self._card_type} speed={total}')
         return total
 
     def get_reckon(self):