OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

(#570) Aligning of track top implemented.

Browse Source 
Now using manual layout and external legend.
This commit is contained in:
Jacob Støren
2015-10-30 21:35:43 +01:00
parent 56ad3a448e
commit 1148c1167c
5 changed files with 238 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
ApplicationCode/UserInterface/RiuWellLogPlot.cpp
View File

@@ -32,28 +32,29 @@
#include <QScrollBar>
#include <QFocusEvent>
#include <QMdiSubWindow>
#include <QTimer>
#include <math.h>
#include "qwt_legend.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuWellLogPlot::RiuWellLogPlot(RimWellLogPlot* plotDefinition, QWidget* parent)
: QWidget(parent)
: QWidget(parent), m_scheduleUpdateChildrenLayoutTimer(NULL)
{
Q_ASSERT(plotDefinition);
m_plotDefinition = plotDefinition;
m_layout = new QHBoxLayout(this);
m_layout->setMargin(0);
m_layout->setSpacing(0);
QPalette newPalette(palette());
newPalette.setColor(QPalette::Background, Qt::white);
setPalette(newPalette);
setLayout(m_layout);
setAutoFillBackground(true);
m_scrollBar = new QScrollBar(this);
m_scrollBar->setOrientation(Qt::Vertical);
m_scrollBar->setVisible(false);
m_layout->addWidget(m_scrollBar);
m_scrollBar->setVisible(true);
connect(m_scrollBar, SIGNAL(valueChanged(int)), this, SLOT(slotSetMinDepth(int)));
}
@@ -75,7 +76,7 @@ RiuWellLogPlot::~RiuWellLogPlot()
void RiuWellLogPlot::addTrackPlot(RiuWellLogTrackPlot* trackPlot)
{
// Insert the plot to the left of the scroll bar
insertTrackPlot(trackPlot, m_layout->count() - 1);
insertTrackPlot(trackPlot, m_trackPlots.size());
}
//--------------------------------------------------------------------------------------------------
@@ -83,8 +84,28 @@ void RiuWellLogPlot::addTrackPlot(RiuWellLogTrackPlot* trackPlot)
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::insertTrackPlot(RiuWellLogTrackPlot* trackPlot, size_t index)
{
m_layout->insertWidget(static_cast<int>(index), trackPlot);
m_trackPlots.append(trackPlot); // insert?
trackPlot->setParent(this);
m_trackPlots.insert(static_cast<int>(index), trackPlot);
QwtLegend* legend = new QwtLegend(this);
legend->setMaxColumns(1);
legend->connect(trackPlot, SIGNAL(legendDataChanged(const QVariant &, const QList< QwtLegendData > &)), SLOT(updateLegend(const QVariant &, const QList< QwtLegendData > &)));
legend->contentsWidget()->layout()->setAlignment(Qt::AlignBottom | Qt::AlignHCenter);
m_legends.insert(static_cast<int>(index), legend);
this->connect(trackPlot, SIGNAL(legendDataChanged(const QVariant &, const QList< QwtLegendData > &)), SLOT(scheduleUpdateChildrenLayout()));
trackPlot->updateLegend();
if (trackPlot->isRimTrackVisible())
{
trackPlot->show();
}
else
{
trackPlot->hide();
}
modifyWidthOfContainingMdiWindow(trackPlot->width());
}
@@ -94,10 +115,21 @@ void RiuWellLogPlot::insertTrackPlot(RiuWellLogTrackPlot* trackPlot, size_t inde
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::removeTrackPlot(RiuWellLogTrackPlot* trackPlot)
{
m_layout->removeWidget(trackPlot);
m_trackPlots.removeAll(trackPlot);
if (!trackPlot) return;
modifyWidthOfContainingMdiWindow(-trackPlot->width());
int windowWidthChange = - trackPlot->width();
int trackIdx = m_trackPlots.indexOf(trackPlot);
CVF_ASSERT(trackIdx >= 0);
m_trackPlots.removeAt(trackIdx);
trackPlot->setParent(NULL);
QwtLegend* legend = m_legends[trackIdx];
m_legends.removeAt(trackIdx);
delete legend;
modifyWidthOfContainingMdiWindow(windowWidthChange);
}
//--------------------------------------------------------------------------------------------------
@@ -108,9 +140,20 @@ void RiuWellLogPlot::modifyWidthOfContainingMdiWindow(int widthChange)
QMdiSubWindow* mdiWindow = RiuMainWindow::instance()->findMdiSubWindow(this);
if (mdiWindow)
{
QSize subWindowSize = mdiWindow->size();
if (m_trackPlots.size() == 0 && widthChange <= 0) return; // Last track removed. Leave be
QSize subWindowSize = mdiWindow->size();
int newWidth = 0;
if (m_trackPlots.size() == 1 && widthChange > 0) // First track added
{
newWidth = widthChange;
}
else
{
newWidth = subWindowSize.width() + widthChange;
}
int newWidth = subWindowSize.width() + widthChange;
if (newWidth < 0) newWidth = 100;
subWindowSize.setWidth(newWidth);
@@ -184,3 +227,134 @@ RimWellLogPlot* RiuWellLogPlot::ownerPlotDefinition()
return m_plotDefinition;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::resizeEvent(QResizeEvent *event)
{
int height = event->size().height();
int width = event->size().width();
placeChildWidgets(height, width);
QWidget::resizeEvent(event);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::placeChildWidgets(int height, int width)
{
int trackCount = m_trackPlots.size();
CVF_ASSERT(m_legends.size() == trackCount);
int visibleTrackCount = 0;
for (int tIdx = 0; tIdx < trackCount; ++tIdx)
{
if (m_trackPlots[tIdx]->isVisible()) ++visibleTrackCount;
}
int scrollBarWidth = 0;
if (m_scrollBar->isVisible()) scrollBarWidth = m_scrollBar->sizeHint().width();
int maxLegendHeight = 0;
for (int tIdx = 0; tIdx < trackCount; ++tIdx)
{
if (m_trackPlots[tIdx]->isVisible())
{
int legendHeight = m_legends[tIdx]->sizeHint().height();
if (legendHeight > maxLegendHeight) maxLegendHeight = legendHeight;
}
}
int trackHeight = height - maxLegendHeight;
int trackX = 0;
if (visibleTrackCount)
{
int trackWidth = (width - scrollBarWidth)/visibleTrackCount;
int trackWidthExtra = (width-scrollBarWidth)%visibleTrackCount;
for (int tIdx = 0; tIdx < trackCount; ++tIdx)
{
if (m_trackPlots[tIdx]->isVisible())
{
int realTrackWidth = trackWidth;
if (trackWidthExtra > 0)
{
realTrackWidth += 1;
--trackWidthExtra;
}
m_legends[tIdx]->setGeometry(trackX, 0, realTrackWidth, maxLegendHeight);
m_trackPlots[tIdx]->setGeometry(trackX, maxLegendHeight, realTrackWidth, trackHeight);
trackX += realTrackWidth;
}
}
}
if (m_scrollBar->isVisible()) m_scrollBar->setGeometry(trackX, maxLegendHeight, scrollBarWidth, trackHeight);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::updateChildrenLayout()
{
int trackCount = m_trackPlots.size();
for (int tIdx = 0; tIdx < trackCount; ++tIdx)
{
if (m_trackPlots[tIdx]->isVisible())
{
m_legends[tIdx]->show();
}
else
{
m_legends[tIdx]->hide();
}
}
placeChildWidgets(this->height(), this->width());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::showEvent(QShowEvent *)
{
updateChildrenLayout();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::changeEvent(QEvent *event)
{
if (event->type() == QEvent::WindowStateChange)
{
updateChildrenLayout();
}
}
//--------------------------------------------------------------------------------------------------
/// Schedule an update of the widget positions
/// Will happen just a bit after the event loop is entered
/// Used to delay the positioning to after the legend widgets is actually updated.
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::scheduleUpdateChildrenLayout()
{
if (!m_scheduleUpdateChildrenLayoutTimer)
{
m_scheduleUpdateChildrenLayoutTimer = new QTimer(this);
connect(m_scheduleUpdateChildrenLayoutTimer, SIGNAL(timeout()), this, SLOT(updateChildrenLayout()));
}
if (!m_scheduleUpdateChildrenLayoutTimer->isActive())
{
m_scheduleUpdateChildrenLayoutTimer->setSingleShot(true);
m_scheduleUpdateChildrenLayoutTimer->start(10);
}
}

29
ApplicationCode/UserInterface/RiuWellLogPlot.h
View File

@@ -29,6 +29,7 @@ class RiuWellLogTrackPlot;
class QHBoxLayout;
class QScrollBar;
class QFocusEvent;
class QwtLegend;
//==================================================================================================
//
@@ -43,25 +44,37 @@ public:
RiuWellLogPlot(RimWellLogPlot* plotDefinition, QWidget* parent = NULL);
virtual ~RiuWellLogPlot();
RimWellLogPlot* ownerPlotDefinition();
RimWellLogPlot* ownerPlotDefinition();
void addTrackPlot(RiuWellLogTrackPlot* trackPlot);
void insertTrackPlot(RiuWellLogTrackPlot* trackPlot, size_t index);
void removeTrackPlot(RiuWellLogTrackPlot* trackPlot);
void addTrackPlot(RiuWellLogTrackPlot* trackPlot);
void insertTrackPlot(RiuWellLogTrackPlot* trackPlot, size_t index);
void removeTrackPlot(RiuWellLogTrackPlot* trackPlot);
void setDepthZoomAndReplot(double minDepth, double maxDepth);
void setDepthZoomAndReplot(double minDepth, double maxDepth);
public slots:
void updateChildrenLayout();
protected:
virtual void resizeEvent(QResizeEvent *event);
virtual void showEvent(QShowEvent *);
virtual void changeEvent(QEvent *);
private:
void updateScrollBar(double minDepth, double maxDepth);
void modifyWidthOfContainingMdiWindow(int widthChange);
void updateScrollBar(double minDepth, double maxDepth);
void modifyWidthOfContainingMdiWindow(int widthChange);
void placeChildWidgets(int height, int width);
private slots:
void slotSetMinDepth(int value);
void slotSetMinDepth(int value);
void scheduleUpdateChildrenLayout();
private:
QHBoxLayout* m_layout;
QScrollBar* m_scrollBar;
QList<QwtLegend*> m_legends;
QList<RiuWellLogTrackPlot*> m_trackPlots;
caf::PdmPointer<RimWellLogPlot> m_plotDefinition;
QTimer* m_scheduleUpdateChildrenLayoutTimer;
};

19
ApplicationCode/UserInterface/RiuWellLogTrackPlot.cpp
View File

@@ -56,11 +56,7 @@ RiuWellLogTrackPlot::RiuWellLogTrackPlot(RimWellLogPlotTrack* plotTrackDefinitio
m_grid = new QwtPlotGrid();
m_grid->attach(this);
m_legend = new QwtLegend(this);
insertLegend(m_legend, QwtPlot::TopLegend, 1.0);
m_legend->setMaxColumns(1);
setFocusPolicy(Qt::ClickFocus);
setDefaults();
}
@@ -281,3 +277,16 @@ QSize RiuWellLogTrackPlot::minimumSizeHint() const
return QSize(0, 0);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiuWellLogTrackPlot::isRimTrackVisible()
{
if (m_plotTrackDefinition)
{
return m_plotTrackDefinition->isVisible();
}
return false;
}

25
ApplicationCode/UserInterface/RiuWellLogTrackPlot.h
View File

@@ -20,6 +20,7 @@
#pragma once
#include "qwt_plot.h"
#include "cafPdmPointer.h"
class RimWellLogPlotTrack;
class QwtPlotGrid;
@@ -40,25 +41,25 @@ public:
RiuWellLogTrackPlot(RimWellLogPlotTrack* plotTrackDefinition, QWidget* parent = NULL);
virtual ~RiuWellLogTrackPlot();
void setDepthZoom(double minDepth, double maxDepth);
void setDepthTitle(const QString& title);
void setDepthZoom(double minDepth, double maxDepth);
void setDepthTitle(const QString& title);
void setXRange(double min, double max);
void setXRange(double min, double max);
bool isRimTrackVisible();
protected:
virtual bool eventFilter(QObject* watched, QEvent* event);
virtual void focusInEvent(QFocusEvent* event);
virtual QSize sizeHint() const;
virtual QSize minimumSizeHint() const;
virtual bool eventFilter(QObject* watched, QEvent* event);
virtual void focusInEvent(QFocusEvent* event);
virtual QSize sizeHint() const;
virtual QSize minimumSizeHint() const;
private:
void setDefaults();
void selectClosestCurve(const QPoint& pos);
void setDefaults();
void selectClosestCurve(const QPoint& pos);
private:
RimWellLogPlotTrack* m_plotTrackDefinition;
QwtPlotGrid* m_grid;
QwtLegend* m_legend;
caf::PdmPointer<RimWellLogPlotTrack> m_plotTrackDefinition;
QwtPlotGrid* m_grid;
};