caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jankae/VNA2

Browse Source
This commit is contained in:
Jan Käberich 2020-12-17 20:39:42 +01:00
commit 457c745c48
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Software/PC_Application/Traces/markerwidget.cpp
View File

@ -39,13 +39,12 @@ MarkerWidget::~MarkerWidget()
void MarkerWidget::on_bDelete_clicked() void MarkerWidget::on_bDelete_clicked()
{ {
if (model.rowCount() <= 0) { if (model.rowCount() <= 0) {
return; // prevent crash if bDelete clicked with no markers (empty model) return; // there is nothing to delete (empty model)
} }
QModelIndex ind = ui->treeView->currentIndex(); QModelIndex ind = ui->treeView->currentIndex();
if ( ! ind.isValid() ) { if ( ! ind.isValid() ) {
return; // add marker(s), then click bDelete without clicking on any marker (there is no index clicked in treeView) return; // if no marker clicked/selected in treeView, the index is not valid
// alternative: select last marker, then proceede to delete it?
} }
auto marker = model.markerFromIndex(ind); auto marker = model.markerFromIndex(ind);

1
Software/PC_Application/Traces/tracemarker.cpp
View File

@ -768,6 +768,7 @@ SIUnitEdit *TraceMarker::getSettingsEditor()
case Type::Lowpass: case Type::Lowpass:
case Type::Highpass: case Type::Highpass:
case Type::PeakTable: case Type::PeakTable:
case Type::Bandpass: // initialize with "dB"
return new SIUnitEdit("db", " ", 3); return new SIUnitEdit("db", " ", 3);
case Type::TOI: case Type::TOI:
return nullptr; return nullptr;