chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make popout graphs also work on pinned graphs

Browse Source
This commit is contained in:
Mark Watkins 2018-06-10 18:02:58 +10:00
parent 8e3a3bf691
commit 5ab8155fca
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleepyhead/Graphs/gGraphView.cpp
View File

@ -2490,6 +2490,9 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
this->setCursor(Qt::ArrowCursor); this->setCursor(Qt::ArrowCursor);
pin_action->setText(QObject::tr("Unpin %1 Graph").arg(g->title())); pin_action->setText(QObject::tr("Unpin %1 Graph").arg(g->title()));
pin_graph = g; pin_graph = g;
popout_action->setText(QObject::tr("Popout %1 Graph").arg(g->title()));
popout_graph = g;
populateMenu(g); populateMenu(g);
context_menu->popup(event->globalPos()); context_menu->popup(event->globalPos());
//done=true; //done=true;
@ -2565,7 +2568,6 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
popout_action->setText(QObject::tr("Popout %1 Graph").arg(g->title())); popout_action->setText(QObject::tr("Popout %1 Graph").arg(g->title()));
popout_graph = g; popout_graph = g;
pin_action->setText(QObject::tr("Pin %1 Graph").arg(g->title())); pin_action->setText(QObject::tr("Pin %1 Graph").arg(g->title()));
pin_graph = g; pin_graph = g;
populateMenu(g); populateMenu(g);

3
sleepyhead/Graphs/gLineChart.cpp
View File

@ -444,6 +444,8 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
} }
} }
painter.setRenderHint(QPainter::Antialiasing, AppSetting->antiAliasing());
//bool mouseover = false; //bool mouseover = false;
if (rect.contains(w.graphView()->currentMousePos())) { if (rect.contains(w.graphView()->currentMousePos())) {
//mouseover = true; //mouseover = true;
@ -511,7 +513,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
painter.setClipRect(left, top, width, height+1); painter.setClipRect(left, top, width, height+1);
painter.setClipping(true); painter.setClipping(true);
painter.setRenderHint(QPainter::Antialiasing, AppSetting->antiAliasing());
painter.setFont(*defaultfont); painter.setFont(*defaultfont);
bool showDottedLines = true; bool showDottedLines = true;