Mercurial Repositories > eric / file diff

diff -r 4dabc5e36b18 -r ae4f5cdc3d00 Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Mar 25 17:18:12 2017 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Mar 25 17:36:50 2017 +0100
@@ -65,6 +65,8 @@
         self.setupUi(self)
         self.setWindowFlags(Qt.Window)
         
+        self.optionsTabWidget.setCurrentIndex(0)
+        
         self.excludeMessagesSelectButton.setIcon(
             UI.PixmapCache.getIcon("select.png"))
         self.includeMessagesSelectButton.setIcon(
@@ -323,6 +325,10 @@
             self.__data["ShowIgnored"] = False
         if "MaxCodeComplexity" not in self.__data:
             self.__data["MaxCodeComplexity"] = 10
+        if "LineComplexity" not in self.__data:
+            self.__data["LineComplexity"] = 15
+        if "LineComplexityScore" not in self.__data:
+            self.__data["LineComplexityScore"] = 10
         if "ValidEncodings" not in self.__data:
             self.__data["ValidEncodings"] = "latin-1, utf-8"
         if "CopyrightMinFileSize" not in self.__data or \
@@ -350,6 +356,9 @@
         self.docTypeComboBox.setCurrentIndex(
             self.docTypeComboBox.findData(self.__data["DocstringType"]))
         self.complexitySpinBox.setValue(self.__data["MaxCodeComplexity"])
+        self.lineComplexitySpinBox.setValue(self.__data["LineComplexity"])
+        self.lineComplexityScoreSpinBox.setValue(
+            self.__data["LineComplexityScore"])
         self.encodingsEdit.setText(self.__data["ValidEncodings"])
         self.copyrightFileSizeSpinBox.setValue(
             self.__data["CopyrightMinFileSize"])
@@ -434,7 +443,11 @@
             hangClosing = self.hangClosingCheckBox.isChecked()
             docType = self.docTypeComboBox.itemData(
                 self.docTypeComboBox.currentIndex())
-            maxCodeComplexity = self.complexitySpinBox.value()
+            codeComplexityArgs = {
+                "McCabeComplexity": self.complexitySpinBox.value(),
+                "LineComplexity": self.lineComplexitySpinBox.value(),
+                "LineComplexityScore": self.lineComplexityScoreSpinBox.value(),
+            }
             miscellaneousArgs = {
                 "CodingChecker": self.encodingsEdit.text(),
                 "CopyrightChecker": {
@@ -447,7 +460,7 @@
             
             self.__options = [excludeMessages, includeMessages, repeatMessages,
                               fixCodes, noFixCodes, fixIssues, maxLineLength,
-                              hangClosing, docType, maxCodeComplexity,
+                              hangClosing, docType, codeComplexityArgs,
                               miscellaneousArgs]
             
             # now go through all the files
@@ -764,6 +777,8 @@
                 "DocstringType": self.docTypeComboBox.itemData(
                     self.docTypeComboBox.currentIndex()),
                 "MaxCodeComplexity": self.complexitySpinBox.value(),
+                "LineComplexity": self.lineComplexitySpinBox.value(),
+                "LineComplexityScore": self.lineComplexityScoreSpinBox.value(),
                 "ValidEncodings": self.encodingsEdit.text(),
                 "CopyrightMinFileSize": self.copyrightFileSizeSpinBox.value(),
                 "CopyrightAuthor": self.copyrightAuthorEdit.text(),
@@ -942,6 +957,12 @@
             Preferences.Prefs.settings.value("PEP8/DocstringType", "pep257")))
         self.complexitySpinBox.setValue(int(Preferences.Prefs.settings.value(
             "PEP8/MaxCodeComplexity", 10)))
+        self.lineComplexitySpinBox.setValue(
+            int(Preferences.Prefs.settings.value(
+                "PEP8/LineComplexity", 15)))
+        self.lineComplexityScoreSpinBox.setValue(
+            int(Preferences.Prefs.settings.value(
+                "PEP8/LineComplexityScore", 10)))
         self.encodingsEdit.setText(Preferences.Prefs.settings.value(
             "PEP8/ValidEncodings", "latin-1, utf-8"))
         self.copyrightFileSizeSpinBox.setValue(int(
@@ -988,6 +1009,11 @@
         Preferences.Prefs.settings.setValue(
             "PEP8/MaxCodeComplexity", self.complexitySpinBox.value())
         Preferences.Prefs.settings.setValue(
+            "PEP8/LineComplexity", self.lineComplexitySpinBox.value())
+        Preferences.Prefs.settings.setValue(
+            "PEP8/LineComplexityScore",
+            self.lineComplexityScoreSpinBox.value())
+        Preferences.Prefs.settings.setValue(
             "PEP8/ValidEncodings", self.encodingsEdit.text())
         Preferences.Prefs.settings.setValue(
             "PEP8/CopyrightMinFileSize", self.copyrightFileSizeSpinBox.value())
@@ -1017,6 +1043,8 @@
         Preferences.Prefs.settings.setValue("PEP8/HangClosing", False)
         Preferences.Prefs.settings.setValue("PEP8/DocstringType", "pep257")
         Preferences.Prefs.settings.setValue("PEP8/MaxCodeComplexity", 10)
+        Preferences.Prefs.settings.setValue("PEP8/LineComplexity", 15)
+        Preferences.Prefs.settings.setValue("PEP8/LineComplexityScore", 10)
         Preferences.Prefs.settings.setValue(
             "PEP8/ValidEncodings", "latin-1, utf-8")
         Preferences.Prefs.settings.setValue("PEP8/CopyrightMinFileSize", 0)