Skip to content
Permalink
Browse files
Gui cleanups for interopolation plugin: use labels formatting complia…
…nt with qgis ui guide. Get rid of extra layouts. Improve layout. Use qrc file for resources. Make plugin icon consistent with requirements for docu team.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9214 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Aug 30, 2008
1 parent 76ec56b commit 4e1dcadf78b42c286ada0536543585a723c2d9ad
@@ -36,19 +36,29 @@ SET (INTERPOLATION_MOC_HDRS
qgsinterpolationdialog.h
)

SET (INTERPOLATION_RCCS interpolator.qrc)
########################################################
# Build

QT4_WRAP_UI (INTERPOLATION_UIS_H ${INTERPOLATION_UIS})

QT4_WRAP_CPP (INTERPOLATION_MOC_SRCS ${INTERPOLATION_MOC_HDRS})

ADD_LIBRARY (interpolationplugin MODULE ${INTERPOLATION_SRCS} ${INTERPOLATION_MOC_SRCS} ${INTERPOLATION_RCC_SRCS} ${INTERPOLATION_UIS_H})
QT4_ADD_RESOURCES(INTERPOLATION_RCC_SRCS ${INTERPOLATION_RCCS})

ADD_LIBRARY (interpolationplugin MODULE
${INTERPOLATION_SRCS}
${INTERPOLATION_MOC_SRCS}
${INTERPOLATION_RCC_SRCS}
${INTERPOLATION_UIS_H})

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${GEOS_INCLUDE_DIR}
../../core ../../core/raster ../../core/renderer ../../core/symbology
../../core
../../core/raster
../../core/renderer
../../core/symbology
../../gui
..
.
@@ -65,4 +75,5 @@ TARGET_LINK_LIBRARIES(interpolationplugin

INSTALL(TARGETS interpolationplugin
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}
)
Binary file not shown.
@@ -0,0 +1,6 @@
<RCC>
<qresource prefix="/interpolator" >
<file>options.png</file>
<file>interpolation.png</file>
</qresource>
</RCC>

This file was deleted.

Binary file not shown.
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>485</width>
<height>538</height>
<height>372</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -16,7 +16,7 @@
</sizepolicy>
</property>
<property name="windowTitle" >
<string>Dialog</string>
<string>Interpolation plugin</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
@@ -32,39 +32,58 @@
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="mInputVectorLayerLabel" >
<property name="text" >
<string>Input vector layer:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mInputLayerComboBox" />
</item>
</layout>
<widget class="QLabel" name="mInputVectorLayerLabel" >
<property name="text" >
<string>Input vector layer</string>
</property>
<property name="buddy" >
<cstring>mInputLayerComboBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="mInputLayerComboBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string/>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QCheckBox" name="mUseZCoordCheckBox" >
<property name="text" >
<string>Use z-Coordinate for interpolation</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="mInterpolationAttributeLabel" >
<property name="text" >
<string>Interpolation attribute: </string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mInterpolationAttributeComboBox" />
</item>
</layout>
<widget class="QLabel" name="mInterpolationAttributeLabel" >
<property name="text" >
<string>Interpolation attribute </string>
</property>
<property name="buddy" >
<cstring>mInterpolationAttributeComboBox</cstring>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QComboBox" name="mInterpolationAttributeComboBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
@@ -81,96 +100,82 @@
<string>Output</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="mInterpolationLabel" >
<property name="text" >
<string>Interpolation method:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mInterpolationMethodComboBox" />
</item>
</layout>
<item row="0" column="0" >
<widget class="QLabel" name="mInterpolationLabel" >
<property name="text" >
<string>Interpolation method</string>
</property>
<property name="buddy" >
<cstring>mInterpolationMethodComboBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="mInterpolationMethodComboBox" />
</item>
<item row="0" column="2" >
<widget class="QToolButton" name="mConfigureInterpolationButton" >
<property name="text" >
<string>...</string>
</property>
<property name="icon" >
<iconset resource="interpolator.qrc" >:/interpolator/options.png</iconset>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QPushButton" name="mConfigureInterpolationButton" >
<widget class="QLabel" name="mNumberOfColumnsLabel" >
<property name="text" >
<string>Configure interpolation method...</string>
<string>Number of columns</string>
</property>
<property name="buddy" >
<cstring>mNumberOfColumnsSpinBox</cstring>
</property>
</widget>
</item>
<item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>51</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="mNumberOfColumnsLabel" >
<property name="text" >
<string>Number of columns:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="mNumberOfColumnsSpinBox" >
<property name="maximum" >
<number>10000000</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="mNumberOfRowsLabel" >
<property name="text" >
<string>Number of rows:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="mNumberOfRowsSpinBox" >
<property name="maximum" >
<number>10000000</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="mOutputFileLabel" >
<property name="text" >
<string>Output File: </string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mOutputFileLineEdit" />
</item>
<item>
<widget class="QPushButton" name="mOutputFileButton" >
<property name="text" >
<string>...</string>
</property>
</widget>
</item>
</layout>
<item row="1" column="1" colspan="2" >
<widget class="QSpinBox" name="mNumberOfColumnsSpinBox" >
<property name="maximum" >
<number>10000000</number>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="mNumberOfRowsLabel" >
<property name="text" >
<string>Number of rows</string>
</property>
<property name="buddy" >
<cstring>mNumberOfRowsSpinBox</cstring>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2" >
<widget class="QSpinBox" name="mNumberOfRowsSpinBox" >
<property name="maximum" >
<number>10000000</number>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="mOutputFileLabel" >
<property name="text" >
<string>Output file </string>
</property>
<property name="buddy" >
<cstring>mOutputFileLineEdit</cstring>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QLineEdit" name="mOutputFileLineEdit" />
</item>
<item row="3" column="2" >
<widget class="QToolButton" name="mOutputFileButton" >
<property name="text" >
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
@@ -181,13 +186,27 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<tabstops>
<tabstop>mInputLayerComboBox</tabstop>
<tabstop>mUseZCoordCheckBox</tabstop>
<tabstop>mInterpolationAttributeComboBox</tabstop>
<tabstop>mInterpolationMethodComboBox</tabstop>
<tabstop>mConfigureInterpolationButton</tabstop>
<tabstop>mNumberOfColumnsSpinBox</tabstop>
<tabstop>mNumberOfRowsSpinBox</tabstop>
<tabstop>mOutputFileLineEdit</tabstop>
<tabstop>mOutputFileButton</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
<include location="interpolator.qrc" />
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
@@ -196,8 +215,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>248</x>
<y>254</y>
<x>257</x>
<y>362</y>
</hint>
<hint type="destinationlabel" >
<x>157</x>
@@ -212,8 +231,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>316</x>
<y>260</y>
<x>325</x>
<y>362</y>
</hint>
<hint type="destinationlabel" >
<x>286</x>

0 comments on commit 4e1dcad

Please sign in to comment.