mirror of
https://github.com/jankae/LibreVNA.git
synced 2025-12-06 07:12:10 +01:00
Compare commits
2 commits
d77215aecb
...
bbd1bce0b8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bbd1bce0b8 | ||
|
|
937b002dfb |
|
|
@ -533,8 +533,9 @@ void Calibration::edit(TraceModel *traceModel)
|
||||||
ui->table->setCellWidget(i, 1, measurements[i]->createStandardWidget());
|
ui->table->setCellWidget(i, 1, measurements[i]->createStandardWidget());
|
||||||
ui->table->setCellWidget(i, 2, measurements[i]->createSettingsWidget());
|
ui->table->setCellWidget(i, 2, measurements[i]->createSettingsWidget());
|
||||||
ui->table->setItem(i, 3, measurements[i]->getStatisticsItem());
|
ui->table->setItem(i, 3, measurements[i]->getStatisticsItem());
|
||||||
ui->table->setItem(i, 4, new QTableWidgetItem(measurements[i]->getTimestamp().toString()));
|
ui->table->setItem(i, 4, new QTableWidgetItem(measurements[i]->getTimestamp().toLocalTime().toString()));
|
||||||
}
|
}
|
||||||
|
ui->table->setEditTriggers(QAbstractItemView::NoEditTriggers);
|
||||||
ui->table->selectRow(row);
|
ui->table->selectRow(row);
|
||||||
updateTableEditButtons();
|
updateTableEditButtons();
|
||||||
};
|
};
|
||||||
|
|
@ -625,6 +626,11 @@ void Calibration::edit(TraceModel *traceModel)
|
||||||
emit startMeasurements(m);
|
emit startMeasurements(m);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// double clicking on a row also starts the measurement
|
||||||
|
connect(ui->table, &QTableWidget::doubleClicked, this, [=](){
|
||||||
|
emit ui->measure->clicked();
|
||||||
|
});
|
||||||
|
|
||||||
connect(ui->selectMeasurement, &QPushButton::clicked, [=](){
|
connect(ui->selectMeasurement, &QPushButton::clicked, [=](){
|
||||||
auto selected = ui->table->selectionModel()->selectedRows();
|
auto selected = ui->table->selectionModel()->selectedRows();
|
||||||
if(selected.size() != 1) {
|
if(selected.size() != 1) {
|
||||||
|
|
@ -1971,12 +1977,12 @@ void Calibration::createDefaultMeasurements(Calibration::DefaultMeasurements dm)
|
||||||
{
|
{
|
||||||
lock_guard<recursive_mutex> guard(access);
|
lock_guard<recursive_mutex> guard(access);
|
||||||
auto createSOL = [=](int port) {
|
auto createSOL = [=](int port) {
|
||||||
auto _short = new CalibrationMeasurement::Short(this);
|
|
||||||
_short->setPort(port);
|
|
||||||
measurements.push_back(_short);
|
|
||||||
auto open = new CalibrationMeasurement::Open(this);
|
auto open = new CalibrationMeasurement::Open(this);
|
||||||
open->setPort(port);
|
open->setPort(port);
|
||||||
measurements.push_back(open);
|
measurements.push_back(open);
|
||||||
|
auto _short = new CalibrationMeasurement::Short(this);
|
||||||
|
_short->setPort(port);
|
||||||
|
measurements.push_back(_short);
|
||||||
auto load = new CalibrationMeasurement::Load(this);
|
auto load = new CalibrationMeasurement::Load(this);
|
||||||
load->setPort(port);
|
load->setPort(port);
|
||||||
measurements.push_back(load);
|
measurements.push_back(load);
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@ bool SIUnitEdit::eventFilter(QObject *, QEvent *event)
|
||||||
clearFocus();
|
clearFocus();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if(key == Qt::Key_Return) {
|
if(key == Qt::Key_Return || key == Qt::Key_Enter) {
|
||||||
// use new value without prefix
|
// use new value without prefix
|
||||||
parseNewValue(1.0);
|
parseNewValue(1.0);
|
||||||
continueEditing();
|
continueEditing();
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ SpectrumAnalyzer::SpectrumAnalyzer(AppWindow *window, QString name)
|
||||||
|
|
||||||
auto eStart = new SIUnitEdit("Hz", " kMG", 6);
|
auto eStart = new SIUnitEdit("Hz", " kMG", 6);
|
||||||
// calculate width required with expected string length
|
// calculate width required with expected string length
|
||||||
auto width = QFontMetrics(eStart->font()).horizontalAdvance("3.00000GHz") + 15;
|
auto width = QFontMetrics(eStart->font()).horizontalAdvance("10.00000 MHz") + 15;
|
||||||
eStart->setFixedWidth(width);
|
eStart->setFixedWidth(width);
|
||||||
eStart->setToolTip("Start frequency");
|
eStart->setToolTip("Start frequency");
|
||||||
connect(eStart, &SIUnitEdit::valueChanged, this, &SpectrumAnalyzer::SetStartFreq);
|
connect(eStart, &SIUnitEdit::valueChanged, this, &SpectrumAnalyzer::SetStartFreq);
|
||||||
|
|
|
||||||
|
|
@ -325,7 +325,7 @@ VNA::VNA(AppWindow *window, QString name)
|
||||||
|
|
||||||
auto eStart = new SIUnitEdit("Hz", " kMG", 6);
|
auto eStart = new SIUnitEdit("Hz", " kMG", 6);
|
||||||
// calculate width required with expected string length
|
// calculate width required with expected string length
|
||||||
auto width = QFontMetrics(eStart->font()).horizontalAdvance("3.00000GHz") + 15;
|
auto width = QFontMetrics(eStart->font()).horizontalAdvance("10.00000 MHz") + 15;
|
||||||
eStart->setFixedWidth(width);
|
eStart->setFixedWidth(width);
|
||||||
eStart->setToolTip("Start frequency");
|
eStart->setToolTip("Start frequency");
|
||||||
connect(eStart, &SIUnitEdit::valueChanged, this, &VNA::SetStartFreq);
|
connect(eStart, &SIUnitEdit::valueChanged, this, &VNA::SetStartFreq);
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,10 @@ QString Unit::ToString(double value, QString unit, QString prefixes, int precisi
|
||||||
}
|
}
|
||||||
ss << value;
|
ss << value;
|
||||||
sValue.append(QString::fromStdString(ss.str()));
|
sValue.append(QString::fromStdString(ss.str()));
|
||||||
|
if(!unit.isEmpty() && !unit.startsWith(' ')) {
|
||||||
|
// add space between number and unit
|
||||||
|
sValue.append(' ');
|
||||||
|
}
|
||||||
sValue.append(prefixes[prefixIndex]);
|
sValue.append(prefixes[prefixIndex]);
|
||||||
}
|
}
|
||||||
sValue.append(unit);
|
sValue.append(unit);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue