Bigger signal name and better layout

This commit is contained in:
alessandro90
2018-10-07 16:43:10 +02:00
parent dfd8c4ac0e
commit 37adfcd7c2
3 changed files with 918 additions and 923 deletions

View File

@@ -75,7 +75,7 @@ class AudioPlayer(object):
def set_audio_player(self, fname = ""):
self.__first_call = True
self.__reset_audio_widget()
full_name = os.path.join('Data', 'Audio', fname + '.wav')
full_name = os.path.join('Data', 'Audio_ogg', fname + '.ogg')
if os.path.exists(full_name):
self.__play.setEnabled(True)
self.__audio_file = full_name
@@ -84,7 +84,7 @@ class AudioPlayer(object):
if not self.__paused:
if self.__first_call:
self.__first_call = False
mixer.init(frequency = AudioSegment.from_wav(self.__audio_file).frame_rate,
mixer.init(frequency = AudioSegment.from_ogg(self.__audio_file).frame_rate,
buffer = 2048)
mixer.music.load(self.__audio_file)
self.__set_volume()

View File

@@ -10,7 +10,7 @@ from PyQt5.QtWidgets import (QMainWindow,
qApp,)
from PyQt5.QtGui import QPixmap
from PyQt5 import uic
from PyQt5.QtCore import QFileInfo, QSize
from PyQt5.QtCore import QFileInfo, QSize, Qt
from audio_player import AudioPlayer
@@ -169,7 +169,8 @@ class MyApp(QMainWindow, Ui_MainWindow):
+ "\n" + ' '.join(words[words_per_row:])
else:
words = self.current_signal_name
self.name_lab.setText(words)
self.name_lab.setText(self.current_signal_name)
self.name_lab.setAlignment(Qt.AlignHCenter)
current_signal = self.db.loc[self.current_signal_name]
self.url_button.setEnabled(True)
if not current_signal.at["url_clicked"]:

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1337</width>
<height>641</height>
<width>1327</width>
<height>638</height>
</rect>
</property>
<property name="sizePolicy">
@@ -124,6 +124,12 @@ QMessageBox {
QToolTip {
color: #000000;
}
QTextBrowser {
background-color: #464646;
color: #ffffff;
border: 0px;
}</string>
</property>
<widget class="QWidget" name="centralwidget">
@@ -330,12 +336,84 @@ QTabBar::tab:!selected {
<attribute name="title">
<string>Main</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QTextBrowser" name="name_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>20</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:20pt; font-weight:600; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:15pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:15pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QWidget" name="widget_5" native="true">
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<item row="5" column="1">
<widget class="QLabel" name="acf_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="freq_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -356,15 +434,15 @@ QTabBar::tab:!selected {
</font>
</property>
<property name="text">
<string>Name</string>
<string>Mode</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="name_lab">
<item row="2" column="1">
<widget class="QLabel" name="mode_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -379,12 +457,27 @@ QTabBar::tab:!selected {
<property name="text">
<string>N/A</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="modul_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -414,53 +507,6 @@ QTabBar::tab:!selected {
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="freq_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Bandwidth</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="band_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -479,53 +525,6 @@ QTabBar::tab:!selected {
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Mode</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="mode_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_6">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -554,25 +553,7 @@ QTabBar::tab:!selected {
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="modul_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_7">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -601,7 +582,7 @@ QTabBar::tab:!selected {
</property>
</widget>
</item>
<item row="5" column="1">
<item row="4" column="1">
<widget class="QLabel" name="loc_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -619,7 +600,36 @@ QTabBar::tab:!selected {
</property>
</widget>
</item>
<item row="6" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Bandwidth</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_8">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -648,24 +658,6 @@ QTabBar::tab:!selected {
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLabel" name="acf_lab">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@@ -1181,7 +1173,7 @@ QTabBar::tab:!selected {
<item row="1" column="0">
<widget class="QWidget" name="widget_4" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -1223,7 +1215,9 @@ QTabBar::tab:!selected {
</layout>
</widget>
</item>
<item row="2" column="0">
</layout>
</item>
<item>
<widget class="QLabel" name="label_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -1246,7 +1240,29 @@ QTabBar::tab:!selected {
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<item>
<widget class="QTextBrowser" name="description_text">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">border: 0px;
/*border-radius: 8px;*/</string>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="widget_6" native="true">
<property name="toolTip">
<string>Frequency bands</string>
@@ -1884,28 +1900,6 @@ QTabBar::tab:!selected {
</layout>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QTextBrowser" name="description_text">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">border: 0px;
/*border-radius: 8px;*/</string>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
@@ -1926,7 +1920,7 @@ QTabBar::tab:!selected {
</property>
<property name="minimumSize">
<size>
<width>300</width>
<width>310</width>
<height>0</height>
</size>
</property>
@@ -2026,8 +2020,8 @@ QPushButton:disabled {
</property>
<property name="minimumSize">
<size>
<width>60</width>
<height>60</height>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="text">
@@ -2051,8 +2045,8 @@ QPushButton:disabled {
</property>
<property name="minimumSize">
<size>
<width>60</width>
<height>60</height>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="text">
@@ -2076,8 +2070,8 @@ QPushButton:disabled {
</property>
<property name="minimumSize">
<size>
<width>60</width>
<height>60</height>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="text">
@@ -2195,7 +2189,7 @@ QSlider::handle:horizontal {
<rect>
<x>0</x>
<y>0</y>
<width>1337</width>
<width>1327</width>
<height>21</height>
</rect>
</property>