Issue 101: do not change channel order (#102)

* dont change order of channels in the MG configuration

* remove printouts

* update tests

* add lmp into ExtraSettings tests

ChangeLog

@@ -1,3 +1,7 @@
+2023-08-10 Jan Kotanski <[email protected]>
+	* dont change order of channels in the MG configuration (#101)
+	* tagged as v3.33.0
+
 2023-08-08 Jan Kotanski <[email protected]>
 	* set MasterTimerFirst to true (#99)
 	* tagged as v3.32.0

nxsrecconfig/ProfileManager.py

@@ -515,7 +515,6 @@ def __addPreselectedComponents(self, components):
         if pdss != self.__selector["DataSourcePreselection"]:
             self.__selector["DataSourcePreselection"] = pdss
             changed = True
-        # print(changed)
         return changed
 
     def fetchProfile(self):
@@ -626,7 +625,9 @@ def __setFromMntGrpConf(self, jconf, compdatasources=None):
         self.__updatePools()
         conf = json.loads(jconf)
         otimers = None
+        ochs = None
         timers = {}
+        idch = {}
 
         dsg = json.loads(self.__selector["DataSourceSelection"])
         hel = set(json.loads(self.__selector["UnplottedComponents"]))
@@ -644,10 +645,11 @@ def __setFromMntGrpConf(self, jconf, compdatasources=None):
            (not self.masterTimer or "timer" in conf.keys()):
             avtimers = PoolUtils.getTimers(self.__pools, self.timerFilters)
             tangods = self.__readChannels(
-                conf, timers, dsg, hel, synchronizer, synchronization)
+                conf, timers, dsg, hel, synchronizer, synchronization, idch)
             self.__readTangoChannels(
                 conf, tangods, dsg, hel, synchronizer, synchronization)
             otimers = self.__reorderTimers(conf, timers, dsg, hel, avtimers)
+            ochs = self.__reorderChannels(idch)
 
         props["synchronizer"] = synchronizer
         props["synchronization"] = synchronization
@@ -672,6 +674,11 @@ def __setFromMntGrpConf(self, jconf, compdatasources=None):
             if self.__selector["Timer"] != jtimers:
                 self.__selector["Timer"] = jtimers
                 changed = True
+        if ochs is not None:
+            jochs = json.dumps(ochs)
+            if self.__selector["OrderedChannels"] != jochs:
+                self.__selector["OrderedChannels"] = jochs
+                changed = True
         if self.__selector["MntGrp"] not in \
            self.__configServer.availableSelections():
             changed = True
@@ -705,7 +712,7 @@ def __clearChannels(self, dsg, hel, compdatasources=None):
                 hel.remove(ch)
 
     def __readChannels(self, conf, timers, dsg, hel, synchronizer,
-                       synchronization):
+                       synchronization, idch=None):
         """ reads channels from mntgrp configutation
 
         :param conf: mntgrp configuration
@@ -721,6 +728,8 @@ def __readChannels(self, conf, timers, dsg, hel, synchronizer,
         :param synchronization: channel synchronization,
                 i.e. Trigger=0, Gate=1, Start=2
         :type synchronization: :obj:`dict` <:obj:`str`, :obj:`int`>
+        :param idch: index channels
+        :type idch: :obj:`dict` <:obj:`int`, :obj:`str`>
         :returns: tango datasources list with elements (name, label, source)
         :rtype: :obj:`list` < [:obj:`str` , :obj:`str` , :obj:`str` ] >
         """
@@ -748,6 +757,8 @@ def __readChannels(self, conf, timers, dsg, hel, synchronizer,
                             hel.add(ch['name'])
                         elif ch['name'] in hel:
                             hel.remove(ch['name'])
+                        if idch is not None and 'index' in ch:
+                            idch[int(ch["index"])] = ch['name']
                         if 'synchronizer' in ctrl \
                            and ctrl['synchronizer'].lower() != 'software':
                             synchronizer[ch['name']] = ctrl['synchronizer']
@@ -758,7 +769,7 @@ def __readChannels(self, conf, timers, dsg, hel, synchronizer,
         return tangods
 
     def __readTangoChannels(self, conf, tangods, dsg, hel, synchronizer,
-                            synchronization):
+                            synchronization, idch=None):
         """ reads Tango channels from mntgrp configutation
 
         :param conf: mntgrp configuration
@@ -772,6 +783,8 @@ def __readTangoChannels(self, conf, tangods, dsg, hel, synchronizer,
         :type synchronizer: :obj:`dict` <:obj:`str`, :obj:`str`>
         :param synchronization: channel synchronization, i.e. Trigger=0, Gate=1
         :type synchronization: :obj:`dict` <:obj:`str`, :obj:`int`>
+        :param idch: index channels
+        :type idch: :obj:`dict` <:obj:`int`, :obj:`str`>
         :param hel: list of hidden elements
         :type hel: :obj:`list` <:obj:`str`>
         """
@@ -795,6 +808,8 @@ def __readTangoChannels(self, conf, tangods, dsg, hel, synchronizer,
                                     hel.add(name)
                                 elif ch['name'] in hel:
                                     hel.remove(name)
+                                if idch is not None and 'index' in ch:
+                                    idch[int(ch["index"])] = ch['name']
                                 if 'synchronizer' in ctrl and \
                                    ctrl['synchronizer'].lower() != 'software':
                                     synchronizer[name] = \
@@ -839,6 +854,37 @@ def __reorderTimers(self, conf, timers, dsg, hel, avtimers=None):
                     hel.remove(tm)
         return otimers
 
+    def __reorderChannels(self, idch):
+        """ reorder ordered channels
+
+        :param idch: index channels
+        :type idch: :obj:`dict` <:obj:`int`, :obj:`str`>
+        :returns: new orderedchannels
+        :rtype: :obj:`list` <:obj:`str`>
+        """
+        lindex = -1
+        pchannels = None
+        if hasattr(idch, "items"):
+            pchs = json.loads(self.__selector["OrderedChannels"])
+            pchannels = []
+            for ch in pchs:
+                if ch not in pchannels:
+                    pchannels.append(ch)
+            sidch = sorted(idch.items())
+            for ind, name in sidch:
+                if name not in pchannels:
+                    lindex += 1
+                    pchannels.insert(lindex, name)
+                else:
+                    oind = pchannels.index(name)
+                    if oind < lindex:
+                        pchannels.pop(oind)
+                        pchannels.insert(lindex, name)
+                    else:
+                        lindex = oind
+
+        return pchannels
+
     def __checkClientRecords(self, datasources, description):
         """ checks client records
 

nxsrecconfig/Release.py

@@ -20,4 +20,4 @@
 """  NeXus Sardana Recorder Settings - Release """
 
 #: (:obj:`str`) package version
-__version__ = "3.32.0"
+__version__ = "3.33.0"