rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-08 00:53:48 +02:00
Code Issues Releases Activity

OP-376 Make all dialogs more dynamic to cope with smaller screens & resizes.

Browse Source
This commit is contained in:
elafargue 2011-06-09 18:03:19 +02:00
parent 9d89f1e180
commit c79cc1eb1a
4 changed files with 917 additions and 1002 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1053
ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetoptionspage.ui
View File

@ -1,546 +1,507 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>LineardialGadgetOptionsPage</class> <class>LineardialGadgetOptionsPage</class>
<widget class="QWidget" name="LineardialGadgetOptionsPage"> <widget class="QWidget" name="LineardialGadgetOptionsPage">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>540</width> <width>540</width>
<height>347</height> <height>347</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<widget class="QWidget" name="verticalLayoutWidget"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="geometry"> <item>
<rect> <layout class="QHBoxLayout" name="horizontalLayout_8">
<x>-1</x> <item>
<y>-1</y> <widget class="QCheckBox" name="useOpenGL">
<width>533</width> <property name="text">
<height>321</height> <string>Use OpenGL</string>
</rect> </property>
</property> <property name="checked">
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0,0,0,0,0,0,0"> <bool>true</bool>
<property name="sizeConstraint"> </property>
<enum>QLayout::SetMinimumSize</enum> </widget>
</property> </item>
<property name="leftMargin"> </layout>
<number>10</number> </item>
</property> <item>
<property name="topMargin"> <widget class="Line" name="line_3">
<number>5</number> <property name="orientation">
</property> <enum>Qt::Horizontal</enum>
<property name="rightMargin"> </property>
<number>10</number> </widget>
</property> </item>
<property name="bottomMargin"> <item>
<number>10</number> <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0">
</property> <property name="spacing">
<item> <number>10</number>
<layout class="QHBoxLayout" name="horizontalLayout_8"> </property>
<item> <property name="sizeConstraint">
<widget class="QCheckBox" name="useOpenGL"> <enum>QLayout::SetMaximumSize</enum>
<property name="text"> </property>
<string>Use OpenGL</string> <property name="bottomMargin">
</property> <number>10</number>
<property name="checked"> </property>
<bool>true</bool> <item>
</property> <widget class="QLabel" name="label">
</widget> <property name="text">
</item> <string>Dial SVG: </string>
</layout> </property>
</item> </widget>
<item> </item>
<widget class="Line" name="line_3"> <item>
<property name="orientation"> <widget class="Utils::PathChooser" name="svgSourceFile" native="true">
<enum>Qt::Horizontal</enum> <property name="sizePolicy">
</property> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
</widget> <horstretch>0</horstretch>
</item> <verstretch>0</verstretch>
<item> </sizepolicy>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0"> </property>
<property name="spacing"> </widget>
<number>10</number> </item>
</property> </layout>
<property name="sizeConstraint"> </item>
<enum>QLayout::SetMaximumSize</enum> <item>
</property> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="bottomMargin"> <item>
<number>10</number> <widget class="QLabel" name="label_8">
</property> <property name="sizePolicy">
<item> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<widget class="QLabel" name="label"> <horstretch>0</horstretch>
<property name="text"> <verstretch>0</verstretch>
<string>Dial SVG: </string> </sizepolicy>
</property> </property>
</widget> <property name="text">
</item> <string>Whole range:</string>
<item> </property>
<widget class="Utils::PathChooser" name="svgSourceFile" native="true"> </widget>
<property name="sizePolicy"> </item>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <item>
<horstretch>0</horstretch> <widget class="QLabel" name="label_9">
<verstretch>0</verstretch> <property name="text">
</sizepolicy> <string>Min:</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</item> <widget class="QDoubleSpinBox" name="minValue">
<item> <property name="sizePolicy">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<item> <horstretch>0</horstretch>
<widget class="QLabel" name="label_8"> <verstretch>0</verstretch>
<property name="sizePolicy"> </sizepolicy>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> </property>
<horstretch>0</horstretch> <property name="decimals">
<verstretch>0</verstretch> <number>3</number>
</sizepolicy> </property>
</property> <property name="minimum">
<property name="text"> <double>-99999.000000000000000</double>
<string>Whole range:</string> </property>
</property> <property name="maximum">
</widget> <double>99999.990000000005239</double>
</item> </property>
<item> </widget>
<widget class="QLabel" name="label_9"> </item>
<property name="text"> <item>
<string>Min:</string> <widget class="QLabel" name="label_13">
</property> <property name="text">
</widget> <string>Max:</string>
</item> </property>
<item> </widget>
<widget class="QDoubleSpinBox" name="minValue"> </item>
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <widget class="QDoubleSpinBox" name="maxValue">
<horstretch>0</horstretch> <property name="sizePolicy">
<verstretch>0</verstretch> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
</sizepolicy> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="decimals"> </sizepolicy>
<number>3</number> </property>
</property> <property name="decimals">
<property name="minimum"> <number>3</number>
<double>-99999.000000000000000</double> </property>
</property> <property name="minimum">
<property name="maximum"> <double>-99999.000000000000000</double>
<double>99999.990000000005239</double> </property>
</property> <property name="maximum">
</widget> <double>99999.990000000005239</double>
</item> </property>
<item> </widget>
<widget class="QLabel" name="label_13"> </item>
<property name="text"> </layout>
<string>Max:</string> </item>
</property> <item>
</widget> <widget class="Line" name="line">
</item> <property name="orientation">
<item> <enum>Qt::Horizontal</enum>
<widget class="QDoubleSpinBox" name="maxValue"> </property>
<property name="sizePolicy"> </widget>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> </item>
<horstretch>0</horstretch> <item>
<verstretch>0</verstretch> <layout class="QHBoxLayout" name="horizontalLayout_2">
</sizepolicy> <item>
</property> <widget class="QLabel" name="label_2">
<property name="decimals"> <property name="sizePolicy">
<number>3</number> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
</property> <horstretch>0</horstretch>
<property name="minimum"> <verstretch>0</verstretch>
<double>-99999.000000000000000</double> </sizepolicy>
</property> </property>
<property name="maximum"> <property name="text">
<double>99999.990000000005239</double> <string>Green:</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</item> <widget class="QLabel" name="label_3">
<item> <property name="text">
<widget class="Line" name="line"> <string>Min:</string>
<property name="orientation"> </property>
<enum>Qt::Horizontal</enum> </widget>
</property> </item>
</widget> <item>
</item> <widget class="QDoubleSpinBox" name="greenMin">
<item> <property name="sizePolicy">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<item> <horstretch>0</horstretch>
<widget class="QLabel" name="label_2"> <verstretch>0</verstretch>
<property name="sizePolicy"> </sizepolicy>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> </property>
<horstretch>0</horstretch> <property name="decimals">
<verstretch>0</verstretch> <number>3</number>
</sizepolicy> </property>
</property> <property name="minimum">
<property name="text"> <double>-99999.000000000000000</double>
<string>Green:</string> </property>
</property> <property name="maximum">
</widget> <double>99999.990000000005239</double>
</item> </property>
<item> </widget>
<widget class="QLabel" name="label_3"> </item>
<property name="text"> <item>
<string>Min:</string> <widget class="QLabel" name="label_10">
</property> <property name="text">
</widget> <string>Max:</string>
</item> </property>
<item> </widget>
<widget class="QDoubleSpinBox" name="greenMin"> </item>
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <widget class="QDoubleSpinBox" name="greenMax">
<horstretch>0</horstretch> <property name="sizePolicy">
<verstretch>0</verstretch> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
</sizepolicy> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="decimals"> </sizepolicy>
<number>3</number> </property>
</property> <property name="decimals">
<property name="minimum"> <number>3</number>
<double>-99999.000000000000000</double> </property>
</property> <property name="minimum">
<property name="maximum"> <double>-99999.000000000000000</double>
<double>99999.990000000005239</double> </property>
</property> <property name="maximum">
</widget> <double>99999.990000000005239</double>
</item> </property>
<item> </widget>
<widget class="QLabel" name="label_10"> </item>
<property name="text"> </layout>
<string>Max:</string> </item>
</property> <item>
</widget> <layout class="QHBoxLayout" name="horizontalLayout_3">
</item> <item>
<item> <widget class="QLabel" name="label_4">
<widget class="QDoubleSpinBox" name="greenMax"> <property name="sizePolicy">
<property name="sizePolicy"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <horstretch>0</horstretch>
<horstretch>0</horstretch> <verstretch>0</verstretch>
<verstretch>0</verstretch> </sizepolicy>
</sizepolicy> </property>
</property> <property name="text">
<property name="decimals"> <string>Yellow:</string>
<number>3</number> </property>
</property> </widget>
<property name="minimum"> </item>
<double>-99999.000000000000000</double> <item>
</property> <widget class="QLabel" name="label_5">
<property name="maximum"> <property name="text">
<double>99999.990000000005239</double> <string>Min:</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</item> <widget class="QDoubleSpinBox" name="yellowMin">
<item> <property name="sizePolicy">
<widget class="Line" name="line_5"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<property name="orientation"> <horstretch>0</horstretch>
<enum>Qt::Horizontal</enum> <verstretch>0</verstretch>
</property> </sizepolicy>
</widget> </property>
</item> <property name="decimals">
<item> <number>3</number>
<layout class="QHBoxLayout" name="horizontalLayout_3"> </property>
<item> <property name="minimum">
<widget class="QLabel" name="label_4"> <double>-99999.000000000000000</double>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <property name="maximum">
<horstretch>0</horstretch> <double>99999.990000000005239</double>
<verstretch>0</verstretch> </property>
</sizepolicy> </widget>
</property> </item>
<property name="text"> <item>
<string>Yellow:</string> <widget class="QLabel" name="label_11">
</property> <property name="text">
</widget> <string>Max:</string>
</item> </property>
<item> </widget>
<widget class="QLabel" name="label_5"> </item>
<property name="text"> <item>
<string>Min:</string> <widget class="QDoubleSpinBox" name="yellowMax">
</property> <property name="sizePolicy">
</widget> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
</item> <horstretch>0</horstretch>
<item> <verstretch>0</verstretch>
<widget class="QDoubleSpinBox" name="yellowMin"> </sizepolicy>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <property name="decimals">
<horstretch>0</horstretch> <number>3</number>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="minimum">
</property> <double>-99999.000000000000000</double>
<property name="decimals"> </property>
<number>3</number> <property name="maximum">
</property> <double>99999.990000000005239</double>
<property name="minimum"> </property>
<double>-99999.000000000000000</double> </widget>
</property> </item>
<property name="maximum"> </layout>
<double>99999.990000000005239</double> </item>
</property> <item>
</widget> <layout class="QHBoxLayout" name="horizontalLayout_4">
</item> <item>
<item> <widget class="QLabel" name="label_6">
<widget class="QLabel" name="label_11"> <property name="sizePolicy">
<property name="text"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<string>Max:</string> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
</widget> </sizepolicy>
</item> </property>
<item> <property name="text">
<widget class="QDoubleSpinBox" name="yellowMax"> <string>Red:</string>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> </widget>
<horstretch>0</horstretch> </item>
<verstretch>0</verstretch> <item>
</sizepolicy> <widget class="QLabel" name="label_7">
</property> <property name="text">
<property name="decimals"> <string>Min:</string>
<number>3</number> </property>
</property> </widget>
<property name="minimum"> </item>
<double>-99999.000000000000000</double> <item>
</property> <widget class="QDoubleSpinBox" name="redMin">
<property name="maximum"> <property name="sizePolicy">
<double>99999.990000000005239</double> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
</property> <horstretch>0</horstretch>
</widget> <verstretch>0</verstretch>
</item> </sizepolicy>
</layout> </property>
</item> <property name="decimals">
<item> <number>3</number>
<widget class="Line" name="line_2"> </property>
<property name="orientation"> <property name="minimum">
<enum>Qt::Horizontal</enum> <double>-99999.000000000000000</double>
</property> </property>
</widget> <property name="maximum">
</item> <double>99999.990000000005239</double>
<item> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> </widget>
<item> </item>
<widget class="QLabel" name="label_6"> <item>
<property name="sizePolicy"> <widget class="QLabel" name="label_12">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <property name="text">
<horstretch>0</horstretch> <string>Max:</string>
<verstretch>0</verstretch> </property>
</sizepolicy> </widget>
</property> </item>
<property name="text"> <item>
<string>Red:</string> <widget class="QDoubleSpinBox" name="redMax">
</property> <property name="sizePolicy">
</widget> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
</item> <horstretch>0</horstretch>
<item> <verstretch>0</verstretch>
<widget class="QLabel" name="label_7"> </sizepolicy>
<property name="text"> </property>
<string>Min:</string> <property name="decimals">
</property> <number>3</number>
</widget> </property>
</item> <property name="minimum">
<item> <double>-99999.000000000000000</double>
<widget class="QDoubleSpinBox" name="redMin"> </property>
<property name="sizePolicy"> <property name="maximum">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <double>99999.990000000005239</double>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> </widget>
</sizepolicy> </item>
</property> </layout>
<property name="decimals"> </item>
<number>3</number> <item>
</property> <layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="minimum"> <item>
<double>-99999.000000000000000</double> <widget class="QLabel" name="label_17">
</property> <property name="sizePolicy">
<property name="maximum"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<double>99999.990000000005239</double> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
</widget> </sizepolicy>
</item> </property>
<item> <property name="text">
<widget class="QLabel" name="label_12"> <string>Input:</string>
<property name="text"> </property>
<string>Max:</string> </widget>
</property> </item>
</widget> <item>
</item> <widget class="QLabel" name="label_18">
<item> <property name="text">
<widget class="QDoubleSpinBox" name="redMax"> <string>ObjectName</string>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> </widget>
<horstretch>0</horstretch> </item>
<verstretch>0</verstretch> <item>
</sizepolicy> <widget class="QComboBox" name="objectName">
</property> <property name="sizePolicy">
<property name="decimals"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<number>3</number> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="minimum"> </sizepolicy>
<double>-99999.000000000000000</double> </property>
</property> </widget>
<property name="maximum"> </item>
<double>99999.990000000005239</double> <item>
</property> <widget class="QLabel" name="label_19">
</widget> <property name="text">
</item> <string>ObjectField</string>
</layout> </property>
</item> </widget>
<item> </item>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <item>
<item> <widget class="QComboBox" name="objectField">
<widget class="QLabel" name="label_17"> <property name="sizePolicy">
<property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <horstretch>0</horstretch>
<horstretch>0</horstretch> <verstretch>0</verstretch>
<verstretch>0</verstretch> </sizepolicy>
</sizepolicy> </property>
</property> </widget>
<property name="text"> </item>
<string>Input:</string> </layout>
</property> </item>
</widget> <item>
</item> <layout class="QHBoxLayout" name="horizontalLayout_6">
<item> <property name="topMargin">
<widget class="QLabel" name="label_18"> <number>0</number>
<property name="text"> </property>
<string>ObjectName</string> <item>
</property> <widget class="QLabel" name="label_14">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<item> <horstretch>0</horstretch>
<widget class="QComboBox" name="objectName"> <verstretch>0</verstretch>
<property name="sizePolicy"> </sizepolicy>
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> </property>
<horstretch>0</horstretch> <property name="text">
<verstretch>0</verstretch> <string>Dial font:</string>
</sizepolicy> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <widget class="QPushButton" name="fontPicker">
<widget class="QLabel" name="label_19"> <property name="text">
<property name="text"> <string>Select...</string>
<string>ObjectField</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <widget class="QLabel" name="label_15">
<widget class="QComboBox" name="objectField"> <property name="text">
<property name="sizePolicy"> <string>Decimal places:</string>
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> </property>
<horstretch>0</horstretch> </widget>
<verstretch>0</verstretch> </item>
</sizepolicy> <item>
</property> <widget class="QSpinBox" name="decPlaces">
</widget> <property name="maximum">
</item> <number>99</number>
</layout> </property>
</item> </widget>
<item> </item>
<layout class="QHBoxLayout" name="horizontalLayout_6"> <item>
<property name="topMargin"> <widget class="QLabel" name="label_16">
<number>0</number> <property name="text">
</property> <string>Factor:</string>
<item> </property>
<widget class="QLabel" name="label_14"> </widget>
<property name="sizePolicy"> </item>
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <item>
<horstretch>0</horstretch> <widget class="QDoubleSpinBox" name="factor">
<verstretch>0</verstretch> <property name="decimals">
</sizepolicy> <number>6</number>
</property> </property>
<property name="text"> <property name="minimum">
<string>Dial font:</string> <double>-10000.000000000000000</double>
</property> </property>
</widget> <property name="maximum">
</item> <double>100000.000000000000000</double>
<item> </property>
<widget class="QPushButton" name="fontPicker"> </widget>
<property name="text"> </item>
<string>Select...</string> <item>
</property> <spacer name="horizontalSpacer">
</widget> <property name="orientation">
</item> <enum>Qt::Horizontal</enum>
<item> </property>
<widget class="QLabel" name="label_15"> <property name="sizeHint" stdset="0">
<property name="text"> <size>
<string>Decimal places:</string> <width>40</width>
</property> <height>20</height>
</widget> </size>
</item> </property>
<item> </spacer>
<widget class="QSpinBox" name="decPlaces"> </item>
<property name="maximum"> </layout>
<number>99</number> </item>
</property> <item>
</widget> <spacer name="verticalSpacer">
</item> <property name="orientation">
<item> <enum>Qt::Vertical</enum>
<widget class="QLabel" name="label_16"> </property>
<property name="text"> <property name="sizeHint" stdset="0">
<string>Factor:</string> <size>
</property> <width>20</width>
</widget> <height>40</height>
</item> </size>
<item> </property>
<widget class="QDoubleSpinBox" name="factor"> </spacer>
<property name="decimals"> </item>
<number>6</number> </layout>
</property> </widget>
<property name="minimum"> <customwidgets>
<double>-10000.000000000000000</double> <customwidget>
</property> <class>Utils::PathChooser</class>
<property name="maximum"> <extends>QWidget</extends>
<double>100000.000000000000000</double> <header>utils/pathchooser.h</header>
</property> <container>1</container>
</widget> </customwidget>
</item> </customwidgets>
<item> <resources/>
<spacer name="horizontalSpacer"> <connections/>
<property name="orientation"> </ui>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<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>
</widget>
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header>utils/pathchooser.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

220
ground/openpilotgcs/src/plugins/pfd/pfdgadgetoptionspage.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>529</width> <width>529</width>
<height>346</height> <height>271</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -19,131 +19,99 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<widget class="QWidget" name="verticalLayoutWidget"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="geometry"> <item>
<rect> <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0">
<x>-1</x> <property name="spacing">
<y>-1</y> <number>10</number>
<width>504</width> </property>
<height>331</height> <property name="sizeConstraint">
</rect> <enum>QLayout::SetMaximumSize</enum>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,1,0"> <property name="bottomMargin">
<property name="sizeConstraint"> <number>10</number>
<enum>QLayout::SetMinimumSize</enum> </property>
</property> <item>
<property name="leftMargin"> <widget class="QLabel" name="label">
<number>10</number> <property name="text">
</property> <string>PFD SVG: </string>
<property name="topMargin"> </property>
<number>5</number> </widget>
</property> </item>
<property name="rightMargin"> <item>
<number>10</number> <widget class="Utils::PathChooser" name="svgSourceFile" native="true">
</property> <property name="sizePolicy">
<property name="bottomMargin"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<number>10</number> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<item> </sizepolicy>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0"> </property>
<property name="spacing"> </widget>
<number>10</number> </item>
</property> </layout>
<property name="sizeConstraint"> </item>
<enum>QLayout::SetMaximumSize</enum> <item>
</property> <widget class="Line" name="line">
<property name="bottomMargin"> <property name="orientation">
<number>10</number> <enum>Qt::Horizontal</enum>
</property> </property>
<item> </widget>
<widget class="QLabel" name="label"> </item>
<property name="text"> <item>
<string>PFD SVG: </string> <layout class="QHBoxLayout" name="horizontalLayout_2">
</property> <item>
</widget> <widget class="QCheckBox" name="useOpenGL">
</item> <property name="enabled">
<item> <bool>true</bool>
<widget class="Utils::PathChooser" name="svgSourceFile" native="true"> </property>
<property name="sizePolicy"> <property name="text">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <string>Use OpenGL for rendering</string>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> <property name="checked">
</sizepolicy> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</item> <widget class="QCheckBox" name="hqText">
<item> <property name="text">
<widget class="Line" name="line"> <string>High Quality text (OpenGL)</string>
<property name="orientation"> </property>
<enum>Qt::Horizontal</enum> </widget>
</property> </item>
</widget> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<widget class="QCheckBox" name="useOpenGL"> <widget class="QCheckBox" name="smoothUpdates">
<property name="enabled"> <property name="text">
<bool>true</bool> <string>Smooth updates</string>
</property> </property>
<property name="text"> <property name="checked">
<string>Use OpenGL for rendering</string> <bool>true</bool>
</property> </property>
<property name="checked"> </widget>
<bool>true</bool> </item>
</property> </layout>
</widget> </item>
</item> <item>
<item> <spacer name="verticalSpacer">
<widget class="QCheckBox" name="hqText"> <property name="orientation">
<property name="text"> <enum>Qt::Vertical</enum>
<string>High Quality text (OpenGL)</string> </property>
</property> <property name="sizeType">
</widget> <enum>QSizePolicy::MinimumExpanding</enum>
</item> </property>
</layout> <property name="sizeHint" stdset="0">
</item> <size>
<item> <width>20</width>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <height>40</height>
<item> </size>
<widget class="QCheckBox" name="smoothUpdates"> </property>
<property name="text"> </spacer>
<string>Smooth updates</string> </item>
</property> </layout>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="Line" name="line_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>

2
ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.cpp
View File

@ -132,7 +132,7 @@ QWidget* ScopeGadgetOptionsPage::createPage(QWidget *parent)
void ScopeGadgetOptionsPage::on_btnColor_clicked() void ScopeGadgetOptionsPage::on_btnColor_clicked()
{ {
QColor color = QColorDialog::getColor( QColor(options_page->btnColor->text()), options_page->widget); QColor color = QColorDialog::getColor( QColor(options_page->btnColor->text()));
if (color.isValid()) { if (color.isValid()) {
setButtonColor(color); setButtonColor(color);
} }

644
ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.ui
View File

@ -1,329 +1,315 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>ScopeGadgetOptionsPage</class> <class>ScopeGadgetOptionsPage</class>
<widget class="QWidget" name="ScopeGadgetOptionsPage"> <widget class="QWidget" name="ScopeGadgetOptionsPage">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>550</width> <width>550</width>
<height>290</height> <height>405</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<widget class="QWidget" name="widget" native="true"> <layout class="QVBoxLayout" name="verticalLayout_6">
<property name="geometry"> <item>
<rect> <layout class="QHBoxLayout" name="horizontalLayout">
<x>10</x> <property name="sizeConstraint">
<y>10</y> <enum>QLayout::SetDefaultConstraint</enum>
<width>541</width> </property>
<height>271</height> <item>
</rect> <layout class="QFormLayout" name="formLayout">
</property> <property name="fieldGrowthPolicy">
<widget class="QWidget" name="verticalLayoutWidget"> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
<property name="geometry"> </property>
<rect> <item row="0" column="0">
<x>0</x> <widget class="QLabel" name="label_9">
<y>0</y> <property name="font">
<width>531</width> <font>
<height>272</height> <family>Bitstream Charter</family>
</rect> <weight>75</weight>
</property> <bold>true</bold>
<layout class="QVBoxLayout" name="verticalLayout_3"> </font>
<property name="spacing"> </property>
<number>3</number> <property name="text">
</property> <string>X-Axis</string>
<item> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> </widget>
<property name="sizeConstraint"> </item>
<enum>QLayout::SetDefaultConstraint</enum> <item row="1" column="0">
</property> <widget class="QLabel" name="label">
<item> <property name="text">
<layout class="QFormLayout" name="formLayout"> <string>Plot Type:</string>
<property name="fieldGrowthPolicy"> </property>
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> </widget>
</property> </item>
<item row="0" column="0"> <item row="1" column="1">
<widget class="QLabel" name="label_9"> <widget class="QComboBox" name="cmbPlotType"/>
<property name="font"> </item>
<font> <item row="2" column="0">
<family>Bitstream Charter</family> <widget class="QLabel" name="label_2">
<weight>75</weight> <property name="text">
<bold>true</bold> <string>Data Size:</string>
</font> </property>
</property> </widget>
<property name="text"> </item>
<string>X-Axis</string> <item row="2" column="1">
</property> <widget class="QSpinBox" name="spnDataSize">
</widget> <property name="suffix">
</item> <string> seconds</string>
<item row="1" column="0"> </property>
<widget class="QLabel" name="label"> <property name="maximum">
<property name="text"> <number>5000</number>
<string>Plot Type:</string> </property>
</property> <property name="singleStep">
</widget> <number>30</number>
</item> </property>
<item row="1" column="1"> <property name="value">
<widget class="QComboBox" name="cmbPlotType"/> <number>300</number>
</item> </property>
<item row="2" column="0"> </widget>
<widget class="QLabel" name="label_2"> </item>
<property name="text"> <item row="3" column="0">
<string>Data Size:</string> <widget class="QLabel" name="label_7">
</property> <property name="text">
</widget> <string>Update Interval:</string>
</item> </property>
<item row="2" column="1"> </widget>
<widget class="QSpinBox" name="spnDataSize"> </item>
<property name="suffix"> <item row="3" column="1">
<string> seconds</string> <widget class="QSpinBox" name="spnRefreshInterval">
</property> <property name="suffix">
<property name="maximum"> <string>ms</string>
<number>5000</number> </property>
</property> <property name="minimum">
<property name="singleStep"> <number>10</number>
<number>30</number> </property>
</property> <property name="maximum">
<property name="value"> <number>30000</number>
<number>300</number> </property>
</property> <property name="singleStep">
</widget> <number>500</number>
</item> </property>
<item row="3" column="0"> <property name="value">
<widget class="QLabel" name="label_7"> <number>1000</number>
<property name="text"> </property>
<string>Update Interval:</string> </widget>
</property> </item>
</widget> <item row="4" column="0">
</item> <widget class="QLabel" name="label_8">
<item row="3" column="1"> <property name="font">
<widget class="QSpinBox" name="spnRefreshInterval"> <font>
<property name="suffix"> <family>Bitstream Charter</family>
<string>ms</string> <weight>75</weight>
</property> <bold>true</bold>
<property name="minimum"> </font>
<number>10</number> </property>
</property> <property name="text">
<property name="maximum"> <string>Plot curves</string>
<number>30000</number> </property>
</property> </widget>
<property name="singleStep"> </item>
<number>500</number> <item row="5" column="0">
</property> <widget class="QLabel" name="label_5">
<property name="value"> <property name="text">
<number>1000</number> <string>UAVObject:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="5" column="1">
<widget class="QLabel" name="label_8"> <widget class="QComboBox" name="cmbUAVObjects"/>
<property name="font"> </item>
<font> <item row="6" column="0">
<family>Bitstream Charter</family> <widget class="QLabel" name="label_4">
<weight>75</weight> <property name="text">
<bold>true</bold> <string>UAVField:</string>
</font> </property>
</property> </widget>
<property name="text"> </item>
<string>Plot curves</string> <item row="6" column="1">
</property> <widget class="QComboBox" name="cmbUAVField"/>
</widget> </item>
</item> <item row="7" column="0">
<item row="5" column="0"> <widget class="QLabel" name="label_3">
<widget class="QLabel" name="label_5"> <property name="text">
<property name="text"> <string>Color:</string>
<string>UAVObject:</string> </property>
</property> </widget>
</widget> </item>
</item> <item row="7" column="1">
<item row="5" column="1"> <widget class="QPushButton" name="btnColor">
<widget class="QComboBox" name="cmbUAVObjects"/> <property name="text">
</item> <string>Choose</string>
<item row="6" column="0"> </property>
<widget class="QLabel" name="label_4"> </widget>
<property name="text"> </item>
<string>UAVField:</string> <item row="8" column="0">
</property> <widget class="QLabel" name="label_6">
</widget> <property name="text">
</item> <string>Scale:</string>
<item row="6" column="1"> </property>
<widget class="QComboBox" name="cmbUAVField"/> </widget>
</item> </item>
<item row="7" column="0"> <item row="8" column="1">
<widget class="QLabel" name="label_3"> <widget class="QComboBox" name="cmbScale">
<property name="text"> <property name="editable">
<string>Color:</string> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> </layout>
<widget class="QPushButton" name="btnColor"> </item>
<property name="text"> <item>
<string>Choose</string> <layout class="QVBoxLayout" name="verticalLayout_2">
</property> <property name="sizeConstraint">
</widget> <enum>QLayout::SetFixedSize</enum>
</item> </property>
<item row="8" column="0"> <item>
<widget class="QLabel" name="label_6"> <spacer name="verticalSpacer">
<property name="text"> <property name="orientation">
<string>Scale:</string> <enum>Qt::Vertical</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item> <size>
<item row="8" column="1"> <width>20</width>
<widget class="QComboBox" name="cmbScale"> <height>100</height>
<property name="editable"> </size>
<bool>false</bool> </property>
</property> </spacer>
</widget> </item>
</item> <item>
</layout> <widget class="QPushButton" name="btnAddCurve">
</item> <property name="toolTip">
<item> <string>Add a new curve to the scope, or update it if the UAVObject and UAVField is the same.</string>
<layout class="QVBoxLayout" name="verticalLayout_2"> </property>
<property name="sizeConstraint"> <property name="text">
<enum>QLayout::SetFixedSize</enum> <string>Add
</property> Update</string>
<item> </property>
<spacer name="verticalSpacer"> </widget>
<property name="orientation"> </item>
<enum>Qt::Vertical</enum> <item>
</property> <widget class="QPushButton" name="btnRemoveCurve">
<property name="sizeHint" stdset="0"> <property name="toolTip">
<size> <string>Remove the curve from the scope.</string>
<width>20</width> </property>
<height>100</height> <property name="text">
</size> <string>Remove
</property> </string>
</spacer> </property>
</item> </widget>
<item> </item>
<widget class="QPushButton" name="btnAddCurve"> <item>
<property name="toolTip"> <spacer name="verticalSpacer_2">
<string>Add a new curve to the scope, or update it if the UAVObject and UAVField is the same.</string> <property name="orientation">
</property> <enum>Qt::Vertical</enum>
<property name="text"> </property>
<string>Add <property name="sizeType">
Update</string> <enum>QSizePolicy::Fixed</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item> <size>
<item> <width>20</width>
<widget class="QPushButton" name="btnRemoveCurve"> <height>15</height>
<property name="toolTip"> </size>
<string>Remove the curve from the scope.</string> </property>
</property> </spacer>
<property name="text"> </item>
<string>Remove </layout>
</string> </item>
</property> <item>
</widget> <layout class="QVBoxLayout" name="verticalLayout">
</item> <item>
<item> <spacer name="verticalSpacer_3">
<spacer name="verticalSpacer_2"> <property name="orientation">
<property name="orientation"> <enum>Qt::Vertical</enum>
<enum>Qt::Vertical</enum> </property>
</property> <property name="sizeHint" stdset="0">
<property name="sizeType"> <size>
<enum>QSizePolicy::Fixed</enum> <width>0</width>
</property> <height>200</height>
<property name="sizeHint" stdset="0"> </size>
<size> </property>
<width>20</width> </spacer>
<height>15</height> </item>
</size> <item>
</property> <widget class="QListWidget" name="lstCurves">
</spacer> <property name="selectionBehavior">
</item> <enum>QAbstractItemView::SelectItems</enum>
</layout> </property>
</item> <property name="batchSize">
<item> <number>100</number>
<layout class="QVBoxLayout" name="verticalLayout"> </property>
<item> </widget>
<spacer name="verticalSpacer_3"> </item>
<property name="orientation"> </layout>
<enum>Qt::Vertical</enum> </item>
</property> </layout>
<property name="sizeHint" stdset="0"> </item>
<size> <item>
<width>0</width> <spacer name="verticalSpacer_5">
<height>200</height> <property name="orientation">
</size> <enum>Qt::Vertical</enum>
</property> </property>
</spacer> <property name="sizeHint" stdset="0">
</item> <size>
<item> <width>20</width>
<widget class="QListWidget" name="lstCurves"> <height>40</height>
<property name="selectionBehavior"> </size>
<enum>QAbstractItemView::SelectItems</enum> </property>
</property> </spacer>
<property name="batchSize"> </item>
<number>100</number> <item>
</property> <layout class="QHBoxLayout" name="horizontalLayout_2">
</widget> <item>
</item> <layout class="QVBoxLayout" name="verticalLayout_5">
</layout> <item>
</item> <widget class="QCheckBox" name="LoggingEnable">
</layout> <property name="text">
</item> <string>Log data to csv file</string>
<item> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> </widget>
<item> </item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <item>
<item> <widget class="QCheckBox" name="LoggingConnect">
<layout class="QVBoxLayout" name="verticalLayout_5"> <property name="text">
<item> <string>New file on connect</string>
<widget class="QCheckBox" name="LoggingEnable"> </property>
<property name="text"> </widget>
<string>Log data to csv file</string> </item>
</property> </layout>
</widget> </item>
</item> <item>
<item> <widget class="QLabel" name="LoggingLabel">
<widget class="QCheckBox" name="LoggingConnect"> <property name="text">
<property name="text"> <string>Logging path</string>
<string>New file on connect</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
</layout> <widget class="Utils::PathChooser" name="LoggingPath" native="true">
</item> <property name="sizePolicy">
<item> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
<widget class="QLabel" name="LoggingLabel"> <horstretch>0</horstretch>
<property name="text"> <verstretch>0</verstretch>
<string>Logging path</string> </sizepolicy>
</property> </property>
</widget> </widget>
</item> </item>
<item> </layout>
<widget class="Utils::PathChooser" name="LoggingPath" native="true"> </item>
<property name="sizePolicy"> </layout>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum"> </widget>
<horstretch>0</horstretch> <customwidgets>
<verstretch>0</verstretch> <customwidget>
</sizepolicy> <class>Utils::PathChooser</class>
</property> <extends>QWidget</extends>
</widget> <header>utils/pathchooser.h</header>
</item> <container>1</container>
</layout> </customwidget>
</item> </customwidgets>
</layout> <resources/>
</item> <connections/>
</layout> </ui>
</widget>
</widget>
</widget>
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header>utils/pathchooser.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>