Radon Code Metrics: comparison RadonMetrics/RawMetricsDialog.py

-:7150ed890fd5
+:9ac53bf21182
 QTreeWidgetItem, QApplication
 )
 from .Ui_RawMetricsDialog import Ui_RawMetricsDialog
+from E5Gui.E5Application import e5App
 import Preferences
 import Utilities
+# TODO: add summary table
+# TODO: add column explanations
 class RawMetricsDialog(QDialog, Ui_RawMetricsDialog):
 """
 Class implementing a dialog to show raw code metrics.
 """
 def __init__(self, radonService, parent=None):
 self.radonService.metricsDone.connect(self.__processResult)
 self.radonService.metricsError.connect(self.__processError)
 self.radonService.batchFinished.connect(self.__batchFinished)
 self.cancelled = False
+self.__project = e5App().getObject("Project")
 self.__menu = QMenu(self)
 self.__menu.addAction(self.tr("Collapse all"),
 self.__resultCollapse)
 self.__menu.addAction(self.tr("Expand all"), self.__resultExpand)
 self.resultList.setContextMenuPolicy(Qt.CustomContextMenu)
 self.resultList.customContextMenuRequested.connect(
 self.__showContextMenu)
 self.__fileList = []
-self.__project = None
 self.filterFrame.setVisible(False)
 def __resizeResultColumns(self):
 """
 Private method to resize the list columns.
 def __createResultItem(self, filename, values):
 """
 Private slot to create a new item in the result list.
-@param parent parent of the new item
+@param filename name of the file
-@type QTreeWidget or QTreeWidgetItem
+@type str
 @param values values to be displayed
-@type list
+@type dict
-@return the generated item
+"""
-@rtype QTreeWidgetItem
+data = [self.__project.getRelativePath(filename)]
-"""
+for key in ['loc', 'sloc', 'lloc', 'comments', 'multi', 'blank']:
-data = [filename]
-for value in values:
 try:
-data.append("{0:5}".format(int(value)))
+data.append("{0:5}".format(int(values[key])))
 except ValueError:
-data.append(value)
+data.append(values[key])
+except KeyError:
+data.append("")
+data.append("{0:3.0%}".format(
+values["comments"] / (float(values["loc"]) or 1)))
+data.append("{0:3.0%}".format(
+values["comments"] / (float(values["sloc"]) or 1)))
+data.append("{0:3.0%}".format(
+(values["comments"] + values["multi"]) /
+(float(values["loc"]) or 1)))
 itm = QTreeWidgetItem(self.resultList, data)
-for col in range(1, 6):
+for col in range(1, 10):
 itm.setTextAlignment(col, Qt.Alignment(Qt.AlignRight))
-return itm
+def __createErrorItem(self, filename, message):
+"""
+Private slot to create a new error item in the result list.
+@param filename name of the file
+@type str
+@param message error message
+@type str
+"""
+# TODO: implement this
 def prepare(self, fileList, project):
 """
 Public method to prepare the dialog with a list of filenames.
 for f in self.files[:]:
 if not os.path.exists(f):
 self.files.remove(f)
 if len(self.files) > 0:
+# disable updates of the list for speed
+self.resultList.setUpdatesEnabled(False)
+self.resultList.setSortingEnabled(False)
 self.checkProgress.setMaximum(len(self.files))
 self.checkProgress.setVisible(len(self.files) > 1)
 self.checkProgressLabel.setVisible(len(self.files) > 1)
 QApplication.processEvents()
 # now go through all the files
 self.progress = 0
 self.files.sort()
-if len(self.files) == 1:
+if len(self.files) == 1 or not self.radonService.hasBatch:
 self.__batch = False
 self.rawMetrics()
 else:
 self.__batch = True
 self.rawMetricsBatch()
 Private slot called after perfoming a code metrics calculation on one
 file.
 @param fn filename of the file
 @type str
-@param result result list
+@param result result dict
-@type list
+@type dict
 """
 if self.__finished:
 return
 # Check if it's the requested file, otherwise ignore signal if not
 # in batch mode
 if not self.__batch and fn != self.filename:
 return
-self.__createResultItem(fn, result)
+if "error" in result:
+self.__createErrorItem(fn, result["error"])
+else:
+self.__createResultItem(fn, result)
 self.progress += 1
 self.checkProgress.setValue(self.progress)
 self.checkProgressLabel.setPath(fn)
 """
 Private slot called when the action or the user pressed the button.
 """
 if not self.__finished:
 self.__finished = True
+# reenable updates of the list
+self.resultList.setSortingEnabled(True)
+self.resultList.setUpdatesEnabled(True)
 self.cancelled = True
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)

Mercurial Repositories > Radon Code Metrics / file comparison

comparison: RadonMetrics/RawMetricsDialog.py

RadonMetrics/RawMetricsDialog.py