Skip to content

Commit

Permalink
1.2 : LONG TERM RELEASE. Response on issue #26. Bugfix in SUEWS inter…
Browse files Browse the repository at this point in the history 
…faces.
  • Loading branch information
Fredrik Lindberg authored and Fredrik Lindberg committed Feb 8, 2018
1 parent f8cfb80 commit 4a24852
Show file tree
Hide file tree
Showing 19 changed files with 1,309 additions and 665 deletions.
246 changes: 123 additions & 123 deletions ImageMorphParam/image_morph_param_dialog_base.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>644</width>
<height>453</height>
<width>584</width>
<height>473</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -26,7 +26,7 @@
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="2" column="5">
<item row="2" column="6">
<widget class="QWidget" name="widgetField" native="true">
<property name="minimumSize">
<size>
Expand All @@ -40,7 +40,7 @@
<layout class="QGridLayout" name="gridLayout_9"/>
</widget>
</item>
<item row="1" column="5">
<item row="1" column="6">
<widget class="QWidget" name="widgetPolygrid" native="true">
<property name="minimumSize">
<size>
Expand All @@ -54,27 +54,7 @@
<layout class="QGridLayout" name="gridLayout_7"/>
</widget>
</item>
<item row="1" column="4">
<widget class="QLabel" name="label">
<property name="text">
<string>Vector polygon grid:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QLabel" name="label_5">
<property name="text">
<string>ID field:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="5">
<item row="4" column="6">
<widget class="QWidget" name="widgetDSMbuildground" native="true">
<property name="minimumSize">
<size>
Expand All @@ -88,17 +68,7 @@
<layout class="QGridLayout" name="gridLayout_3"/>
</widget>
</item>
<item row="4" column="4">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Raster DSM (3D objects + ground):</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="5">
<item row="5" column="6">
<widget class="QWidget" name="widgetDEM" native="true">
<property name="minimumSize">
<size>
Expand All @@ -112,17 +82,24 @@
<layout class="QGridLayout" name="gridLayout_4"/>
</widget>
</item>
<item row="5" column="4">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Raster DEM (only ground):</string>
<item row="6" column="6">
<widget class="QWidget" name="widgetDSMbuild" native="true">
<property name="enabled">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<property name="minimumSize">
<size>
<width>175</width>
<height>30</height>
</size>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<layout class="QGridLayout" name="gridLayout_5"/>
</widget>
</item>
<item row="6" column="4">
<item row="6" column="5">
<widget class="QLabel" name="label_4">
<property name="enabled">
<bool>false</bool>
Expand All @@ -135,40 +112,53 @@
</property>
</widget>
</item>
<item row="6" column="5">
<widget class="QWidget" name="widgetDSMbuild" native="true">
<property name="enabled">
<bool>false</bool>
<item row="5" column="5">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Raster DEM (only ground):</string>
</property>
<property name="minimumSize">
<size>
<width>175</width>
<height>30</height>
</size>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</widget>
</item>
<item row="4" column="5">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Raster DSM (3D objects + ground):</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<layout class="QGridLayout" name="gridLayout_5"/>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="checkBoxOnlyBuilding">
<property name="toolTip">
<string>Tick this in if a 3D-object DSM without ground heights is available. 3D objects (e.g. buildings) should be metres above ground.</string>
<item row="2" column="5">
<widget class="QLabel" name="label_5">
<property name="text">
<string>ID field:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QLabel" name="label">
<property name="text">
<string>Raster DSM (only buildings or vegetation) exist</string>
<string>Vector polygon grid:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="addResultToGrid">
<item row="3" column="4" colspan="2">
<widget class="QCheckBox" name="checkBoxOnlyBuilding">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tick this in if you would like to add the isotropic results to the attribute table for your polygon vector grid. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Tick this in if a 3D-object DSM without ground heights is available. 3D objects (e.g. buildings) should be metres above ground.</string>
</property>
<property name="text">
<string>Add result to polygon grid</string>
<string>Raster DSM (only buildings or vegetation) exist</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -262,7 +252,33 @@
</layout>
</widget>
</item>
<item row="9" column="0">
<item row="10" column="0" colspan="7">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>0</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="textVisible">
<bool>true</bool>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="4" colspan="4">
<widget class="QCheckBox" name="addResultToGrid">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tick this in if you would like to add the isotropic results to the attribute table for your polygon vector grid. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Add result to polygon grid attribute table</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QPushButton" name="helpButton">
<property name="enabled">
<bool>true</bool>
Expand All @@ -272,24 +288,54 @@
</property>
</widget>
</item>
<item row="7" column="7">
<item row="10" column="7">
<widget class="QPushButton" name="runButton">
<property name="text">
<string>Run</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="label_6">
<item row="12" column="7">
<widget class="QPushButton" name="closeButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Output folder:</string>
<string>Close</string>
</property>
</widget>
</item>
<item row="8" column="7">
<widget class="QPushButton" name="pushButtonSave">
<property name="text">
<string>Select</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="checkBoxNoData">
<property name="toolTip">
<string>Tick this in if NoData pixels should be ignored and calculation of grid should be performed eventhough NoData pixels exists within that grid. Nodata pixels are set to the average pixel values of the DEM.</string>
</property>
<property name="text">
<string>Ignore NoData pixels</string>
</property>
</widget>
</item>
<item row="8" column="2" colspan="5">
<widget class="QLineEdit" name="textOutput"/>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Roughness calculation method:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="3">
<item row="4" column="3">
<widget class="QComboBox" name="comboBox_Roughness">
<property name="toolTip">
<string>Options to choose methods for roughness calculations regarding zero-plane displacement height (zd) and roughness length (z0) are available.</string>
Expand Down Expand Up @@ -326,69 +372,23 @@
</item>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QLabel" name="label_10">
<item row="4" column="4">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Roughness calculation method:</string>
<string>File prefix:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="9" column="7">
<widget class="QPushButton" name="closeButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
<item row="4" column="7">
<item row="4" column="5">
<widget class="QLineEdit" name="textOutput_prefix"/>
</item>
<item row="2" column="5">
<widget class="QCheckBox" name="checkBoxNoData">
<property name="toolTip">
<string>Tick this in if NoData pixels should be ignored and calculation of grid should be performed eventhough NoData pixels exists within that grid. Nodata pixels are set to the average pixel values of the DEM.</string>
</property>
<property name="text">
<string>Ignore NoData pixels</string>
</property>
</widget>
</item>
<item row="5" column="7">
<widget class="QPushButton" name="pushButtonSave">
<property name="text">
<string>Select</string>
</property>
</widget>
</item>
<item row="5" column="3" colspan="4">
<widget class="QLineEdit" name="textOutput"/>
</item>
<item row="7" column="0" colspan="4">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>0</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="textVisible">
<bool>true</bool>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="6">
<widget class="QLabel" name="label_9">
<item row="8" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string>File prefix:</string>
<string>Output folder:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
Expand Down
Loading

0 comments on commit 4a24852

Please sign in to comment.