Browse Source

added word wrapping to freq_label

master
Clemens Richter 9 years ago
parent
commit
02584fc62e
  1. 2
      lib/rds_decoder_redsea_impl.cc
  2. 10
      python/rds_parser_table_qt.py

2
lib/rds_decoder_redsea_impl.cc

@ -281,7 +281,7 @@ int rds_decoder_redsea_impl::work (int noutput_items,
} else { } else {
//try correcting: //try correcting:
uint32_t corrected_block= correctBurstErrors(reg,expected_offset_char[block_number]); uint32_t corrected_block= correctBurstErrors(reg,expected_offset_char[block_number]);
if(corrected_block != reg) {//syndrome found in table ^= correction worked if(corrected_block != reg) {//syndrome found in table == correction worked
good_block=true; good_block=true;
dataword=(corrected_block>>10) & 0xffff; dataword=(corrected_block>>10) & 0xffff;
checkword=corrected_block & 0x3ff; checkword=corrected_block & 0x3ff;

10
python/rds_parser_table_qt.py

@ -48,7 +48,7 @@ class rds_parser_table_qt_Signals(QObject):
super(QtCore.QObject, self).__init__() super(QtCore.QObject, self).__init__()
class rds_parser_table_qt(gr.sync_block):#START class rds_parser_table_qt(gr.sync_block):#START
""" """
docstring for block qtguitest docstring for block rds_parser_table
""" """
def goodbye(self): def goodbye(self):
self.clean_data_and_commit_db() self.clean_data_and_commit_db()
@ -190,7 +190,7 @@ class rds_parser_table_qt(gr.sync_block):#START
else:#elif self.decoders[num]['synced']==False: else:#elif self.decoders[num]['synced']==False:
#print("'color:red'>%i:%0.1fM</span>"% (num,freq/1e6)) #print("'color:red'>%i:%0.1fM</span>"% (num,freq/1e6))
message_string+="<span style='color:red'>&emsp; %i:%0.1fM (%i dB)</span>"% (num,freq/1e6,pilot_SNR) message_string+="<span style='color:red'>&emsp; %i:%0.1fM (%i dB)</span>"% (num,freq/1e6,pilot_SNR)
message_string+="&emsp; tuned frequency:%0.1fM"%(self.tuning_frequency/1e6) message_string+="<br>tuned frequency:%0.1fM"%(self.tuning_frequency/1e6)
self.signals.DataUpdateEvent.emit({'decoder_frequencies':message_string}) self.signals.DataUpdateEvent.emit({'decoder_frequencies':message_string})
#print(message_string) #print(message_string)
#self.signals.DataUpdateEvent.emit({'row':decoder_num,'freq':freq_str}) #self.signals.DataUpdateEvent.emit({'row':decoder_num,'freq':freq_str})
@ -1097,9 +1097,12 @@ class rds_parser_table_qt_Widget(QtGui.QWidget):
layout.addLayout(button_layout) layout.addLayout(button_layout)
label_layout = Qt.QHBoxLayout() label_layout = Qt.QHBoxLayout()
self.freq_label=QtGui.QLabel("decoder frequencies:") self.freq_label=QtGui.QLabel("decoder frequencies:")
self.freq_label.setWordWrap(True)
self.freq_label.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Ignored))#expand in horizontal direction and only wrap if window too small
#self.freq_label.setTextFormat(QtCore.Qt.RichText) #self.freq_label.setTextFormat(QtCore.Qt.RichText)
#self.freq_label.setTextFormat(QtCore.Qt.PlainText) #self.freq_label.setTextFormat(QtCore.Qt.PlainText)
self.count_label=QtGui.QLabel("count:") self.count_label=QtGui.QLabel("count:")
self.count_label.setAlignment(QtCore.Qt.AlignRight)
label_layout.addWidget(self.freq_label) label_layout.addWidget(self.freq_label)
label_layout.addWidget(self.count_label) label_layout.addWidget(self.count_label)
layout.addLayout(label_layout) layout.addLayout(label_layout)
@ -1149,7 +1152,8 @@ class rds_parser_table_qt_Widget(QtGui.QWidget):
def display_data(self, event): def display_data(self, event):
#pp.pprint(event) #pp.pprint(event)
if type(event)==dict and event.has_key('group_count'): if type(event)==dict and event.has_key('group_count'):
self.count_label.setText("count:%02i, max:%i"%(event['group_count'],event['group_count_max'])) #self.count_label.setText("count:%02i, max:%i"%(event['group_count'],event['group_count_max']))
self.count_label.setText("count:%i"%event['group_count'])
if type(event)==dict and event.has_key('decoder_frequencies'): if type(event)==dict and event.has_key('decoder_frequencies'):
self.freq_label.setText(event['decoder_frequencies']) self.freq_label.setText(event['decoder_frequencies'])
if type(event)==dict and event.has_key('PI'): if type(event)==dict and event.has_key('PI'):

Loading…
Cancel
Save