wouter/Artemis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix details in fixed aspect ratio labels.

Browse Source
This commit is contained in:
alessandro90
2019-05-05 11:45:53 +02:00
parent 175cb66c76
commit 36f941131c
6 changed files with 306 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
artemis.py
View File

@@ -32,8 +32,7 @@ from constants import (Constants,
Database, Database,
ChecksumWhat, ChecksumWhat,
Messages, Messages,
Signal, Signal,)
Months)
from themesmanager import ThemeManager from themesmanager import ThemeManager
from utilities import (checksum_ok, from utilities import (checksum_ok,
uncheck_and_emit, uncheck_and_emit,
@@ -157,6 +156,17 @@ class Artemis(QMainWindow, Ui_MainWindow):
lab.set_default_stylesheet() lab.set_default_stylesheet()
self.space_weather_label_container.labels = self.space_weather_labels self.space_weather_label_container.labels = self.space_weather_labels
self.space_weather_label_name_container.labels = [
self.eme_lbl,
self.ms_lbl,
self.muf_lbl,
self.hi_lbl,
self.eu50_lbl,
self.eu70_lbl,
self.eu144_lbl,
self.na_lbl,
self.aurora_lbl
]
self.theme_manager = ThemeManager(self) self.theme_manager = ThemeManager(self)
# Manage frequency filters. # Manage frequency filters.
@@ -455,7 +465,7 @@ class Artemis(QMainWindow, Ui_MainWindow):
) )
self.apply_remove_acf_filter_btn.clicked.connect(self.display_signals) self.apply_remove_acf_filter_btn.clicked.connect(self.display_signals)
self.reset_acf_filters_btn.clicked.connect(self.reset_acf_filters) self.reset_acf_filters_btn.clicked.connect(self.reset_acf_filters)
self.acf_info_btn.clicked.connect(lambda : webbrowser.open(Constants.ACF_DOCS)) self.acf_info_btn.clicked.connect(lambda: webbrowser.open(Constants.ACF_DOCS))
connect_events_to_func( connect_events_to_func(
events_to_connect=[self.acf_spinbox.valueChanged, events_to_connect=[self.acf_spinbox.valueChanged,
@@ -561,7 +571,7 @@ class Artemis(QMainWindow, Ui_MainWindow):
self.update_now_bar.set_idle() self.update_now_bar.set_idle()
if status_ok: if status_ok:
xray_long = float(self.space_weather_data.xray[-1][7]) xray_long = float(self.space_weather_data.xray[-1][7])
format_text = lambda letter, power : letter + f"{xray_long * 10**power:.1f}" format_text = lambda letter, power: letter + f"{xray_long * 10**power:.1f}"
if xray_long < 1e-8 and xray_long != -1.00e+05: if xray_long < 1e-8 and xray_long != -1.00e+05:
self.peak_flux_lbl.setText(format_text("<A", 8)) self.peak_flux_lbl.setText(format_text("<A", 8))
elif xray_long >= 1e-8 and xray_long < 1e-7: elif xray_long >= 1e-8 and xray_long < 1e-7:

512
artemis.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1387</width> <width>1458</width>
<height>761</height> <height>795</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@@ -17,7 +17,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>ARTEMIS3</string> <string>ARTΣMIS 3.0</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset> <iconset>
@@ -6150,239 +6150,281 @@ background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,stop:0 #283048 ,sto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<layout class="QGridLayout" name="gridLayout_23" columnstretch="0,0"> <layout class="QHBoxLayout" name="horizontalLayout_44">
<property name="leftMargin"> <item>
<number>9</number> <widget class="FixedAspectRatioWidget" name="space_weather_label_name_container" native="true">
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_23">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font"> <property name="layoutDirection">
<font> <enum>Qt::LeftToRight</enum>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property> </property>
<property name="text"> <property name="styleSheet">
<string>E.M.E.→</string> <string notr="true"/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_14">
<item>
<widget class="FixedAspectRatioLabel" name="eme_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>E.M.E.→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item>
<widget class="FixedAspectRatioLabel" name="ms_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Meteor Scatter→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item>
<widget class="FixedAspectRatioLabel" name="muf_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>M.U.F.→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item>
<widget class="FixedAspectRatioLabel" name="hi_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Hystorical Index→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item>
<widget class="FixedAspectRatioLabel" name="eu50_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>50 MHz E-skip in EU→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item>
<widget class="FixedAspectRatioLabel" name="eu70_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>70 MHz E-skip in EU→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item>
<widget class="FixedAspectRatioLabel" name="eu144_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>144 MHz E-skip in EU→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item>
<widget class="FixedAspectRatioLabel" name="na_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>144 MHz E-skip in NA→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item>
<widget class="FixedAspectRatioLabel" name="aurora_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>VHF Aurora→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item>
<widget class="QLabel" name="label_27">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="text">
<string>50 MHz E-skip in EU→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_33">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="text">
<string>VHF Aurora→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_26">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="text">
<string>Hystorical Index→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_31">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="text">
<string>144 MHz E-skip in EU→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_25">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="text">
<string>M.U.F.→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_24">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="text">
<string>Meteor Scatter→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_32">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="text">
<string>144 MHz E-skip in NA→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_28">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<italic>false</italic>
</font>
</property>
<property name="text">
<string>70 MHz E-skip in EU→</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>15</number>
</property>
</widget>
</item>
<item row="0" column="1" rowspan="9">
<widget class="FixedAspectRatioWidget" name="space_weather_label_container" native="true"> <widget class="FixedAspectRatioWidget" name="space_weather_label_container" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -6834,7 +6876,7 @@ background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,stop:0 #283048 ,sto
<number>1</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>-1</number> <number>0</number>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@@ -6842,6 +6884,9 @@ background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,stop:0 #283048 ,sto
<property name="textVisible"> <property name="textVisible">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="format"> <property name="format">
<string>%p%</string> <string>%p%</string>
</property> </property>
@@ -7708,14 +7753,23 @@ background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,stop:0 #283048 ,sto
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="maximum"> <property name="maximum">
<number>1</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>0</number> <number>0</number>
</property> </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="textVisible"> <property name="textVisible">
<bool>false</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@@ -8175,7 +8229,7 @@ QSlider::handle:horizontal {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1387</width> <width>1458</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>

18
constants.py
View File

@@ -82,24 +82,6 @@ class ForecastColors:
KP5_COLOR = "#BEE3FE" KP5_COLOR = "#BEE3FE"
class Months:
MONTS = [
"0",
"Jan",
"Feb",
"Mar",
"Apr",
"May",
"Jun",
"Jul",
"Aug",
"Sep",
"Oct",
"Nov",
"Dec"
]
class Constants: class Constants:
CLICK_TO_UPDATE_STR = "Click to update" CLICK_TO_UPDATE_STR = "Click to update"
SIGIDWIKI = "https://www.sigidwiki.com/wiki/Signal_Identification_Guide" SIGIDWIKI = "https://www.sigidwiki.com/wiki/Signal_Identification_Guide"

12
fixed_aspect_ratio_label.py
View File

@@ -8,16 +8,14 @@ class FixedAspectRatioLabel(QLabel):
self.pixmap = None self.pixmap = None
def set_default_stylesheet(self): def set_default_stylesheet(self):
self.setStyleSheet("border: 3px;") self.setStyleSheet("""border-width: 1px;
# self.setStyleSheet(""" border-style: solid;
# color: #ffffff; border-color: black;"""
# background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,stop:0 #304352 ,stop: 1 #d7d2cc); )
# """)
def make_transparent(self): def make_transparent(self):
self.setText('') self.setText('')
self.setStyleSheet("border: 0px;") self.setStyleSheet("border-width: 0px;")
# self.setStyleSheet("background-color: transparent;")
def apply_pixmap(self): def apply_pixmap(self):
if self.pixmap: if self.pixmap:

8
fixed_aspect_ratio_widget.py
View File

@@ -12,10 +12,10 @@ class FixedAspectRatioWidget(QWidget):
h, w = self.height(), self.width() h, w = self.height(), self.width()
h_lbl = h / 9 - self.space h_lbl = h / 9 - self.space
w_lbl = 5 * h_lbl w_lbl = 5 * h_lbl
w_pad = w - 10
if w_lbl > w: if w_lbl > w_pad:
w_lbl = w w_lbl = w_pad
h_lbl = h / 9 - self.space h_lbl = w_pad / 5
for label in self.labels: for label in self.labels:
label.rescale(QSize(w_lbl, h_lbl)) label.rescale(QSize(w_lbl, h_lbl))

1
threads.py
View File

@@ -27,7 +27,6 @@ class _BaseDownloadThread(QThread):
def __del__(self): def __del__(self):
self.terminate() self.terminate()
self.wait() self.wait()
super().__del__()
class DownloadThread(_BaseDownloadThread): class DownloadThread(_BaseDownloadThread):