From d8d8e3eaf2d5ff7742b6f8fa2d134fb1b19e4d04 Mon Sep 17 00:00:00 2001 From: alessandro90 Date: Mon, 1 Oct 2018 22:56:50 +0200 Subject: [PATCH] Better labes layout --- main.py | 16 +- main_window.ui | 1568 ++++++++++++++++++++++++++++-------------------- 2 files changed, 918 insertions(+), 666 deletions(-) diff --git a/main.py b/main.py index 6f9bed3..8e94001 100644 --- a/main.py +++ b/main.py @@ -128,7 +128,14 @@ class MyApp(QMainWindow, Ui_MainWindow): self.url_button.setEnabled(True) self.url_button.setStyleSheet("color: #4c75ff;") self.current_signal_name = item.text() - self.name_lab.setText(self.current_signal_name) + words = self.current_signal_name.split(' ') + if len(words) > 3: + words_per_row = len(words) // 2 + words = ' '.join(words[:words_per_row]) \ + + "\n" + ' '.join(words[words_per_row:]) + else: + words = self.current_signal_name + self.name_lab.setText(words) current_signal = self.db.loc[self.current_signal_name] category_code = current_signal.loc["category_code"] self.freq_lab.setText(self.format_numbers( @@ -175,11 +182,12 @@ class MyApp(QMainWindow, Ui_MainWindow): @staticmethod def change_unit(num): - if len(num) < 4: + digits = len(num) + if digits < 4: return 1 - elif len(num) < 7: + elif digits < 7: return 1000 - elif len(num) < 10: + elif digits < 10: return 10**6 else: return 10**9 diff --git a/main_window.ui b/main_window.ui index 920bc70..42998b7 100644 --- a/main_window.ui +++ b/main_window.ui @@ -6,8 +6,8 @@ 0 0 - 942 - 568 + 1031 + 581 @@ -321,401 +321,906 @@ QTabBar::tab:!selected { Main - - - - - - - 12 - 75 - true - - - - Categories - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Military - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Radar - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Active - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Inactive - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - HAM - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Commercial - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Aviation - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Marine - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Analogue - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Digital - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Trunked - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Utility - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Sat - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Navigation - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Interfering - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Time Signal - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - 10 - 75 - true - - - - color: #9f9f9f; - - - Number Stations - - - Qt::AlignCenter - - - - + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + Name + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 12 + + + + N/A + + + false + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + Frequency + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 12 + + + + N/A + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + Bandwidth + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 12 + + + + N/A + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + Mode + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 12 + + + + N/A + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + Modulation + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 12 + + + + N/A + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + Location + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 12 + + + + N/A + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + ACF + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 12 + + + + N/A + + + + + + + + + + + 0 + 0 + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + Categories + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Military + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Radar + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Active + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Inactive + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + HAM + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Commercial + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Aviation + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Marine + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Analogue + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Digital + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Trunked + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Utility + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Sat + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Navigation + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Interfering + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Time Signal + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: #9f9f9f; + + + Number Stations + + + Qt::AlignCenter + + + + + + + + + 0 + 0 + + + + + + + false + + + + 0 + 0 + + + + + 12 + 75 + true + true + + + + Go to the signal's wiki. + + + color: #898989; + + + Signal's wiki + + + true + + + + + + + + + + 0 + 0 + + 12 @@ -726,277 +1231,16 @@ QTabBar::tab:!selected { Description + + Qt::AlignCenter + - - - - - - - - - - - 12 - 75 - true - - - - Name - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 12 - 75 - true - - - - Frequency - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 12 - 75 - true - - - - Bandwidth - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 12 - 75 - true - - - - Mode - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 12 - 75 - true - - - - Modulation - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 12 - 75 - true - - - - Location - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 12 - 75 - true - - - - ACF - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - 10 - - - - N/A - - - - - - - - 12 - - - - N/A - - - - - - - - 12 - - - - N/A - - - - - - - - 12 - - - - N/A - - - - - - - - 12 - - - - N/A - - - - - - - - 12 - - - - N/A - - - - - - - - 12 - - - - N/A - - - - - - - - - - - - 0 - 0 - - - - - - - false - - - - 0 - 0 - - - - - 12 - 75 - true - true - - - - Go to the signal's wiki. - - - color: #898989; - - - Signal's wiki - - - true - - - - - - - - - - + + - 10 + 11 @@ -1303,7 +1547,7 @@ QSlider::handle:horizontal { 0 0 - 942 + 1031 21