History

perf scripts python: exported-sql-viewer.py: Factor out ReportVars

Factor out ReportVars to provide a single container for information from report dialogs.

Adrian Hunter committed 7 years ago

Commit 0bf09471 parent 0924cd61 file · +23 −14Browse files

Showing the changes to tools/perf/scripts/python (1 of 1 file). Show all

Unified · Split

tools/perf/scripts/python/exported-sql-viewer.py+23−14
@@ -1398,18 +1398,26 @@ class BranchModel(TreeModel): · 1397 unmodified lines
13981398 def HasMoreRecords(self):
13991399 return self.more
14001400
1401+# Report Variables
1402+
1403+class ReportVars():
1404+
1405+ def __init__(self, where_clause = ""):
1406+ self.where_clause = where_clause
1407+
1408+ def UniqueId(self):
1409+ return str(self.where_clause)
1410+
14011411 # Branch window
14021412
14031413 class BranchWindow(QMdiSubWindow):
14041414
1405− def __init__(self, glb, event_id, name, where_clause, parent=None):
1415+ def __init__(self, glb, event_id, name, report_vars, parent=None):
14061416 super(BranchWindow, self).__init__(parent)
14071417
1408− model_name = "Branch Events " + str(event_id)
1409− if len(where_clause):
1410− model_name = where_clause + " " + model_name
1418+ model_name = "Branch Events " + str(event_id) + " " + report_vars.UniqueId()
14111419
1412− self.model = LookupCreateModel(model_name, lambda: BranchModel(glb, event_id, where_clause))
1420+ self.model = LookupCreateModel(model_name, lambda: BranchModel(glb, event_id, report_vars.where_clause))
14131421
14141422 self.view = QTreeView()
14151423 self.view.setUniformRowHeights(True)
@@ -1703,7 +1711,7 @@ class ReportDialogBase(QDialog): · 287 unmodified lines
17031711 self.glb = glb
17041712
17051713 self.name = ""
1706− self.where_clause = ""
1714+ self.report_vars = ReportVars()
17071715
17081716 self.setWindowTitle(title)
17091717 self.setMinimumWidth(600)
@@ -1742,6 +1750,7 @@ class ReportDialogBase(QDialog): · 32 unmodified lines
17421750 self.setLayout(self.vbox);
17431751
17441752 def Ok(self):
1753+ vars = self.report_vars
17451754 self.name = self.data_items[0].value
17461755 if not self.name:
17471756 self.ShowMessage("Report name is required")
@@ -1751,14 +1760,14 @@ class ReportDialogBase(QDialog): · 3 unmodified lines
17511760 return
17521761 for d in self.data_items[1:]:
17531762 if len(d.value):
1754− if len(self.where_clause):
1755− self.where_clause += " AND "
1756− self.where_clause += d.value
1757− if len(self.where_clause):
1763+ if len(vars.where_clause):
1764+ vars.where_clause += " AND "
1765+ vars.where_clause += d.value
1766+ if len(vars.where_clause):
17581767 if self.partial:
1759− self.where_clause = " AND ( " + self.where_clause + " ) "
1768+ vars.where_clause = " AND ( " + vars.where_clause + " ) "
17601769 else:
1761− self.where_clause = " WHERE " + self.where_clause + " "
1770+ vars.where_clause = " WHERE " + vars.where_clause + " "
17621771 else:
17631772 self.ShowMessage("No selection")
17641773 return
@@ -2383,13 +2392,13 @@ class MainWindow(QMainWindow): · 618 unmodified lines
23832392 CallGraphWindow(self.glb, self)
23842393
23852394 def NewBranchView(self, event_id):
2386− BranchWindow(self.glb, event_id, "", "", self)
2395+ BranchWindow(self.glb, event_id, "", ReportVars(), self)
23872396
23882397 def NewSelectedBranchView(self, event_id):
23892398 dialog = SelectedBranchDialog(self.glb, self)
23902399 ret = dialog.exec_()
23912400 if ret:
2392− BranchWindow(self.glb, event_id, dialog.name, dialog.where_clause, self)
2401+ BranchWindow(self.glb, event_id, dialog.name, dialog.report_vars, self)
23932402
23942403 def NewTableView(self, table_name):
23952404 TableWindow(self.glb, table_name, self)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t