dev

plot/app.py

@@ -67,7 +67,7 @@ def ch_ratio():
         start_time, end_time, card_types, spec, filter_wave = parse_parmeter()
         chnames = request.args.get('chnames')
         chnames = filter_chname(chnames)
-        show_all = request.args.get('show_all')
+        only_all = request.args.get('only_all')
 
         painter = ChannelCumPainter(start_time=start_time, end_time=end_time, chnames=chnames, card_types=card_types, spec=spec,
                                     filter_wave=filter_wave)
@@ -106,11 +106,11 @@ def ch_covratio():
         start_time, end_time, card_types, spec, filter_wave = parse_parmeter()
         chnames = request.args.get('chnames')
         chnames = filter_chname(chnames)
-        show_all = request.args.get('show_all')
-        show_all = False if show_all is None else bool(show_all)
+        only_all = request.args.get('only_all')
+        only_all = False if only_all is None else bool(only_all)
 
         painter = ChannelCovPainter(start_time=start_time, end_time=end_time, chnames=chnames, card_types=card_types, spec=spec,
-                                    filter_wave=filter_wave,show_all=show_all)
+                                    filter_wave=filter_wave,only_all=only_all)
         buf, ratios = painter.paint()
         data = base64.b64encode(buf.getbuffer()).decode("ascii")
 
@@ -167,12 +167,11 @@ def net_channels():
 @app.route('/plot/mchids')
 def mchids():
     try:
-        mchids = get_mchids()
-        return jsonify(mchids)
+        logger.debug('start mchids')
+        result = get_mchids()
+        return jsonify({'mchids': result, 'state': 'success'})
     except Exception as ex:
-        logger.error(ex)
-        return jsonify([])
-
+        return onError(ex)
 
 @app.route('/plot/mch_ratio')
 def mch_ratio():

plot/refill/ChannelCovPainter.py

@@ -15,10 +15,10 @@ logger = logging.getLogger('ChannelCumPainter')
 
 class ChannelCovPainter(ChannelPainter):
     def __init__(self, start_time: int, end_time: int, chnames: set = None, card_types: set = None, spec: int = None, filter_wave: int = None,
-                 show_all: bool = False):
+                 only_all: bool = False):
         self._reader = ChannelReader()
         filter_wave = filter_wave or 3600
-        self._chnames, self._card_types, self._spec, self._filter_wave, self._show_all = chnames, card_types, spec, filter_wave, show_all
+        self._chnames, self._card_types, self._spec, self._filter_wave, self._only_all = chnames, card_types, spec, filter_wave, only_all
         days, self._start_time, self._end_time, self._interval = self.calc_time(self._reader, start_time, end_time)
         pass
 
@@ -28,7 +28,7 @@ class ChannelCovPainter(ChannelPainter):
         if len(days) == 0:
             return BytesIO()
 
-        filter = ChPathFilter(self._chnames, self._card_types, self._spec, self._show_all)
+        filter = ChPathFilter(self._chnames, self._card_types, self._spec, self._only_all)
         tuple_pathes = reader.many_tuple_path(days, self._chnames, self._card_types, self._spec)
         gen = ratio_pathes(reader, tuple_pathes, days, filter)
         day_stamp = days[0]
@@ -60,6 +60,7 @@ class ChannelCovPainter(ChannelPainter):
 
         chname_ratios = sorted(chname_ratios, key=lambda x: (x[1], x[0]), reverse=True)
         result = []
+
         for name, ratio in chname_ratios:
             result.append(f'{name}:{ratio}')
         return buf, result

plot/refill/ChannelCumPainter.py

@@ -13,10 +13,10 @@ logger = logging.getLogger('ChannelCumPainter')
 
 class ChannelCumPainter(ChannelPainter):
     def __init__(self, start_time: int, end_time: int, chnames: set = None, card_types: set = None, spec: int = None, filter_wave: int = None,
-                 show_all: bool = False):
+                 only_all: bool = False):
         self._reader = ChannelReader()
         filter_wave = filter_wave or 0
-        self._chnames, self._card_types, self._spec, self._filter_wave,self._show_all = chnames, card_types, spec, filter_wave,show_all
+        self._chnames, self._card_types, self._spec, self._filter_wave,self._only_all = chnames, card_types, spec, filter_wave,only_all
         days, self._start_time, self._end_time, self._interval = self.calc_time(self._reader, start_time, end_time)
         pass