aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYordan Karadzhov <ykaradzhov@vmware.com>2019-05-02 15:45:35 +0300
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-05-06 22:24:10 -0400
commit757c01393155be6c82a3e9f21ee6c1de4cb0bbe2 (patch)
tree0c9fcafb3bb9c599fd3c685e898b6ec8a17064f0
parentc8d9e1a82e75ae0d35d8ca2800ef6c65be3ac4e5 (diff)
downloadtrace-cmd-757c01393155be6c82a3e9f21ee6c1de4cb0bbe2.tar.gz
kernel-shark: Enforce update of the OpenGL widget when loading new session
This is needed in the case when the session was saved at different screen resolution. Link: http://lore.kernel.org/linux-trace-devel/20190502124536.32463-1-ykaradzhov@vmware.com Reported-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Reviewed-by: Slavomir Kaslev <kaslevs@vmware.com> Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel-shark/src/KsGLWidget.hpp2
-rw-r--r--kernel-shark/src/KsMainWindow.cpp3
-rw-r--r--kernel-shark/src/KsTraceGraph.cpp2
3 files changed, 5 insertions, 2 deletions
diff --git a/kernel-shark/src/KsGLWidget.hpp b/kernel-shark/src/KsGLWidget.hpp
index 3bcecf97..bf68be35 100644
--- a/kernel-shark/src/KsGLWidget.hpp
+++ b/kernel-shark/src/KsGLWidget.hpp
@@ -41,6 +41,8 @@ public:
void reset();
+ void update() {resizeGL(width(), height());}
+
void mousePressEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp
index 5f326f5b..39bc7b5e 100644
--- a/kernel-shark/src/KsMainWindow.cpp
+++ b/kernel-shark/src/KsMainWindow.cpp
@@ -433,7 +433,6 @@ QString KsMainWindow::lastSessionFile()
void KsMainWindow::_restoreSession()
{
loadSession(lastSessionFile());
- _graph.updateGeom();
}
void KsMainWindow::_importSession()
@@ -448,7 +447,6 @@ void KsMainWindow::_importSession()
return;
loadSession(fileName);
- _graph.updateGeom();
}
void KsMainWindow::_updateSession()
@@ -1098,6 +1096,7 @@ void KsMainWindow::loadSession(const QString &fileName)
_session.loadTable(&_view);
_colorPhaseSlider.setValue(_session.getColorScheme() * 100);
+ _graph.updateGeom();
}
void KsMainWindow::_initCapture()
diff --git a/kernel-shark/src/KsTraceGraph.cpp b/kernel-shark/src/KsTraceGraph.cpp
index 6087e96d..da2c6aa1 100644
--- a/kernel-shark/src/KsTraceGraph.cpp
+++ b/kernel-shark/src/KsTraceGraph.cpp
@@ -538,6 +538,8 @@ void KsTraceGraph::updateGeom()
* allow the scroll bar to disappear when the
* widget is extended to maximum.
*/
+
+ _glWindow.update();
}
void KsTraceGraph::_updateGraphLegends()