--- a/RadonMetrics/RawMetricsDialog.py Sat Mar 31 13:05:51 2018 +0200 +++ b/RadonMetrics/RawMetricsDialog.py Sun Nov 25 18:32:27 2018 +0100 @@ -82,6 +82,8 @@ "<tr><td><b>SLOC</b></td><td>Source lines of code</td></tr>" "<tr><td><b>LLOC</b></td><td>Logical lines of code</td></tr>" "<tr><td><b>Comments</b></td><td>Comment lines</td></tr>" + "<tr><td><b>Empty Comments</b></td><td>Comment lines not" + " containing code</td></tr>" "<tr><td><b>Multi</b></td>" "<td>Lines in multi line strings</td></tr>" "<tr><td><b>Empty</b></td><td>Blank lines</td></tr>" @@ -182,10 +184,10 @@ the code metrics for @type str or list of str """ + self.cancelled = False self.__errorItem = None self.resultList.clear() self.summaryList.clear() - self.cancelled = False QApplication.processEvents() self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -211,7 +213,8 @@ self.files.remove(f) self.__summary = {"files": 0} - for key in ['loc', 'sloc', 'lloc', 'comments', 'multi', 'blank']: + for key in ['loc', 'lloc', 'sloc', 'comments', 'multi', + 'single_comments', 'blank']: self.__summary[key] = 0 if len(self.files) > 0: @@ -375,9 +378,10 @@ @rtype list of str """ v = [] - for key in ['loc', 'sloc', 'lloc', 'comments', 'multi', 'blank']: - val = result.get(key, 0) - if val: + for key in ['loc', 'sloc', 'lloc', 'comments', 'multi', + 'single_comments', 'blank']: + val = result.get(key, -1) + if val >= 0: v.append(self.__locale.toString(val)) else: v.append('') @@ -432,6 +436,9 @@ self.tr("Comment Lines"), self.__locale.toString(self.__summary["comments"])) self.__createSummaryItem( + self.tr("Empty Comments"), + self.__locale.toString(self.__summary["single_comments"])) + self.__createSummaryItem( self.tr("Multiline Strings"), self.__locale.toString(self.__summary["multi"])) self.__createSummaryItem(