jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-06 15:04:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Jan Käberich 2022-08-21 13:03:19 +02:00
commit 33726a815a
5 changed files with 239 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Software/PC_Application/CustomWidgets/tilewidget.cpp
View file

@ -136,6 +136,7 @@ void TileWidget::splitVertically(bool moveContentToSecondChild)
isSplit = true;
splitter = new QSplitter(Qt::Vertical);
split(moveContentToSecondChild);
tryMinimize();
}
void TileWidget::splitHorizontally(bool moveContentToSecondChild)
@ -146,6 +147,7 @@ void TileWidget::splitHorizontally(bool moveContentToSecondChild)
isSplit = true;
splitter = new QSplitter(Qt::Horizontal);
split(moveContentToSecondChild);
tryMinimize();
}
void TileWidget::closeTile()
@ -300,16 +302,21 @@ void TileWidget::on_bXYplot_clicked()
}
void TileWidget::plotDeleted()
{
tryMinimize();
ui->stack->setCurrentWidget(ui->TilePage);
hasContent = false;
content = nullptr;
}
void TileWidget::tryMinimize()
{
if (isFullScreen)
{
auto rootTile = findRootTile();
rootTile->ui->stack->setCurrentWidget(rootTile->ui->ContentPage);
}
ui->stack->setCurrentWidget(ui->TilePage);
hasContent = false;
content = nullptr;
}
void TileWidget::on_bWaterfall_clicked()
@ -321,4 +328,3 @@ void TileWidget::on_bPolarchart_clicked()
{
setContent(new TracePolarChart(model));
}

1
Software/PC_Application/CustomWidgets/tilewidget.h
View file

@ -55,6 +55,7 @@ private:
void setChild();
TileWidget* findRootTile();
void setFullScreen();
void tryMinimize();
TracePlot *fullScreenPlot;
Ui::TileWidget *ui;
QSplitter *splitter;

4
Software/PC_Application/Traces/tracesmithchart.cpp
View file

@ -80,6 +80,7 @@ void TraceSmithChart::axisSetupDialog()
connect(ui->buttonBox, &QDialogButtonBox::accepted, [=](){
limitToSpan = ui->displayModeFreq->currentIndex() == 1;
limitToEdge = ui->displayModeImp->currentIndex() == 1;
updateContextMenu();
triggerReplot();
});
connect(ui->zoomFactor, &SIUnitEdit::valueChanged, [=](){
@ -100,6 +101,8 @@ void TraceSmithChart::axisSetupDialog()
checkIfStillSupported(t.first);
}
}
// depending on the preferences, the Z0 value may have been changed to match the active traces,
// overwrite again without causing an additional signal
ui->impedance->setValueQuiet(Z0);
});
connect(ui->lineTable, &QTableView::clicked, [=](const QModelIndex &index){
@ -158,6 +161,7 @@ bool TraceSmithChart::configureForTrace(Trace *t)
enableTrace(t.first, false);
}
}
updateContextMenu();
return true;
}
return false;