Removed deprecated Julian Date text field

sohstationviewer/view/calendardialog.py

@@ -14,22 +14,10 @@ class CalendarDialog(QtWidgets.QDialog, Ui_CalendarDialog):
         # Connect the "selectionChanged" signal from the QCalendar
         # This lets the user select a date using either the mouse, or
         # arrow keys on the keyboard.
-        self.calendarWidget.selectionChanged.connect(self.onDatePicked)
-        date = self.calendarWidget.selectedDate()
-        doy = date.dayOfYear()
-        self.julianDateLineEdit.setText(str(doy))
-
-    @QtCore.Slot()
-    def onDatePicked(self):
-        # This slot retrieves the day of year format from the 
-        # date that the user has selected in the calendar,
-        # and sends it to the read-only line edit in the same widget
-        # If the original functionality of the Calendar is required
-        # or preferred, I will replace this with a subclass or completely
-        # custom calendar widget in the near future.
-        date = self.calendarWidget.selectedDate()
-        doy = date.dayOfYear()
-        self.julianDateLineEdit.setText(str(doy))
+        # self.calendarWidget.selectionChanged.connect(self.onDatePicked)
+        # date = self.calendarWidget.selectedDate()
+        # doy = date.dayOfYear()
+        # self.julianDateLineEdit.setText(str(doy))
 
 if __name__ == '__main__':
     app = QtWidgets.QApplication(sys.argv)

sohstationviewer/view/ui/calendar.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CalendarDialog</class>
- <widget class="QDialog" name="CalendarDialog">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>420</width>
     <height>300</height>
    </rect>
   </property>
@@ -15,24 +15,10 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="CalendarWidget" name="calendarWidget"/>
+    <widget class="QCalendarWidget" name="calendarWidget"/>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Julian Date:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="julianDateLineEdit">
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="orientation">
@@ -47,43 +33,36 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>CalendarWidget</class>
-   <extends>QCalendarWidget</extends>
-   <header>calendarwidget.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>CalendarDialog</receiver>
-   <slot>accept()</slot>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>391</x>
      <y>291</y>
     </hint>
     <hint type="destinationlabel">
-     <x>157</x>
+     <x>286</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>CalendarDialog</receiver>
-   <slot>reject()</slot>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>391</x>
      <y>291</y>
     </hint>
     <hint type="destinationlabel">
-     <x>286</x>
+     <x>157</x>
      <y>274</y>
     </hint>
    </hints>

sohstationviewer/view/ui/calendar_ui.py

@@ -21,13 +21,6 @@ class Ui_CalendarDialog(object):
         self.verticalLayout.addWidget(self.calendarWidget)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label = QtWidgets.QLabel(CalendarDialog)
-        self.label.setObjectName("label")
-        self.horizontalLayout.addWidget(self.label)
-        self.julianDateLineEdit = QtWidgets.QLineEdit(CalendarDialog)
-        self.julianDateLineEdit.setReadOnly(True)
-        self.julianDateLineEdit.setObjectName("julianDateLineEdit")
-        self.horizontalLayout.addWidget(self.julianDateLineEdit)
         self.buttonBox = QtWidgets.QDialogButtonBox(CalendarDialog)
         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
         self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Ok)
@@ -42,6 +35,5 @@ class Ui_CalendarDialog(object):
 
     def retranslateUi(self, CalendarDialog):
         CalendarDialog.setWindowTitle(QtWidgets.QApplication.translate("CalendarDialog", "Calendar", None, -1))
-        self.label.setText(QtWidgets.QApplication.translate("CalendarDialog", "Julian Date:", None, -1))
 
 from .calendarwidget import CalendarWidget