From 3c67ebe5c5d2e3b1e843fb31c8304eaa3fa39d93 Mon Sep 17 00:00:00 2001
From: Garrett Bates <gbates@passcal.nmt.edu>
Date: Mon, 21 Jun 2021 10:03:47 -0600
Subject: [PATCH] Fixed minor bug in calendar widget subclass.
---
sohstationviewer/view/ui/calendarwidget.py | 5 +-
sohstationviewer/view/ui/main.ui | 188 +++++++++++++--------
2 files changed, 118 insertions(+), 75 deletions(-)
diff --git a/sohstationviewer/view/ui/calendarwidget.py b/sohstationviewer/view/ui/calendarwidget.py
index 46fd58f8d..06507ef7b 100644
--- a/sohstationviewer/view/ui/calendarwidget.py
+++ b/sohstationviewer/view/ui/calendarwidget.py
@@ -17,11 +17,8 @@ class CalendarWidget(QtWidgets.QCalendarWidget):
navbar = self.findChild(QtWidgets.QWidget, 'qt_calendar_navigationbar')
if navbar:
- # self.toggleDayOfYear = QtWidgets.QPushButton('Show DOY', navbar)
- # self.toggleDayOfYear = QtWidgets.QCheckBox('Show DOY', navbar)
self.toggleDayOfYear = QtWidgets.QCheckBox('Show DOY')
- # navbar.layout().addWidget(self.toggleDayOfYear)
- navbar.layout().insertWidget(1, self.toggleDayOfYear)
+ navbar.layout().insertWidget(2, self.toggleDayOfYear)
self.toggleDayOfYear.toggled.connect(self.setShowDayOfYear)
self.toggleDayOfYear.setCheckable(True)
diff --git a/sohstationviewer/view/ui/main.ui b/sohstationviewer/view/ui/main.ui
index 63d8a9ed7..09586bb79 100755
--- a/sohstationviewer/view/ui/main.ui
+++ b/sohstationviewer/view/ui/main.ui
@@ -207,8 +207,65 @@
</property>
<item>
<layout class="QGridLayout" name="primaryGrid">
- <item row="12" column="1">
- <widget class="Line" name="sep0">
+ <item row="24" column="1">
+ <layout class="QGridLayout" name="controlButtonGrid">
+ <property name="spacing">
+ <number>2</number>
+ </property>
+ <item row="0" column="3">
+ <widget class="QPushButton" name="writePushButton">
+ <property name="text">
+ <string>Write .ps</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QPushButton" name="stopPushButton">
+ <property name="text">
+ <string>Stop</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="readPushButton">
+ <property name="text">
+ <string>Read</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <spacer name="horizontalSpacer_7">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="4">
+ <spacer name="horizontalSpacer_8">
+ <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 row="26" column="0" colspan="3">
+ <widget class="QListWidget" name="listWidget_2"/>
+ </item>
+ <item row="7" column="1">
+ <widget class="Line" name="sep2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -220,7 +277,7 @@
</property>
</widget>
</item>
- <item row="11" column="1">
+ <item row="22" column="1">
<layout class="QGridLayout" name="dsGrid">
<item row="2" column="3">
<widget class="QCheckBox" name="ds6CheckBox">
@@ -296,20 +353,7 @@
</item>
</layout>
</item>
- <item row="7" column="1">
- <widget class="Line" name="sep2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="9" column="1">
+ <item row="20" column="1">
<layout class="QGridLayout" name="massPosGrid">
<item row="0" column="0">
<widget class="QLabel" name="massPosLabel">
@@ -350,47 +394,39 @@
</item>
</layout>
</item>
- <item row="13" column="1">
- <layout class="QGridLayout" name="controlButtonGrid">
- <property name="spacing">
- <number>2</number>
+ <item row="12" column="1">
+ <layout class="QGridLayout" name="zoomGrid">
+ <property name="leftMargin">
+ <number>0</number>
</property>
- <item row="0" column="3">
- <widget class="QPushButton" name="writePushButton">
- <property name="text">
- <string>Write .ps</string>
- </property>
- </widget>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="horizontalZoomSpinBox"/>
</item>
- <item row="0" column="2">
- <widget class="QPushButton" name="stopPushButton">
+ <item row="0" column="0">
+ <widget class="QLabel" name="horizontalZoomLabel">
<property name="text">
- <string>Stop</string>
+ <string>Mag. X:</string>
</property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QPushButton" name="readPushButton">
- <property name="text">
- <string>Read</string>
+ <property name="buddy">
+ <cstring>horizontalZoomSpinBox</cstring>
</property>
</widget>
</item>
- <item row="0" column="0">
- <spacer name="horizontalSpacer_7">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="verticalZoomSpinBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="verticalZoomLabel">
+ <property name="text">
+ <string>Mag. Y:</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ <property name="buddy">
+ <cstring>verticalZoomSpinBox</cstring>
</property>
- </spacer>
+ </widget>
</item>
- <item row="0" column="4">
- <spacer name="horizontalSpacer_8">
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -404,29 +440,6 @@
</item>
</layout>
</item>
- <item row="10" column="1">
- <widget class="Line" name="sep1">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="8" column="1">
- <widget class="QCheckBox" name="sohCheckBox">
- <property name="text">
- <string>SOH Only</string>
- </property>
- </widget>
- </item>
- <item row="15" column="0" colspan="3">
- <widget class="QListWidget" name="listWidget_2"/>
- </item>
<item row="4" column="0" colspan="2">
<layout class="QGridLayout" name="mainOptionsGrid">
<property name="horizontalSpacing">
@@ -601,9 +614,42 @@
</item>
</layout>
</item>
+ <item row="8" column="1">
+ <widget class="QCheckBox" name="sohCheckBox">
+ <property name="text">
+ <string>SOH Only</string>
+ </property>
+ </widget>
+ </item>
+ <item row="23" column="1">
+ <widget class="Line" name="sep0">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
<item row="2" column="0" colspan="2">
<widget class="QListWidget" name="openFilesList"/>
</item>
+ <item row="21" column="1">
+ <widget class="Line" name="sep1">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
--
GitLab