chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI Updates, Text Eliding, CallDetail Grid

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-03 11:38:16 -04:00
parent 26c76662ac
commit bee42d1762
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mainwindow.cpp
View File

@ -953,6 +953,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->menuSave->setEnabled(false);
ui->menuTools->setEnabled(false);
ui->menuView->setEnabled(false);
ui->dxCallEntry->clear();
ui->dxGridEntry->clear();
// this must be the last statement of constructor
@ -2992,8 +2994,13 @@ void MainWindow::readFromStdout() //readFromStdout
QString cqCall = decodedtext.CQersCall();
if(!cqCall.isEmpty()){
QString theircall;
QString theirgrid;
decodedtext.deCallAndGrid(/*out*/theircall,theirgrid);
CallDetail d;
d.call = cqCall;
d.call = theircall;
d.grid = theirgrid;
d.snr = decodedtext.snr();
d.freq = decodedtext.frequencyOffset();
d.timestamp = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
@ -7127,7 +7134,8 @@ void MainWindow::postDecode (bool is_new, QString const& message)
text.append(item.text);
snr = item.snr;
}
auto joined = text.join(" … ");
auto joined = text.join(" ");
if(joined.isEmpty()){
continue;
}
@ -7135,7 +7143,20 @@ void MainWindow::postDecode (bool is_new, QString const& message)
ui->tableWidgetRXAll->insertRow(ui->tableWidgetRXAll->rowCount());
ui->tableWidgetRXAll->setItem(ui->tableWidgetRXAll->rowCount() - 1, 0, new QTableWidgetItem(QString("%1").arg(offset)));
ui->tableWidgetRXAll->setItem(ui->tableWidgetRXAll->rowCount() - 1, 1, new QTableWidgetItem(QString("%1").arg(snr)));
ui->tableWidgetRXAll->setItem(ui->tableWidgetRXAll->rowCount() - 1, 2, new QTableWidgetItem(joined));
// align right if eliding...
int colWidth = ui->tableWidgetRXAll->columnWidth(2);
auto textItem = new QTableWidgetItem(joined);
QFontMetrics fm(textItem->font());
auto elidedText = fm.elidedText(joined, Qt::ElideLeft, colWidth);
auto flag = Qt::AlignLeft|Qt::AlignVCenter;
if(elidedText != joined){
flag = Qt::AlignRight|Qt::AlignVCenter;
textItem->setText(elidedText);
}
textItem->setTextAlignment(flag);
ui->tableWidgetRXAll->setItem(ui->tableWidgetRXAll->rowCount() - 1, 2, textItem);
if(offset == selectedOffset){
ui->tableWidgetRXAll->selectRow(ui->tableWidgetRXAll->rowCount() - 1);
}
@ -7159,8 +7180,10 @@ void MainWindow::postDecode (bool is_new, QString const& message)
QList<QString> calls = m_callActivity.keys();
qSort(calls.begin(), calls.end());
foreach(QString call, calls){
CallDetail d = m_callActivity[call];
ui->tableWidgetCalls->insertRow(ui->tableWidgetCalls->rowCount());
ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 0, new QTableWidgetItem(call));
ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 1, new QTableWidgetItem(d.grid));
if(call == selectedCall){
ui->tableWidgetCalls->selectRow(ui->tableWidgetCalls->rowCount() - 1);
}

1
mainwindow.h
View File

@ -613,6 +613,7 @@ private:
struct CallDetail
{
QString call;
QString grid;
int freq;
int timestamp;
int snr;

12
mainwindow.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1195</width>
<height>709</height>
<width>960</width>
<height>514</height>
</rect>
</property>
<property name="windowTitle">
@ -742,6 +742,9 @@ background-color: yellow;
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
@ -874,6 +877,9 @@ QTextEdit[readOnly=&quot;true&quot;] {
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="textElideMode">
<enum>Qt::ElideNone</enum>
</property>
<property name="gridStyle">
<enum>Qt::DotLine</enum>
</property>
@ -3796,7 +3802,7 @@ list. The list can be maintained in Settings (F2).</string>
<rect>
<x>0</x>
<y>0</y>
<width>1195</width>
<width>960</width>
<height>22</height>
</rect>
</property>