Merge branch 'fix46lgtmissues' into feature98-refactortotables

Adding in recent lgtm changes to UI fixes branch

GroundSystem.py

@@ -105,7 +105,6 @@ def startCmdSystem():
     def startFDLSystem(self):
         selectedSpacecraft = self.getSelectedSpacecraftName()
         if selectedSpacecraft == 'All':
-            subscription = ''
             self.DisplayErrorMessage(
                 'Cannot open FDL manager.\nNo spacecraft selected.')
         else:

Guide-GroundSystem.md

@@ -1,4 +1,4 @@
-# cFS Ground System Version 2.1.8
+# cFS Ground System Version 2.1.9
 
 ## cFS Ground System Info
 

Guide-GroundSystem.txt

@@ -1,4 +1,4 @@
-cFS Ground System Version 2.1.8
+cFS Ground System Version 2.1.9
 
 cFS Ground System Info:
 

README.md

@@ -8,6 +8,11 @@ See Guide-GroundSystem.txt for more information.
 
 ## Version History
 
+### Development Build: 2.1.9
+
+- Upgrading PyQt4 to PyQt5 and includes a lot of cleanup/refactoring, and changes to the GUI itself
+- See <https://github.com/nasa/cFS-GroundSystem/pull/90>
+
 ### Development Build: 2.1.8
 
 - No warnings when building with GCC9

Subsystems/cmdGui/CHeaderParser.py

@@ -103,13 +103,11 @@ def getFileList(filename='CHeaderParser-hdr-paths.txt'):
                 l = l.strip()
                 if l and not l.startswith("#"):
                     paths.append(l)
-            print(f"Using header files found in {filename}")
-            # Send paths back to caller function
-            return paths
+        print(f"Using header files found in {filename}")
+        # Send paths back to caller function
+        return paths
     except IOError:
         print("Couldn't find default file. Check command line arguments.")
-    except:
-        print("Unexpected error:", sys.exc_info()[0])
 
     print("No header files found. Please make sure to provide the\n"
           "default file for loading headers (CHeaderParser-hdr-paths.txt)")
@@ -449,7 +447,7 @@ def getFileList(filename='CHeaderParser-hdr-paths.txt'):
                                 input((f"Please enter the defined value for "
                                        f"{array_name_size[1]} (0 - 128): ")))
                         except ValueError:
-                            pass
+                            pass     # Ignore non-integer and try again
 
                     # Add string length argument to parameter list
                     stringLens.append(array_size)

Subsystems/cmdGui/CommandSystem.py

@@ -28,7 +28,7 @@
 
 from PyQt5.QtWidgets import QApplication, QDialog
 
-from CommandSystemDialog import Ui_CommandSystemDialog
+from Ui_CommandSystemDialog import Ui_CommandSystemDialog
 
 ROOTDIR = Path(sys.argv[0]).resolve().parent
 
@@ -161,7 +161,7 @@ def ProcessQuickButton(self, idx):
     #
     # Mark the remaining values as invalid
     #
-    for j in range(i, 22):
+    for _ in range(i, 22):
         cmdPageAppid.append(0)
         cmdPageIsValid.append(False)
 
@@ -204,7 +204,7 @@ def ProcessQuickButton(self, idx):
                 quickIdx = subsys.index(cmdPageDesc[k])
                 quickButton.setText(quickCmd[quickIdx])
             except ValueError:
-                pass
+                pass    # Ignore quick button
             quickIndices.append(quickIdx)
         else:
             subsysBrowser.setText("(unused)")

Subsystems/cmdGui/Parameter.py

@@ -28,7 +28,7 @@
 from PyQt5.QtWidgets import QApplication, QDialog
 
 from HTMLDocsParser import HTMLDocsParser
-from ParameterDialog import Ui_Dialog
+from Ui_ParameterDialog import Ui_Dialog
 
 ROOTDIR = Path(sys.argv[0]).resolve().parent
 
@@ -82,7 +82,7 @@ def ProcessSendButton(self):
     #
     subsysTitle, cmdDesc, pageEndian, pageAddress, cmdCode, params = (
         '' for _ in range(6))
-    idx, pagePktId, pagePort = (0 for _ in range(3))
+    pagePktId, pagePort = 0, 0
     param_file = 'struct_c_f_e___e_s___start_app_cmd__t.html'
 
     #
@@ -99,7 +99,7 @@ def ProcessSendButton(self):
         elif opt in ("-d", "--descrip"):
             cmdDesc = arg  # command name, eg No-Op
         elif opt in ("-i", "--idx"):
-            idx = int(arg)  # comand index in command definition file
+            _ = int(arg)  # comand index in command definition file
         elif opt in ("-h", "--host"):
             pageAddress = arg  # send to address
         elif opt in ("-p", "--port"):
@@ -141,7 +141,7 @@ def ProcessSendButton(self):
             paramName.setText(paramNames[i])
             descrip.setText(paramDesc[i])
         except IndexError:
-            pass
+            pass  # Ignore nonexistent array items
 
     #
     # Displays the dialog

Subsystems/cmdGui/UdpCommands.py

@@ -41,7 +41,7 @@
 
 from PyQt5.QtWidgets import QApplication, QDialog
 
-from GenericCommandDialog import Ui_GenericCommandDialog
+from Ui_GenericCommandDialog import Ui_GenericCommandDialog
 
 ROOTDIR = Path(sys.argv[0]).resolve().parent