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

More improvements to column/rowspan system

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-11-05 16:13:26 +01:00
parent 16536cfde7
commit 3203881418
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp
View File

@ -522,21 +522,22 @@ void RimGridCrossPlot::initAfterRead()
//--------------------------------------------------------------------------------------------------
void RimGridCrossPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add( &m_showInfoBox );
caf::PdmUiGroup* generalGroup = uiOrdering.addNewGroup( "Plot Options" );
generalGroup->add( &m_showInfoBox );
if ( isStandalonePlot() )
{
uiOrdering.add( &m_showPlotLegends );
generalGroup->add( &m_showPlotLegends );
if ( m_showPlotLegends() )
{
uiOrdering.add( &m_legendFontSize );
generalGroup->add( &m_legendFontSize );
}
}
else
{
uiOrdering.add( &m_rowSpan );
uiOrdering.add( &m_colSpan );
generalGroup->add( &m_rowSpan );
generalGroup->add( &m_colSpan );
}
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup( "Name Configuration" );

34
ApplicationCode/UserInterface/RiuGridPlotWindow.cpp
View File

@ -506,7 +506,7 @@ std::pair<int, int> RiuGridPlotWindow::rowAndColumnCount( int plotWidgetCount )
return std::make_pair( 0, 0 );
}
int columnCount = std::max( 1, std::min( m_plotDefinition->columnCount(), plotWidgetCount ) );
int columnCount = std::max( 1, m_plotDefinition->columnCount() );
int rowCount = static_cast<int>( std::ceil( plotWidgetCount / static_cast<double>( columnCount ) ) );
return std::make_pair( rowCount, columnCount );
}
@ -596,14 +596,11 @@ void RiuGridPlotWindow::reinsertPlotWidgets()
int column = 0;
for ( int visibleIndex = 0; visibleIndex < plotWidgets.size(); ++visibleIndex )
{
std::tie( row, column ) = findAvailableRowAndColumn( row,
column,
rowAndColumnCount.first,
rowAndColumnCount.second );
int colSpan = plotWidgets[visibleIndex]->plotDefinition()->colSpan();
int colSpan = std::min( plotWidgets[visibleIndex]->plotDefinition()->colSpan(), rowAndColumnCount.second );
int rowSpan = plotWidgets[visibleIndex]->plotDefinition()->rowSpan();
std::tie( row, column ) = findAvailableRowAndColumn( row, column, colSpan, rowAndColumnCount.second );
m_gridLayout->addWidget( subTitles[visibleIndex], 3 * row, column, 1, colSpan );
m_gridLayout->addWidget( legends[visibleIndex], 3 * row + 1, column, 1, colSpan );
m_gridLayout->addWidget( plotWidgets[visibleIndex], 3 * row + 2, column, 1 + ( rowSpan - 1 ) * 3, colSpan );
@ -779,18 +776,29 @@ QList<QPointer<QLabel>> RiuGridPlotWindow::visibleTitles() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<int, int> RiuGridPlotWindow::findAvailableRowAndColumn( int startRow,
int startColumn,
int expectedRows,
int expectedColumns ) const
std::pair<int, int>
RiuGridPlotWindow::findAvailableRowAndColumn( int startRow, int startColumn, int columnSpan, int columnCount ) const
{
int availableRow = startRow;
int availableColumn = startColumn;
while ( true )
{
for ( ; availableColumn < expectedColumns; ++availableColumn )
for ( ; availableColumn < columnCount; ++availableColumn )
{
if ( m_gridLayout->itemAtPosition( 3 * availableRow, availableColumn ) == nullptr )
bool fits = true;
for ( int c = availableColumn; ( c < availableColumn + columnSpan ) && fits; ++c )
{
if ( c >= columnCount )
{
fits = false;
}
if ( m_gridLayout->itemAtPosition( 3 * availableRow, c ) != nullptr )
{
fits = false;
}
}
if ( fits )
{
return std::make_pair( availableRow, availableColumn );
}

3
ApplicationCode/UserInterface/RiuGridPlotWindow.h
View File

@ -109,8 +109,7 @@ protected:
QList<QPointer<RiuQwtPlotLegend>> visibleLegends() const;
QList<QPointer<QLabel>> visibleTitles() const;
std::pair<int, int>
findAvailableRowAndColumn( int startRow, int startColumn, int expectedRows, int expectedColumns ) const;
std::pair<int, int> findAvailableRowAndColumn( int startRow, int startColumn, int columnSpan, int columnCount ) const;
private slots:
virtual void performUpdate();