@@ -48,8 +48,6 @@ ResultsPageDiff::ResultsPageDiff(QWidget* parent)
4848 , m_resultsBottomUpPage(
4949 new ResultsBottomUpPage(m_filterAndZoomStack, nullptr , m_costContextMenu, m_exportMenu, this ))
5050 , m_resultsTopDownPage(new ResultsTopDownPage(m_filterAndZoomStack, nullptr , m_costContextMenu, this ))
51- , m_resultsFlameGraphPage(new ResultsFlameGraphPage(m_filterAndZoomStack, m_fileA, m_exportMenu, this ))
52- , m_resultsCallerCalleePage(new ResultsCallerCalleePage(m_filterAndZoomStack, m_fileA, m_costContextMenu, this ))
5351 , m_timelineVisible(true )
5452{
5553 m_exportMenu->setIcon (QIcon::fromTheme (QStringLiteral (" document-export" )));
@@ -82,33 +80,12 @@ ResultsPageDiff::ResultsPageDiff(QWidget* parent)
8280 m_contents->addDockWidget (m_bottomUpDock, KDDockWidgets::Location_OnTop);
8381 m_topDownDock = dockify (m_resultsTopDownPage, QStringLiteral (" dtopDown" ), tr (" Top &Down" ), tr (" Ctrl+D" ));
8482 m_bottomUpDock->addDockWidgetAsTab (m_topDownDock);
85- m_flameGraphDock =
86- dockify (m_resultsFlameGraphPage, QStringLiteral (" dflameGraph" ), tr (" Flame &Graph" ), tr (" Ctrl+G" ));
87- m_bottomUpDock->addDockWidgetAsTab (m_flameGraphDock);
88- m_callerCalleeDock =
89- dockify (m_resultsCallerCalleePage, QStringLiteral (" dcallerCallee" ), tr (" Ca&ller / Callee" ), tr (" Ctrl+L" ));
90- m_bottomUpDock->addDockWidgetAsTab (m_callerCalleeDock);
9183 m_bottomUpDock->setAsCurrentTab ();
9284
9385 connect (m_filterAndZoomStack, &FilterAndZoomStack::filterChanged, m_fileA, &PerfParser::filterResults);
9486
9587 connect (m_fileA, &PerfParser::parserWarning, this , &ResultsPageDiff::showError);
9688
97- connect (m_resultsCallerCalleePage, &ResultsCallerCalleePage::navigateToCode, this ,
98- &ResultsPageDiff::navigateToCode);
99- connect (m_resultsCallerCalleePage, &ResultsCallerCalleePage::navigateToCodeFailed, this ,
100- &ResultsPageDiff::showError);
101-
102- connect (m_resultsBottomUpPage, &ResultsBottomUpPage::jumpToCallerCallee, this ,
103- &ResultsPageDiff::onJumpToCallerCallee);
104- connect (m_resultsBottomUpPage, &ResultsBottomUpPage::openEditor, this , &ResultsPageDiff::onOpenEditor);
105- connect (m_resultsTopDownPage, &ResultsTopDownPage::jumpToCallerCallee, this ,
106- &ResultsPageDiff::onJumpToCallerCallee);
107- connect (m_resultsTopDownPage, &ResultsTopDownPage::openEditor, this , &ResultsPageDiff::onOpenEditor);
108- connect (m_resultsFlameGraphPage, &ResultsFlameGraphPage::jumpToCallerCallee, this ,
109- &ResultsPageDiff::onJumpToCallerCallee);
110- connect (m_resultsFlameGraphPage, &ResultsFlameGraphPage::openEditor, this , &ResultsPageDiff::onOpenEditor);
111-
11289 connect (m_fileA, &PerfParser::parsingStarted, this , [this ]() {
11390 // disable when we apply a filter
11491 m_contents->setEnabled (false );
@@ -138,9 +115,9 @@ ResultsPageDiff::ResultsPageDiff(QWidget* parent)
138115 Data::BottomUpResults::diffBottomUpResults (m_fileA->bottomUpResults (), m_fileB->bottomUpResults ());
139116 m_resultsBottomUpPage->setBottomUpResults (bottomUpData);
140117
141- auto topDownData =
142- Data::TopDownResults::diffTopDownResults ( Data::TopDownResults:: fromBottomUp (m_fileA->bottomUpResults ()),
143- Data::TopDownResults::fromBottomUp (m_fileB->bottomUpResults ()));
118+ auto topDownData = Data::TopDownResults::diffTopDownResults (
119+ Data::TopDownResults::fromBottomUp (m_fileA->bottomUpResults (), false ),
120+ Data::TopDownResults::fromBottomUp (m_fileB->bottomUpResults (), false ));
144121 m_resultsTopDownPage->setTopDownResults (topDownData);
145122 });
146123
@@ -163,40 +140,17 @@ ResultsPageDiff::ResultsPageDiff(QWidget* parent)
163140
164141ResultsPageDiff::~ResultsPageDiff () = default ;
165142
166- void ResultsPageDiff::setSysroot (const QString& path)
167- {
168- m_resultsCallerCalleePage->setSysroot (path);
169- }
170-
171- void ResultsPageDiff::setAppPath (const QString& path)
172- {
173- m_resultsCallerCalleePage->setAppPath (path);
174- }
175-
176143static void showDock (KDDockWidgets::DockWidget* dock)
177144{
178145 dock->show ();
179146 dock->setFocus ();
180147 dock->setAsCurrentTab ();
181148}
182149
183- void ResultsPageDiff::onJumpToCallerCallee (const Data::Symbol& symbol)
184- {
185- m_resultsCallerCalleePage->jumpToCallerCallee (symbol);
186- showDock (m_callerCalleeDock);
187- }
188-
189- void ResultsPageDiff::onOpenEditor (const Data::Symbol& symbol)
190- {
191- m_resultsCallerCalleePage->openEditor (symbol);
192- }
193-
194150void ResultsPageDiff::clear ()
195151{
196152 m_resultsBottomUpPage->clear ();
197153 m_resultsTopDownPage->clear ();
198- m_resultsCallerCalleePage->clear ();
199- m_resultsFlameGraphPage->clear ();
200154 m_exportMenu->clear ();
201155
202156 m_filterAndZoomStack->clear ();
@@ -214,8 +168,7 @@ QMenu* ResultsPageDiff::exportMenu() const
214168
215169QList<QAction*> ResultsPageDiff::windowActions () const
216170{
217- auto ret = QList<QAction*> {m_bottomUpDock->toggleAction (), m_topDownDock->toggleAction (),
218- m_flameGraphDock->toggleAction (), m_callerCalleeDock->toggleAction ()};
171+ auto ret = QList<QAction*> {m_bottomUpDock->toggleAction (), m_topDownDock->toggleAction ()};
219172 return ret;
220173}
221174
@@ -244,7 +197,7 @@ void ResultsPageDiff::initDockWidgets(const QVector<KDDockWidgets::DockWidgetBas
244197{
245198 Q_ASSERT (restored.contains (m_bottomUpDock));
246199
247- const auto docks = {m_bottomUpDock, m_topDownDock, m_flameGraphDock, m_callerCalleeDock };
200+ const auto docks = {m_bottomUpDock, m_topDownDock};
248201 for (auto dock : docks) {
249202 if (!dock || restored.contains (dock))
250203 continue ;
0 commit comments