mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-28 00:17:30 -05:00
[composer] More tweaks to grid UI:
- show grid name in draw grid checkbox to aid UX - restore 12 decimal places for grid interval/offset - rearrange controls for improved user flow - disabled cross width control when grid type is not set to cross - switch to collapsible group boxes
This commit is contained in:
Nyall Dawson
parent
4e62dde858
commit
a44e48c52e
@ -1203,6 +1203,11 @@ void QgsComposerMapWidget::on_mGridListWidget_itemChanged( QListWidgetItem* item
|
||||
}
|
||||
|
||||
grid->setName( item->text() );
|
||||
if ( item->isSelected() )
|
||||
{
|
||||
//update check box title if item is current item
|
||||
mGridCheckBox->setTitle( QString( tr( "Draw \"%1\" grid" ) ).arg( grid->name() ) );
|
||||
}
|
||||
}
|
||||
|
||||
void QgsComposerMapWidget::setGridItemsEnabled( bool enabled )
|
||||
@ -1267,6 +1272,8 @@ void QgsComposerMapWidget::setGridItems( const QgsComposerMapGrid* grid )
|
||||
}
|
||||
|
||||
blockGridItemsSignals( true );
|
||||
|
||||
mGridCheckBox->setTitle( QString( tr( "Draw \"%1\" grid" ) ).arg( grid->name() ) );
|
||||
mGridCheckBox->setChecked( grid->gridEnabled() );
|
||||
mIntervalXSpinBox->setValue( grid->gridIntervalX() );
|
||||
mIntervalYSpinBox->setValue( grid->gridIntervalY() );
|
||||
@ -1283,10 +1290,14 @@ void QgsComposerMapWidget::setGridItems( const QgsComposerMapGrid* grid )
|
||||
if ( gridStyle == QgsComposerMap::Cross )
|
||||
{
|
||||
mGridTypeComboBox->setCurrentIndex( mGridTypeComboBox->findText( tr( "Cross" ) ) );
|
||||
mCrossWidthSpinBox->setEnabled( true );
|
||||
mCrossWidthLabel->setEnabled( true );
|
||||
}
|
||||
else
|
||||
{
|
||||
mGridTypeComboBox->setCurrentIndex( mGridTypeComboBox->findText( tr( "Solid" ) ) );
|
||||
mCrossWidthSpinBox->setEnabled( false );
|
||||
mCrossWidthLabel->setEnabled( false );
|
||||
}
|
||||
|
||||
//grid frame
|
||||
@ -1606,10 +1617,14 @@ void QgsComposerMapWidget::on_mGridTypeComboBox_currentIndexChanged( const QStri
|
||||
if ( text == tr( "Cross" ) )
|
||||
{
|
||||
grid->setGridStyle( QgsComposerMap::Cross );
|
||||
mCrossWidthSpinBox->setEnabled( true );
|
||||
mCrossWidthLabel->setEnabled( true );
|
||||
}
|
||||
else
|
||||
{
|
||||
grid->setGridStyle( QgsComposerMap::Solid );
|
||||
mCrossWidthSpinBox->setEnabled( false );
|
||||
mCrossWidthLabel->setEnabled( false );
|
||||
}
|
||||
mComposerMap->update();
|
||||
mComposerMap->endCommand();
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>-387</y>
|
||||
<y>-623</y>
|
||||
<width>439</width>
|
||||
<height>1944</height>
|
||||
</rect>
|
||||
@ -474,7 +474,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="mGridCheckBox">
|
||||
<widget class="QgsCollapsibleGroupBoxBasic" name="mGridCheckBox">
|
||||
<property name="title">
|
||||
<string>Draw grid</string>
|
||||
</property>
|
||||
@ -488,7 +488,7 @@
|
||||
<string notr="true">composeritem</string>
|
||||
</property>
|
||||
<property name="collapsed" stdset="0">
|
||||
<bool>true</bool>
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
@ -519,151 +519,27 @@
|
||||
<widget class="QComboBox" name="mGridTypeComboBox"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="mIntervalXLabel_2">
|
||||
<property name="text">
|
||||
<string>Interval</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_9">
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
|
||||
<property name="prefix">
|
||||
<string>X </string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>9999999.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="mIntervalYSpinBox">
|
||||
<property name="prefix">
|
||||
<string>Y </string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>9999999.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="mOffsetXLabel_2">
|
||||
<property name="text">
|
||||
<string>Offset</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_10">
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
|
||||
<property name="prefix">
|
||||
<string>X </string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>9999999.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
|
||||
<property name="prefix">
|
||||
<string>Y </string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>9999999.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="mCrossWidthLabel_2">
|
||||
<property name="text">
|
||||
<string>Cross width</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QDoubleSpinBox" name="mCrossWidthSpinBox">
|
||||
<property name="decimals">
|
||||
<number>5</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="mLineStyleLabel_2">
|
||||
<property name="text">
|
||||
<string>Line style</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QPushButton" name="mGridLineStyleButton">
|
||||
<property name="text">
|
||||
<string>change...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="mGridBlendLabel">
|
||||
<property name="text">
|
||||
<string>Blend mode</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QgsBlendModeComboBox" name="mGridBlendComboBox"/>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="mMapGridCRSLabel">
|
||||
<property name="text">
|
||||
<string>CRS</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<item row="1" column="1">
|
||||
<widget class="QPushButton" name="mMapGridCRSButton">
|
||||
<property name="text">
|
||||
<string>change...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="0">
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="mMapGridUnitLabel">
|
||||
<property name="text">
|
||||
<string>Unit</string>
|
||||
<string>Interval units</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<item row="2" column="1">
|
||||
<widget class="QComboBox" name="mMapGridUnitComboBox">
|
||||
<item>
|
||||
<property name="text">
|
||||
@ -682,10 +558,137 @@
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="mIntervalXLabel_2">
|
||||
<property name="text">
|
||||
<string>Interval</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_9">
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
|
||||
<property name="prefix">
|
||||
<string>X </string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>12</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>9999999.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="mIntervalYSpinBox">
|
||||
<property name="prefix">
|
||||
<string>Y </string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>12</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>9999999.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="mOffsetXLabel_2">
|
||||
<property name="text">
|
||||
<string>Offset</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_10">
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
|
||||
<property name="prefix">
|
||||
<string>X </string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>12</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>9999999.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
|
||||
<property name="prefix">
|
||||
<string>Y </string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>12</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>9999999.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="mCrossWidthLabel">
|
||||
<property name="text">
|
||||
<string>Cross width</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QDoubleSpinBox" name="mCrossWidthSpinBox">
|
||||
<property name="suffix">
|
||||
<string> mm</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>2</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="mLineStyleLabel_2">
|
||||
<property name="text">
|
||||
<string>Line style</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<widget class="QPushButton" name="mGridLineStyleButton">
|
||||
<property name="text">
|
||||
<string>change...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="0">
|
||||
<widget class="QLabel" name="mGridBlendLabel">
|
||||
<property name="text">
|
||||
<string>Blend mode</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<widget class="QgsBlendModeComboBox" name="mGridBlendComboBox"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="mGridFrameGroupBox">
|
||||
<widget class="QgsCollapsibleGroupBoxBasic" name="mGridFrameGroupBox">
|
||||
<property name="title">
|
||||
<string>Grid frame</string>
|
||||
</property>
|
||||
@ -760,7 +763,11 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1" colspan="2">
|
||||
<widget class="QDoubleSpinBox" name="mFrameWidthSpinBox"/>
|
||||
<widget class="QDoubleSpinBox" name="mFrameWidthSpinBox">
|
||||
<property name="suffix">
|
||||
<string> mm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="mFramePenLabel">
|
||||
@ -773,7 +780,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="mDrawAnnotationGroupBox">
|
||||
<widget class="QgsCollapsibleGroupBoxBasic" name="mDrawAnnotationGroupBox">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
@ -790,7 +797,7 @@
|
||||
<string/>
|
||||
</property>
|
||||
<property name="collapsed" stdset="0">
|
||||
<bool>true</bool>
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout_2">
|
||||
<property name="leftMargin">
|
||||
@ -927,7 +934,11 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="11" column="1">
|
||||
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
|
||||
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox">
|
||||
<property name="suffix">
|
||||
<string> mm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="12" column="0">
|
||||
<widget class="QLabel" name="mCoordinatePrecisionLabel">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user