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

Popout graphs Phase I: limit dock height to screen height; preserve original graph heights

Browse Source
This commit is contained in:
Guy Scharf 2020-08-01 12:45:02 -07:00
parent f25f991e9f
commit 2712fad0c6
1 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
oscar/Graphs/gGraphView.cpp
View File

@ -20,7 +20,9 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QDockWidget> #include <QDockWidget>
#include <QMainWindow> #include <QMainWindow>
# include <QWindow> #include <QScreen>
#include <QWindow>
#include <QMessageBox>
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
@ -447,25 +449,42 @@ void MyDockWindow::closeEvent(QCloseEvent *event)
MyDockWindow * gGraphView::dock = nullptr; MyDockWindow * gGraphView::dock = nullptr;
void gGraphView::popoutGraph() void gGraphView::popoutGraph()
{ {
QScreen *screen = QGuiApplication::primaryScreen();
QRect screenGeometry = screen->availableGeometry();
int screenHeight = screenGeometry.height();
if (popout_graph) { if (popout_graph) {
// Create new dock if we don't have one already
if (dock == nullptr) { if (dock == nullptr) {
dock = new MyDockWindow(mainwin->getDaily(), Qt::Window); dock = new MyDockWindow(mainwin->getDaily(), Qt::Window);
dock->resize(width(),0); dock->resize(width(),0);
// QScrollArea // QScrollArea
} }
QDockWidget * widget = new QDockWidget(dock);
widget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
widget->setMouseTracking(true);
int h = dock->height()+popout_graph->height()+30;
if (h > height()) h = height();
dock->resize(dock->width(), h);
widget->resize(width(), popout_graph->height()+30);
gGraphView * gv = new gGraphView(widget, this); //////// Create dock widget and resize dock to hold new widget
widget->setWidget(gv); QDockWidget * newDockWidget = new QDockWidget(dock);
newDockWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
newDockWidget->setMouseTracking(true);
int titleBarHeight = 30;
int newDockHeight = dock->height()+popout_graph->height()+titleBarHeight+2; // +2 for group box border
qDebug() << "widget geometry" << newDockWidget->frameGeometry() << "title bar height" << titleBarHeight;
if (newDockHeight > screenHeight) {
QMessageBox::warning(nullptr, STR_MessageBox_Warning,
QObject::tr("The popout window is full. You should capture the existing\npopout window, delete it, then pop out this graph again."));
return;
}
qDebug() << "dock height" << dock->height() << "popout graph height" << popout_graph->height();
dock->resize(dock->width(), newDockHeight);
newDockWidget->resize(width(), popout_graph->height()+titleBarHeight);
qDebug() << "dock height resized to" << dock->height() << "widget resized to" << newDockWidget->height();
//////// End resize dock to hold new widget
gGraphView * gv = new gGraphView(newDockWidget, this);
newDockWidget->setWidget(gv);
gv->setMouseTracking(true); gv->setMouseTracking(true);
gv->setDay(this->day()); gv->setDay(this->day());
dock->addDockWidget(Qt::BottomDockWidgetArea, widget,Qt::Vertical); dock->addDockWidget(Qt::BottomDockWidgetArea, newDockWidget, Qt::Vertical);
/////// Fix some resize glitches /////// /////// Fix some resize glitches ///////
// https://stackoverflow.com/questions/26286646/create-a-qdockwidget-that-resizes-to-its-contents?rq=1 // https://stackoverflow.com/questions/26286646/create-a-qdockwidget-that-resizes-to-its-contents?rq=1
@ -486,6 +505,8 @@ void gGraphView::popoutGraph()
gGraph * graph = popout_graph; gGraph * graph = popout_graph;
/////////////////////
// Construct name for this popout graph
QString basename = graph->title()+" - "; QString basename = graph->title()+" - ";
if (graph->m_day) { if (graph->m_day) {
// append the date of the graph's left edge to the snapshot name // append the date of the graph's left edge to the snapshot name
@ -494,14 +515,14 @@ void gGraphView::popoutGraph()
QDateTime date = QDateTime::fromMSecsSinceEpoch(graph->min_x, Qt::LocalTime); QDateTime date = QDateTime::fromMSecsSinceEpoch(graph->min_x, Qt::LocalTime);
basename += date.date().toString(Qt::SystemLocaleLongDate); basename += date.date().toString(Qt::SystemLocaleLongDate);
} }
QString newname = basename; QString newname = basename;
// Find a new name.. How many snapshots for each graph counts as stupid? // Find a new name.. How many snapshots for each graph counts as stupid?
QString newtitle = graph->title(); QString newtitle = graph->title();
newDockWidget->setWindowTitle(newname);
// end name construction and setting title
/////////////////////
widget->setWindowTitle(newname); qDebug() << "original graph height is" << graph->height();
gGraph * newgraph = new gGraph(newname, nullptr, newtitle, graph->units(), graph->height(), graph->group()); gGraph * newgraph = new gGraph(newname, nullptr, newtitle, graph->units(), graph->height(), graph->group());
newgraph->setHeight(graph->height()); newgraph->setHeight(graph->height());
@ -536,8 +557,9 @@ void gGraphView::popoutGraph()
newgraph->setSnapshot(false); newgraph->setSnapshot(false);
newgraph->setShowTitle(true); newgraph->setShowTitle(true);
qDebug() << "newgraph height" << newgraph->height() << "gv height" << gv->height();
gv->resetLayout(); // gv->resetLayout();
gv->timedRedraw(0); gv->timedRedraw(0);
//widget->setUpdatesEnabled(true); //widget->setUpdatesEnabled(true);