diff --git a/timeseriesviewer/ui/mapviewdefinition.ui b/timeseriesviewer/ui/mapviewdefinition.ui index 4f175279e8be8fd85c1e93be0d4c0084b795e1de..bee3aece51582a9b6f1710c1119239a7fd46aefe 100644 --- a/timeseriesviewer/ui/mapviewdefinition.ui +++ b/timeseriesviewer/ui/mapviewdefinition.ui @@ -7,14 +7,14 @@ <x>0</x> <y>0</y> <width>453</width> - <height>199</height> + <height>110</height> </rect> </property> <property name="windowTitle"> - <string>GroupBox</string> + <string/> </property> <property name="title"> - <string>Map View #1</string> + <string/> </property> <layout class="QFormLayout" name="formLayout"> <property name="horizontalSpacing"> @@ -210,7 +210,6 @@ </widget> <resources> <include location="resources.qrc"/> - <include location="../../../../../Programs/OSGeo4W/bin/resources.qrc"/> </resources> <connections/> </ui> diff --git a/timeseriesviewer/ui/mapviewrendersettings.ui b/timeseriesviewer/ui/mapviewrendersettings.ui index 225af222df9205e22001a2ecebfe8c645eb1e5aa..c71962454af9f823f1a780bad779358346a92baf 100644 --- a/timeseriesviewer/ui/mapviewrendersettings.ui +++ b/timeseriesviewer/ui/mapviewrendersettings.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>300</width> - <height>181</height> + <width>260</width> + <height>135</height> </rect> </property> <property name="sizePolicy"> @@ -19,13 +19,13 @@ <property name="minimumSize"> <size> <width>260</width> - <height>160</height> + <height>135</height> </size> </property> <property name="maximumSize"> <size> - <width>300</width> - <height>181</height> + <width>260</width> + <height>151</height> </size> </property> <property name="font"> @@ -47,141 +47,57 @@ </property> <layout class="QVBoxLayout" name="verticalLayout"> <property name="spacing"> - <number>2</number> + <number>1</number> </property> <property name="margin"> <number>0</number> </property> <item> - <widget class="QLabel" name="labelTitle"> - <property name="font"> - <font> - <pointsize>8</pointsize> - <weight>50</weight> - <italic>false</italic> - <bold>false</bold> - <kerning>true</kerning> - </font> - </property> - <property name="text"> - <string>Sensor Name</string> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <layout class="QGridLayout" name="gridLayout"> - <property name="margin"> - <number>1</number> - </property> - <property name="spacing"> - <number>2</number> - </property> - <item row="1" column="0"> - <widget class="QLabel" name="labelRed"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="labelTitle"> <property name="font"> <font> - <pointsize>9</pointsize> + <pointsize>8</pointsize> + <weight>50</weight> + <italic>false</italic> + <bold>false</bold> + <kerning>true</kerning> </font> </property> - <property name="styleSheet"> - <string notr="true"/> - </property> - <property name="text"> - <string>R</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QSlider" name="sliderGreen"> - <property name="styleSheet"> - <string notr="true"/> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>6</number> - </property> - <property name="value"> - <number>2</number> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="tickPosition"> - <enum>QSlider::NoTicks</enum> - </property> - <property name="tickInterval"> - <number>1</number> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QSlider" name="sliderBlue"> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>6</number> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="tickPosition"> - <enum>QSlider::NoTicks</enum> - </property> - <property name="tickInterval"> - <number>1</number> - </property> - </widget> - </item> - <item row="3" column="2"> - <widget class="QLineEdit" name="tbBlueMin"> - <property name="font"> - <font> - <pointsize>9</pointsize> - </font> + <property name="toolTip"> + <string>Sensor name</string> </property> <property name="text"> - <string>0</string> + <string>Sensor Name</string> </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QLineEdit" name="tbGreenMin"> - <property name="font"> - <font> - <pointsize>9</pointsize> - </font> - </property> - <property name="text"> - <string>0</string> + <property name="alignment"> + <set>Qt::AlignCenter</set> </property> </widget> </item> - <item row="3" column="3"> - <widget class="QLineEdit" name="tbBlueMax"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="font"> - <font> - <pointsize>9</pointsize> - </font> - </property> - <property name="text"> - <string>5000</string> + <item> + <widget class="QComboBox" name="cbRenderType"> + <property name="maximumSize"> + <size> + <width>60</width> + <height>16777215</height> + </size> </property> + <item> + <property name="text"> + <string>Multi</string> + </property> + </item> + <item> + <property name="text"> + <string>Single</string> + </property> + </item> </widget> </item> - <item row="1" column="3"> - <widget class="QLineEdit" name="tbRedMax"> + <item> + <widget class="QLabel" name="labelSummary"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -190,222 +106,695 @@ </property> <property name="minimumSize"> <size> - <width>50</width> - <height>0</height> + <width>0</width> + <height>15</height> </size> </property> <property name="font"> <font> - <pointsize>9</pointsize> - </font> - </property> - <property name="text"> - <string>5000</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="QLineEdit" name="tbGreenMax"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="font"> - <font> - <pointsize>9</pointsize> + <pointsize>8</pointsize> </font> </property> <property name="text"> - <string>5000</string> + <string><RGB Bands></string> </property> </widget> </item> - <item row="0" column="3"> - <widget class="QLabel" name="labelMin"> - <property name="text"> - <string>Max</string> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="labelMax"> - <property name="text"> - <string>Min</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSlider" name="sliderRed"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>1</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>130</width> - <height>0</height> - </size> - </property> - <property name="styleSheet"> - <string notr="true"/> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>6</number> - </property> - <property name="value"> - <number>3</number> - </property> + <item> + <spacer name="horizontalSpacer_2"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="tickPosition"> - <enum>QSlider::TicksAbove</enum> - </property> - <property name="tickInterval"> - <number>1</number> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="labelBlue"> - <property name="font"> - <font> - <pointsize>9</pointsize> - </font> - </property> - <property name="text"> - <string>B</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QLineEdit" name="tbRedMin"> - <property name="minimumSize"> + <property name="sizeHint" stdset="0"> <size> - <width>50</width> - <height>0</height> + <width>40</width> + <height>20</height> </size> </property> - <property name="font"> - <font> - <pointsize>9</pointsize> - </font> - </property> - <property name="text"> - <string>0</string> - </property> - </widget> + </spacer> </item> - <item row="2" column="0"> - <widget class="QLabel" name="labelGreen"> - <property name="font"> - <font> - <pointsize>9</pointsize> - </font> + </layout> + </item> + <item> + <widget class="QStackedWidget" name="stackedWidget"> + <property name="minimumSize"> + <size> + <width>250</width> + <height>0</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="currentIndex"> + <number>1</number> + </property> + <widget class="QWidget" name="pageMultiBand"> + <layout class="QGridLayout" name="gridLayout_2"> + <property name="leftMargin"> + <number>2</number> </property> - <property name="styleSheet"> - <string notr="true"/> + <property name="topMargin"> + <number>0</number> </property> - <property name="text"> - <string>G</string> + <property name="rightMargin"> + <number>2</number> </property> - </widget> - </item> - <item row="0" column="0" colspan="2"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="spacing"> + <property name="bottomMargin"> <number>0</number> </property> - <property name="leftMargin"> + <property name="horizontalSpacing"> + <number>2</number> + </property> + <property name="verticalSpacing"> <number>0</number> </property> - <item> - <widget class="QToolButton" name="btnDefault"> + <item row="1" column="1"> + <widget class="QSlider" name="sliderRed"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="styleSheet"> + <string notr="true"/> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>6</number> + </property> + <property name="value"> + <number>3</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="tickPosition"> + <enum>QSlider::TicksAbove</enum> + </property> + <property name="tickInterval"> + <number>1</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="labelMax"> + <property name="text"> + <string>Min</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QLineEdit" name="tbRedMin"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>0</height> + </size> + </property> <property name="font"> <font> - <pointsize>9</pointsize> - <italic>false</italic> + <pointsize>8</pointsize> </font> </property> - <property name="toolTip"> - <string>default band selection</string> + <property name="text"> + <string>0</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLineEdit" name="tbGreenMin"> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> </property> <property name="text"> - <string>D</string> + <string>0</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="btnTrueColor"> + <item row="1" column="3"> + <widget class="QLineEdit" name="tbRedMax"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>0</height> + </size> + </property> <property name="font"> <font> - <pointsize>9</pointsize> - <italic>false</italic> + <pointsize>8</pointsize> </font> </property> - <property name="toolTip"> - <string>red-green-blue (true colour)</string> + <property name="text"> + <string>5000</string> </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="QLabel" name="labelMin"> <property name="text"> - <string>TC</string> + <string>Max</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="btnCIR"> + <item row="2" column="3"> + <widget class="QLineEdit" name="tbGreenMax"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> + </property> + <property name="text"> + <string>5000</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="labelGreen"> <property name="font"> <font> - <pointsize>9</pointsize> - <italic>false</italic> + <pointsize>8</pointsize> </font> </property> - <property name="toolTip"> - <string>swIR-red-green (coloured infra-red)</string> + <property name="styleSheet"> + <string notr="true"/> </property> <property name="text"> - <string>CIR</string> + <string>G</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="btn453"> + <item row="2" column="1"> + <widget class="QSlider" name="sliderGreen"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="styleSheet"> + <string notr="true"/> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>6</number> + </property> + <property name="value"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="tickPosition"> + <enum>QSlider::TicksAbove</enum> + </property> + <property name="tickInterval"> + <number>1</number> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="labelRed"> <property name="font"> <font> - <pointsize>9</pointsize> - <italic>false</italic> + <pointsize>8</pointsize> </font> </property> - <property name="toolTip"> - <string>swIR-mwIR-red</string> + <property name="styleSheet"> + <string notr="true"/> </property> <property name="text"> - <string>453</string> + <string>R</string> </property> </widget> </item> - <item> - <spacer name="horizontalSpacer"> + <item row="3" column="0"> + <widget class="QLabel" name="labelBlue"> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> + </property> + <property name="text"> + <string>B</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QSlider" name="sliderBlue"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>6</number> + </property> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0"> + <property name="tickPosition"> + <enum>QSlider::TicksAbove</enum> + </property> + <property name="tickInterval"> + <number>1</number> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QLineEdit" name="tbBlueMin"> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> + </property> + <property name="text"> + <string>0</string> + </property> + </widget> + </item> + <item row="3" column="3"> + <widget class="QLineEdit" name="tbBlueMax"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> + </property> + <property name="text"> + <string>5000</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="2"> + <widget class="QFrame" name="btnBarMB"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> <size> - <width>40</width> - <height>20</height> + <width>150</width> + <height>0</height> </size> </property> - </spacer> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QToolButton" name="btnDefaultMB"> + <property name="font"> + <font> + <pointsize>8</pointsize> + <italic>false</italic> + </font> + </property> + <property name="toolTip"> + <string>default band selection</string> + </property> + <property name="text"> + <string>D</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="btnTrueColor"> + <property name="font"> + <font> + <pointsize>8</pointsize> + <italic>false</italic> + </font> + </property> + <property name="toolTip"> + <string>red-green-blue (true colour)</string> + </property> + <property name="text"> + <string>TC</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="btnCIR"> + <property name="font"> + <font> + <pointsize>8</pointsize> + <italic>false</italic> + </font> + </property> + <property name="toolTip"> + <string>swIR-red-green (coloured infra-red)</string> + </property> + <property name="text"> + <string>CIR</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="btn453"> + <property name="font"> + <font> + <pointsize>8</pointsize> + <italic>false</italic> + </font> + </property> + <property name="toolTip"> + <string>swIR-mwIR-red</string> + </property> + <property name="text"> + <string>453</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> </item> </layout> - </item> - </layout> + </widget> + <widget class="QWidget" name="pageSingleBand"> + <layout class="QGridLayout" name="gridLayout"> + <property name="horizontalSpacing"> + <number>2</number> + </property> + <property name="verticalSpacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item row="3" column="1"> + <widget class="QSlider" name="sliderSingleBand"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>6</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="tickPosition"> + <enum>QSlider::TicksAbove</enum> + </property> + <property name="tickInterval"> + <number>1</number> + </property> + </widget> + </item> + <item row="8" column="1" colspan="4"> + <widget class="QFrame" name="frame"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <property name="horizontalSpacing"> + <number>1</number> + </property> + <property name="verticalSpacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item row="1" column="0"> + <widget class="QgsColorRampComboBox" name="cbSingleBandColorRamp"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> + <property name="toolTip"> + <string>Color ramp</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QComboBox" name="cbSingleBandColorRampType"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>2</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Type of color ramp</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="QComboBox" name="cbSingleBandMode"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>2</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Color classification</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item row="2" column="1"> + <widget class="QFrame" name="bntBarSB"> + <property name="minimumSize"> + <size> + <width>150</width> + <height>0</height> + </size> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QToolButton" name="btnSingleBandDef"> + <property name="font"> + <font> + <italic>false</italic> + </font> + </property> + <property name="text"> + <string>D</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="btnSingleBandBlue"> + <property name="toolTip"> + <string>Select band from visible blue</string> + </property> + <property name="text"> + <string>B</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="btnSingleBandGreen"> + <property name="toolTip"> + <string>Select band from visible green</string> + </property> + <property name="text"> + <string>G</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="btnSingleBandRed"> + <property name="toolTip"> + <string>Select band from visible red</string> + </property> + <property name="text"> + <string>R</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="btnSingleBandNIR"> + <property name="toolTip"> + <string>Select band from near infra-red</string> + </property> + <property name="text"> + <string>nIR</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="btnSingleBandSWIR"> + <property name="toolTip"> + <string>Select band from shortwave infra-red</string> + </property> + <property name="text"> + <string>swIR</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="2" column="3"> + <widget class="QLabel" name="labelMin_2"> + <property name="text"> + <string>Min</string> + </property> + </widget> + </item> + <item row="3" column="3"> + <widget class="QLineEdit" name="tbSingleBandMin"> + <property name="minimumSize"> + <size> + <width>50</width> + <height>0</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> + </property> + <property name="text"> + <string>0</string> + </property> + </widget> + </item> + <item row="2" column="4"> + <widget class="QLabel" name="labelMax_2"> + <property name="text"> + <string>Max</string> + </property> + </widget> + </item> + <item row="3" column="4"> + <widget class="QLineEdit" name="tbSingleBandMax"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>0</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> + </property> + <property name="text"> + <string>5000</string> + </property> + </widget> + </item> + </layout> + </widget> + </widget> </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_4"> @@ -470,39 +859,15 @@ </property> <property name="font"> <font> - <pointsize>9</pointsize> + <pointsize>8</pointsize> </font> </property> </widget> </item> </layout> </item> - <item> - <widget class="QLabel" name="labelSummary"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>15</height> - </size> - </property> - <property name="font"> - <font> - <pointsize>8</pointsize> - </font> - </property> - <property name="text"> - <string><RGB Bands></string> - </property> - </widget> - </item> </layout> - <action name="actionSetDefault"> + <action name="actionSetDefaultMB"> <property name="text"> <string>Def</string> </property> @@ -570,17 +935,63 @@ <string>Apply Style</string> </property> </action> + <action name="actionSetR"> + <property name="text"> + <string>R</string> + </property> + </action> + <action name="actionSetG"> + <property name="text"> + <string>G</string> + </property> + </action> + <action name="actionSetB"> + <property name="text"> + <string>B</string> + </property> + </action> + <action name="actionSetNIR"> + <property name="text"> + <string>nIR</string> + </property> + </action> + <action name="actionSetSWIR"> + <property name="text"> + <string>swIR</string> + </property> + </action> + <action name="actionSetDefaultSB"> + <property name="text"> + <string>Def</string> + </property> + </action> </widget> - <tabstops> - <tabstop>tbRedMin</tabstop> - <tabstop>tbGreenMin</tabstop> - <tabstop>tbBlueMin</tabstop> - <tabstop>tbRedMax</tabstop> - <tabstop>tbGreenMax</tabstop> - <tabstop>tbBlueMax</tabstop> - </tabstops> + <customwidgets> + <customwidget> + <class>QgsColorRampComboBox</class> + <extends>QComboBox</extends> + <header>qgscolorrampcombobox.h</header> + </customwidget> + </customwidgets> <resources> <include location="resources.qrc"/> </resources> - <connections/> + <connections> + <connection> + <sender>cbRenderType</sender> + <signal>currentIndexChanged(int)</signal> + <receiver>stackedWidget</receiver> + <slot>setCurrentIndex(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>107</x> + <y>19</y> + </hint> + <hint type="destinationlabel"> + <x>144</x> + <y>54</y> + </hint> + </hints> + </connection> + </connections> </ui> diff --git a/timeseriesviewer/ui/profileviewdock.ui b/timeseriesviewer/ui/profileviewdock.ui index c9fddb703882d81ccfa89bbbd3227a584ed6abaf..a6b32381724714a116090f7ac1f08a4eb88f5694 100644 --- a/timeseriesviewer/ui/profileviewdock.ui +++ b/timeseriesviewer/ui/profileviewdock.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>624</width> - <height>265</height> + <width>664</width> + <height>185</height> </rect> </property> <property name="features"> @@ -27,31 +27,44 @@ <item> <widget class="QFrame" name="frame"> <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> + <enum>QFrame::NoFrame</enum> </property> <property name="frameShadow"> <enum>QFrame::Plain</enum> </property> <layout class="QHBoxLayout" name="horizontalLayout"> <property name="spacing"> - <number>6</number> + <number>1</number> </property> <property name="margin"> <number>0</number> </property> + <item> + <widget class="Line" name="line"> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> <item> <widget class="QListWidget" name="listWidget"> <property name="maximumSize"> <size> - <width>75</width> + <width>35</width> <height>16777215</height> </size> </property> + <property name="styleSheet"> + <string notr="true"/> + </property> <property name="frameShape"> - <enum>QFrame::NoFrame</enum> + <enum>QFrame::StyledPanel</enum> </property> <property name="frameShadow"> - <enum>QFrame::Plain</enum> + <enum>QFrame::Sunken</enum> </property> <property name="layoutMode"> <enum>QListView::SinglePass</enum> @@ -71,25 +84,11 @@ </item> <item> <property name="text"> - <string>Settings</string> - </property> - <property name="icon"> - <iconset resource="resources.qrc"> - <normaloff>:/timeseriesviewer/icons/symbology.png</normaloff>:/timeseriesviewer/icons/symbology.png</iconset> + <string>Pixel</string> </property> </item> </widget> </item> - <item> - <widget class="Line" name="line"> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - </widget> - </item> <item> <widget class="QStackedWidget" name="stackedWidget"> <property name="sizePolicy"> @@ -98,45 +97,391 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="currentIndex"> + <number>0</number> + </property> <widget class="QWidget" name="page2D"> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>2</number> + </property> <property name="margin"> <number>0</number> </property> <item> - <widget class="QSplitter" name="splitter"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <widget class="PlotWidget" name="graphicsView2D"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>3</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QFrame" name="frameSettings2D"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <property name="spacing"> + <number>0</number> </property> - </widget> - <widget class="QTableView" name="tableView2D"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>1</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="margin"> + <number>0</number> </property> - </widget> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_5"> + <property name="spacing"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <item> + <widget class="QToolButton" name="btnRefresh2D"> + <property name="text"> + <string>...</string> + </property> + <property name="icon"> + <iconset resource="resources.qrc"> + <normaloff>:/timeseriesviewer/icons/mActionRefresh.png</normaloff>:/timeseriesviewer/icons/mActionRefresh.png</iconset> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QTableView" name="tableView2DBands"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>1</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>150</width> + <height>0</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="PlotWidget" name="graphicsView2D"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>3</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="styleSheet"> + <string notr="true">background-color: rgb(0, 0, 0);</string> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="backgroundBrush"> + <brush brushstyle="NoBrush"> + <color alpha="255"> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + </brush> + </property> + <property name="foregroundBrush"> + <brush brushstyle="NoBrush"> + <color alpha="255"> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + </brush> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="page3D"> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <property name="spacing"> + <number>2</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QFrame" name="frameSettings3D"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <property name="spacing"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <item> + <widget class="QToolButton" name="btnRefresh3D"> + <property name="text"> + <string>...</string> + </property> + <property name="icon"> + <iconset resource="resources.qrc"> + <normaloff>:/timeseriesviewer/icons/mActionRefresh.png</normaloff>:/timeseriesviewer/icons/mActionRefresh.png</iconset> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QTableView" name="tableView2DBands_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>1</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>150</width> + <height>0</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QLabel" name="labelDummy3D"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>3</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <pointsize>9</pointsize> + </font> + </property> + <property name="styleSheet"> + <string notr="true">color: rgb(255, 255, 0); +background-color: rgb(0, 0, 0);</string> + </property> + <property name="text"> + <string>Unable to initialize 3D plot window. +Please ensure that PyOpenGL is installed +(http://pyopengl.sourceforge.net)</string> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="pagePixel"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QTableView" name="tableViewPixelCollection"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> </widget> </item> </layout> </widget> - <widget class="QWidget" name="page3D"/> - <widget class="QWidget" name="pageSettings"/> </widget> </item> </layout> + <zorder>listWidget</zorder> + <zorder>line</zorder> + <zorder>stackedWidget</zorder> + </widget> + </item> + <item> + <widget class="QFrame" name="infoBar"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>15</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QProgressBar" name="progressBar"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>100</width> + <height>16777215</height> + </size> + </property> + <property name="value"> + <number>24</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="progressInfo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <horstretch>2</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>1</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>300</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string>Progress info</string> + </property> + <property name="textFormat"> + <enum>Qt::LogText</enum> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>247</width> + <height>0</height> + </size> + </property> + </spacer> + </item> + </layout> </widget> </item> </layout> </widget> + <action name="actionRefresh2D"> + <property name="icon"> + <iconset resource="resources.qrc"> + <normaloff>:/timeseriesviewer/icons/mActionRefresh.png</normaloff>:/timeseriesviewer/icons/mActionRefresh.png</iconset> + </property> + <property name="text"> + <string>refresh2D</string> + </property> + <property name="toolTip"> + <string>Refresh plot</string> + </property> + </action> </widget> <customwidgets> <customwidget> @@ -148,5 +493,22 @@ <resources> <include location="resources.qrc"/> </resources> - <connections/> + <connections> + <connection> + <sender>listWidget</sender> + <signal>currentRowChanged(int)</signal> + <receiver>stackedWidget</receiver> + <slot>setCurrentIndex(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>38</x> + <y>110</y> + </hint> + <hint type="destinationlabel"> + <x>213</x> + <y>102</y> + </hint> + </hints> + </connection> + </connections> </ui> diff --git a/timeseriesviewer/ui/timeseriesviewer.ui b/timeseriesviewer/ui/timeseriesviewer.ui index 26e52b32572f7ab9c009a63d53d890aa6d1dd284..fa34d30172ffbbc334fec87f17b3453349080223 100644 --- a/timeseriesviewer/ui/timeseriesviewer.ui +++ b/timeseriesviewer/ui/timeseriesviewer.ui @@ -200,8 +200,9 @@ <addaction name="actionZoomMaxExtent"/> <addaction name="actionZoomPixelScale"/> <addaction name="actionPan"/> + <addaction name="actionIdentifyMapLayers"/> + <addaction name="actionIdentifyTimeSeries"/> <addaction name="separator"/> - <addaction name="actionIdentify"/> <addaction name="actionAbout"/> </widget> <action name="actionSelectCenter"> @@ -459,7 +460,7 @@ <string>Panels</string> </property> </action> - <action name="actionIdentify"> + <action name="actionIdentifyMapLayers"> <property name="icon"> <iconset resource="resources.qrc"> <normaloff>:/timeseriesviewer/icons/mActionIdentify.png</normaloff>:/timeseriesviewer/icons/mActionIdentify.png</iconset> @@ -468,7 +469,7 @@ <string>Identify</string> </property> <property name="toolTip"> - <string>Identify pixel information</string> + <string>Identify map layers</string> </property> </action> <action name="actionClearLabelList"> @@ -524,6 +525,18 @@ <string>Collect labels by clicking on related map windows</string> </property> </action> + <action name="actionIdentifyTimeSeries"> + <property name="icon"> + <iconset resource="resources.qrc"> + <normaloff>:/timeseriesviewer/icons/ActionIdentifyTimeSeries.png</normaloff>:/timeseriesviewer/icons/ActionIdentifyTimeSeries.png</iconset> + </property> + <property name="text"> + <string>IdentifyTimeSeries</string> + </property> + <property name="toolTip"> + <string>Identify pixel time series for specific coordinate</string> + </property> + </action> </widget> <customwidgets> <customwidget>