ocularDialog.ui   ocularDialog.ui 
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>ocularDialogForm</class> <class>ocularDialogForm</class>
<widget class="QWidget" name="ocularDialogForm"> <widget class="QWidget" name="ocularDialogForm">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>668</width> <width>668</width>
<height>478</height> <height>594</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing"> <property name="spacing">
skipping to change at line 1262 skipping to change at line 1262
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="CCDResY_lbl"> <widget class="QLabel" name="CCDResY_lbl">
<property name="text"> <property name="text">
<string>Resolution y (pixels):</string> <string>Resolution y (pixels):</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QLabel" name="CCDChipY_lbl">
<property name="text">
<string>Chip height (mm):</string>
</property>
</widget>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="ccdResY"> <widget class="QSpinBox" name="ccdResY">
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>9999</number> <number>9999</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="CCDChipX_lbl"> <widget class="QLabel" name="CCDChipX_lbl">
<property name="text"> <property name="text">
<string>Chip width (mm):</string> <string>Chip width (mm):</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0">
<widget class="QLabel" name="CCDPixelX_lbl">
<property name="text">
<string>Pixel width (micron):</string>
</property>
</widget>
</item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QDoubleSpinBox" name="ccdChipX"> <widget class="QDoubleSpinBox" name="ccdChipX">
<property name="decimals"> <property name="decimals">
<number>1</number> <number>1</number>
</property> </property>
<property name="minimum"> <property name="minimum">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
<property name="maximum"> <property name="maximum">
<double>9999.000000000000000</double> <double>9999.000000000000000</double>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="6" column="0">
<widget class="QLabel" name="CCDChipY_lbl"> <widget class="QLabel" name="CCDPixelY_lbl">
<property name="text"> <property name="text">
<string>Chip height (mm):</string> <string>Pixel height (micron):</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QDoubleSpinBox" name="ccdChipY"> <widget class="QDoubleSpinBox" name="ccdChipY">
<property name="decimals"> <property name="decimals">
<number>1</number> <number>1</number>
</property> </property>
<property name="minimum"> <property name="minimum">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
<property name="maximum"> <property name="maximum">
<double>9999.000000000000000</double> <double>9999.000000000000000</double>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="6" column="1">
<widget class="QLabel" name="CCDPixelX_lbl"> <widget class="QDoubleSpinBox" name="ccdPixelY">
<property name="text"> <property name="decimals">
<string>Pixel width (micron):</string> <number>1</number>
</property>
<property name="minimum">
<double>0.100000000000000</double>
</property>
<property name="maximum">
<double>99.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QDoubleSpinBox" name="ccdPixelX"> <widget class="QDoubleSpinBox" name="ccdPixelX">
<property name="decimals"> <property name="decimals">
<number>1</number> <number>1</number>
</property> </property>
<property name="minimum"> <property name="minimum">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
<property name="maximum"> <property name="maximum">
<double>99.000000000000000</double> <double>99.000000000000000</double>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="9" column="1">
<widget class="QLabel" name="CCDPixelY_lbl"> <widget class="QDoubleSpinBox" name="OAGDist">
<property name="decimals">
<number>1</number>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="OAGDist_lbl">
<property name="text"> <property name="text">
<string>Pixel height (micron):</string> <string>Prism/CCD distance (mm):</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="10" column="0">
<widget class="QDoubleSpinBox" name="ccdPixelY"> <widget class="QLabel" name="OAGPrismH_lbl">
<property name="text">
<string>Prism/CCD height (mm):</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QDoubleSpinBox" name="OAGPrismH">
<property name="decimals"> <property name="decimals">
<number>1</number> <number>1</number>
</property> </property>
<property name="minimum"> <property name="singleStep">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
<property name="maximum"> </widget>
<double>99.000000000000000</double> </item>
<item row="11" column="0">
<widget class="QLabel" name="OAGPrismW_lbl">
<property name="text">
<string>Prism/CCD width (mm):</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="OAGPrismPA_lbl">
<property name="text">
<string>Position angle (degrees):</string>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QDoubleSpinBox" name="OAGPrismW">
<property name="decimals">
<number>1</number>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0" colspan="2">
<widget class="QCheckBox" name="OAG_checkBox">
<property name="text">
<string>Off-Axis guider</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QDoubleSpinBox" name="OAGPrismPA">
<property name="decimals">
<number>0</number>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
<property name="singleStep">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="ccdRotAngle_lbl">
<property name="text">
<string>Rotation Angle (degrees):</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QDoubleSpinBox" name="ccdRotAngle">
<property name="decimals">
<number>0</number>
</property>
<property name="minimum">
<double>-360.000000000000000</double>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="CCDverticalSpacer"> <spacer name="CCDverticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
skipping to change at line 1640 skipping to change at line 1741
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="telescopeVFlip"> <widget class="QCheckBox" name="telescopeVFlip">
<property name="text"> <property name="text">
<string>Vertical flip</string> <string>Vertical flip</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="telescopeEQ">
<property name="text">
<string>Equatorial Mount</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_2"> <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="sizeHint" stdset="0">
<size> <size>
skipping to change at line 1739 skipping to change at line 1847
<tabstop>telescopeListView</tabstop> <tabstop>telescopeListView</tabstop>
<tabstop>addTelescope</tabstop> <tabstop>addTelescope</tabstop>
<tabstop>pushButtonMoveTelescopeUp</tabstop> <tabstop>pushButtonMoveTelescopeUp</tabstop>
<tabstop>pushButtonMoveTelescopeDown</tabstop> <tabstop>pushButtonMoveTelescopeDown</tabstop>
<tabstop>deleteTelescope</tabstop> <tabstop>deleteTelescope</tabstop>
<tabstop>telescopeName</tabstop> <tabstop>telescopeName</tabstop>
<tabstop>telescopeFL</tabstop> <tabstop>telescopeFL</tabstop>
<tabstop>telescopeDiameter</tabstop> <tabstop>telescopeDiameter</tabstop>
<tabstop>telescopeHFlip</tabstop> <tabstop>telescopeHFlip</tabstop>
<tabstop>telescopeVFlip</tabstop> <tabstop>telescopeVFlip</tabstop>
<tabstop>telescopeEQ</tabstop>
<tabstop>textBrowser</tabstop> <tabstop>textBrowser</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../../../../data/gui/guiRes.qrc"/> <include location="../../../../data/gui/guiRes.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>
 End of changes. 14 change blocks. 
16 lines changed or deleted 125 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/