Changeset 1146:0321756c76fe

Timestamp:

04/24/24 13:54:14 (8 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Support for delay codes that require explanations (re #386)

Files:

• dcdatagen.py (modified) (5 diffs)
• locale/en/mlx.po (modified) (1 diff)
• locale/hu/mlx.po (modified) (1 diff)
• src/mlx/gui/delaycodes.py (modified) (5 diffs)

dcdatagen.py

@@ -27 +27 @@
 # Row type: an actual delay code
 DELAYCODE = 2
+
+# Row type: an actual delay code requiring a textual explanation
+DELAYCODE_EXPLANATION_REQUIRED = 3
 
 #----------------------------------------------------------------------------
@@ -702 +705 @@
                     print("msgid \"%srow%d\"" % (poPrefix, rowIndex), file=poFile)
                     generateMsgStr(poFile, columns[i])
-            elif type==DELAYCODE:
+            elif type in [DELAYCODE, DELAYCODE_EXPLANATION_REQUIRED]:
                 columnIndex = 0
                 for column in columns:
@@ -739 +742 @@
                     continue
 
-                if type==DELAYCODE:
+                if type in [DELAYCODE, DELAYCODE_EXPLANATION_REQUIRED]:
                     print("    \"%s\": \"%s\"," % \
                       (str(columns[codeIndex]).strip(), columns[meaningIndex][0].replace("\n", "")), file=dcdata)
@@ -756 +759 @@
         tableMask = 1
         for i in range(0, len(tablePrefixes)):
+            print("_%s_code2explanationRequired = {" % (tablePrefixes[i],), file=dcdata)
+
+            columnIndexes = []
+            for j in range(0, len(headings)):
+                if ( (headingFlags[j]&tableMask)==tableMask ):
+                    columnIndexes.append(j)
+
+            codeIndex = columnIndexes[0]
+            meaningIndex = columnIndexes[2]
+
+            rowIndex = 0
+            for (type, mask, columns) in rows:
+                if (mask&tableMask)!=tableMask:
+                    continue
+
+                if type in [DELAYCODE, DELAYCODE_EXPLANATION_REQUIRED]:
+                    print("    \"%s\": %s," % \
+                          (str(columns[codeIndex]).strip(),
+                           "True" if type==DELAYCODE_EXPLANATION_REQUIRED else
+                           "False"),
+                          file = dcdata)
+
+            print("}", file=dcdata)
+            print(file=dcdata)
+
+            tableMask <<= 1
+
+        print("def _isExplanationRequired(table, row):", file=dcdata)
+        print("    code = row[0].strip()", file=dcdata)
+        print("    return table[code] if code in table else false", file=dcdata)
+        print(file=dcdata)
+
+        tableMask = 1
+        for i in range(0, len(tablePrefixes)):
 
             print("_%s_data = (" % (tablePrefixes[i],), file=dcdata)
-            print("    lambda row: _extract(_%s_code2meaning, row)," % \
+            print("    (lambda row: row[0].strip(),", file=dcdata)
+            print("     lambda row: _extract(_%s_code2meaning, row)," % \
+              (tablePrefixes[i],), file=dcdata)
+            print("     lambda row: _isExplanationRequired(_%s_code2explanationRequired, row))," % \
               (tablePrefixes[i],), file=dcdata)
             print("    [", end=' ', file=dcdata)
@@ -783 +823 @@
                     print("        (CAPTION, xstr(\"%srow%d\"))," % \
                       (poPrefix, rowIndex), file=dcdata)
-                elif type==DELAYCODE:
+                elif type in [DELAYCODE, DELAYCODE_EXPLANATION_REQUIRED]:
                     print("        (DELAYCODE, [", file=dcdata)
                     for j in columnIndexes:

locale/en/mlx.po

@@ -1404 +1404 @@
 msgid "info_delay"
 msgstr "Delay codes"
+
+msgid "info_delay_explain"
+msgstr "Delay code: %s"
 
 msgid "statusbar_conn_tooltip"

locale/hu/mlx.po

@@ -1407 +1407 @@
 msgid "info_delay"
 msgstr "Késés kódok"
+
+msgid "info_delay_explain"
+msgstr "Késés kód: %s"
 
 msgid "statusbar_conn_tooltip"

src/mlx/gui/delaycodes.py

@@ -191 +191 @@
         self._alignments = []
         self._checkButtons = []
+        self._codesToExplain = []
 
         self._eventBox = Gtk.EventBox()
@@ -203 +204 @@
 
         self._previousWidth = 0
+
+    @property
+    def _delayCodeRows(self):
+        """Get a list of the row indexes in the delay code data table of
+        the delay codes that are enabled."""
+        rows = []
+
+        for checkButton in self._checkButtons:
+            if checkButton.get_active():
+                rows.append(checkButton.delayCodeRow)
+
+        return rows
 
     @property
@@ -210 +223 @@
 
         if self._delayCodeData is not None:
-            codeExtractor = self._delayCodeData[0]
-            for checkButton in self._checkButtons:
-                if checkButton.get_active():
-                    codes.append(codeExtractor(checkButton.delayCodeRow))
+            codeExtractor = self._delayCodeData[0][1]
+            for row in self._delayCodeRows:
+                codes.append(codeExtractor(row))
 
         return codes
@@ -337 +349 @@
     def _delayCodesChanged(self, button):
         """Called when one of the delay codes have changed."""
-        numDelayCodes = len(self.delayCodes)
+        delayCodeRows = self._delayCodeRows
+        numDelayCodes = len(delayCodeRows)
         if numDelayCodes>=4:
             for checkButton in self._checkButtons:
@@ -346 +359 @@
                 checkButton.set_sensitive(True)
 
+        codeExtractor = self._delayCodeData[0][0]
+        isExplanationRequired = self._delayCodeData[0][2]
+        codesToExplain = []
+        for row in delayCodeRows:
+            if isExplanationRequired(row):
+                code = codeExtractor(row)
+                codesToExplain.append(code)
+                if code not in self._codesToExplain:
+                    self._info.addFault("dc_" + code,
+                                        xstr("info_delay_explain") % (code,))
+
+        for code in self._codesToExplain:
+            if code not in codesToExplain:
+                self._info.clearFault("dc_" + code)
+        self._codesToExplain = codesToExplain
+
         self._info.delayCodesChanged()