SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1133 from andresmmera/SPAR_Viewer_Improvements

Browse Source 
S-parameter Viewer: Some improvements
This commit is contained in:
Vadim Kuznetsov 2024-12-16 15:49:29 +01:00 committed by GitHub
commit b0523fa392
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 549 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qucs-s-spar-viewer/CMakeLists.txt
View File

@ -79,9 +79,9 @@ ADD_DEFINITIONS(${QT_DEFINITIONS})
#ADD_SUBDIRECTORY( bitmaps ) -> added as resources
SET( spar_viewer_sources main.cpp qucs-s-spar-viewer.cpp)
SET( spar_viewer_sources main.cpp qucs-s-spar-viewer.cpp codeeditor.cpp)
SET( spar_viewer_moc_headers qucs-s-spar-viewer.h)
SET( spar_viewer_moc_headers qucs-s-spar-viewer.h codeeditor.h)
SET(RESOURCES qucs-s-spar-viewer.qrc)
@ -114,7 +114,9 @@ ENDIF(APPLE)
ADD_EXECUTABLE( ${QUCS_NAME}spar-viewer MACOSX_BUNDLE WIN32
${spar_viewer_sources}
${spar_viewer_moc_sources}
${RESOURCES_SRCS} )
${RESOURCES_SRCS}
codeeditor.cpp
codeeditor.h )
TARGET_LINK_LIBRARIES( ${QUCS_NAME}spar-viewer Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Charts )
SET_TARGET_PROPERTIES(${QUCS_NAME}spar-viewer PROPERTIES POSITION_INDEPENDENT_CODE TRUE)

187
qucs-s-spar-viewer/codeeditor.cpp Normal file
View File

@ -0,0 +1,187 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "codeeditor.h"
#include <QPainter>
#include <QTextBlock>
//![constructor]
CodeEditor::CodeEditor(QWidget *parent) : QPlainTextEdit(parent)
{
lineNumberArea = new LineNumberArea(this);
connect(this, &CodeEditor::blockCountChanged, this, &CodeEditor::updateLineNumberAreaWidth);
connect(this, &CodeEditor::updateRequest, this, &CodeEditor::updateLineNumberArea);
connect(this, &CodeEditor::cursorPositionChanged, this, &CodeEditor::highlightCurrentLine);
updateLineNumberAreaWidth(0);
highlightCurrentLine();
}
//![constructor]
//![extraAreaWidth]
int CodeEditor::lineNumberAreaWidth()
{
int digits = 1;
int max = qMax(1, blockCount());
while (max >= 10) {
max /= 10;
++digits;
}
int space = 3 + fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits;
return space;
}
//![extraAreaWidth]
//![slotUpdateExtraAreaWidth]
void CodeEditor::updateLineNumberAreaWidth(int /* newBlockCount */)
{
setViewportMargins(lineNumberAreaWidth(), 0, 0, 0);
}
//![slotUpdateExtraAreaWidth]
//![slotUpdateRequest]
void CodeEditor::updateLineNumberArea(const QRect &rect, int dy)
{
if (dy){
lineNumberArea->scroll(0, dy);
} else
lineNumberArea->update(0, rect.y(), lineNumberArea->width(), rect.height());
if (rect.contains(viewport()->rect())){
updateLineNumberAreaWidth(0);
}
}
//![slotUpdateRequest]
//![resizeEvent]
void CodeEditor::resizeEvent(QResizeEvent *e)
{
QPlainTextEdit::resizeEvent(e);
QRect cr = contentsRect();
lineNumberArea->setGeometry(QRect(cr.left(), cr.top(), lineNumberAreaWidth(), cr.height()));
}
//![resizeEvent]
//![cursorPositionChanged]
void CodeEditor::highlightCurrentLine()
{
QList<QTextEdit::ExtraSelection> extraSelections;
if (!isReadOnly()) {
QTextEdit::ExtraSelection selection;
QColor lineColor = QColor(Qt::yellow).lighter(160);
selection.format.setBackground(lineColor);
selection.format.setProperty(QTextFormat::FullWidthSelection, true);
selection.cursor = textCursor();
selection.cursor.clearSelection();
extraSelections.append(selection);
}
setExtraSelections(extraSelections);
}
//![cursorPositionChanged]
//![extraAreaPaintEvent_0]
void CodeEditor::lineNumberAreaPaintEvent(QPaintEvent *event)
{
QPainter painter(lineNumberArea);
painter.fillRect(event->rect(), Qt::lightGray);
//![extraAreaPaintEvent_0]
//![extraAreaPaintEvent_1]
QTextBlock block = firstVisibleBlock();
int blockNumber = block.blockNumber();
int top = qRound(blockBoundingGeometry(block).translated(contentOffset()).top());
int bottom = top + qRound(blockBoundingRect(block).height());
//![extraAreaPaintEvent_1]
//![extraAreaPaintEvent_2]
while (block.isValid() && top <= event->rect().bottom()) {
if (block.isVisible() && bottom >= event->rect().top()) {
QString number = QString::number(blockNumber + 1);
painter.setPen(Qt::black);
painter.drawText(0, top, lineNumberArea->width(), fontMetrics().height(),
Qt::AlignRight, number);
}
block = block.next();
top = bottom;
bottom = top + qRound(blockBoundingRect(block).height());
++blockNumber;
}
}
void CodeEditor::loadText(const QString& text)
{
setPlainText(text);
}
//![extraAreaPaintEvent_2]

119
qucs-s-spar-viewer/codeeditor.h Normal file
View File

@ -0,0 +1,119 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef CODEEDITOR_H
#define CODEEDITOR_H
#include <QPlainTextEdit>
QT_BEGIN_NAMESPACE
class QPaintEvent;
class QResizeEvent;
class QSize;
class QWidget;
QT_END_NAMESPACE
class LineNumberArea;
//![codeeditordefinition]
class CodeEditor : public QPlainTextEdit
{
Q_OBJECT
public:
CodeEditor(QWidget *parent = nullptr);
void lineNumberAreaPaintEvent(QPaintEvent *event);
int lineNumberAreaWidth();
QString getText() const { return toPlainText(); }
void loadText(const QString& text);
protected:
void resizeEvent(QResizeEvent *event) override;
private slots:
void updateLineNumberAreaWidth(int newBlockCount);
void highlightCurrentLine();
void updateLineNumberArea(const QRect &rect, int dy);
private:
QWidget *lineNumberArea;
};
//![codeeditordefinition]
//![extraarea]
class LineNumberArea : public QWidget
{
public:
LineNumberArea(CodeEditor *editor) : QWidget(editor), codeEditor(editor)
{}
QSize sizeHint() const override
{
return QSize(codeEditor->lineNumberAreaWidth(), 0);
}
protected:
void paintEvent(QPaintEvent *event) override
{
codeEditor->lineNumberAreaPaintEvent(event);
}
private:
CodeEditor *codeEditor;
};
//![extraarea]
#endif

273
qucs-s-spar-viewer/qucs-s-spar-viewer.cpp
View File

@ -27,7 +27,6 @@
#include "qucs-s-spar-viewer.h"
#include <QPixmap>
#include <QVBoxLayout>
#include <QHBoxLayout>
@ -75,6 +74,10 @@ Qucs_S_SPAR_Viewer::Qucs_S_SPAR_Viewer()
fileMenu->addAction(fileOpenSession);
fileMenu->addAction(fileSaveSession);
fileMenu->addAction(fileSaveAsSession);
recentFilesMenu = fileMenu->addMenu("Recent Files");
connect(recentFilesMenu, &QMenu::aboutToShow, this, &Qucs_S_SPAR_Viewer::updateRecentFilesMenu);
fileMenu->addAction(fileQuit);
QMenu *helpMenu = new QMenu(tr("&Help"));
@ -495,6 +498,9 @@ Qucs_S_SPAR_Viewer::Qucs_S_SPAR_Viewer()
Limits_VBox->addWidget(LimitSettings);
Limits_VBox->addWidget(scrollArea_Limits);
// Notes
Notes_Widget = new CodeEditor();
dockFiles = new QDockWidget("S-parameter files", this);
@ -502,6 +508,7 @@ Qucs_S_SPAR_Viewer::Qucs_S_SPAR_Viewer()
dockTracesList = new QDockWidget("Traces List", this);
dockMarkers = new QDockWidget("Markers", this);
dockLimits = new QDockWidget("Limits", this);
dockNotes = new QDockWidget("Notes", this);
// Disable dock closing
dockChart->setFeatures(dockChart->features() & ~QDockWidget::DockWidgetClosable);
@ -510,23 +517,27 @@ Qucs_S_SPAR_Viewer::Qucs_S_SPAR_Viewer()
dockTracesList->setFeatures(dockTracesList->features() & ~QDockWidget::DockWidgetClosable);
dockMarkers->setFeatures(dockMarkers->features() & ~QDockWidget::DockWidgetClosable);
dockLimits->setFeatures(dockLimits->features() & ~QDockWidget::DockWidgetClosable);
dockNotes->setFeatures(dockLimits->features() & ~QDockWidget::DockWidgetClosable);
dockAxisSettings->setWidget(SettingsGroup);
dockTracesList->setWidget(TracesGroup);
dockFiles->setWidget(FilesGroup);
dockMarkers->setWidget(MarkersGroup);
dockLimits->setWidget(LimitsGroup);
dockNotes->setWidget(Notes_Widget);
addDockWidget(Qt::RightDockWidgetArea, dockAxisSettings);
addDockWidget(Qt::RightDockWidgetArea, dockTracesList);
addDockWidget(Qt::RightDockWidgetArea, dockFiles);
addDockWidget(Qt::RightDockWidgetArea, dockMarkers);
addDockWidget(Qt::RightDockWidgetArea, dockLimits);
addDockWidget(Qt::RightDockWidgetArea, dockNotes);
splitDockWidget(dockTracesList, dockAxisSettings, Qt::Vertical);
tabifyDockWidget(dockFiles, dockTracesList);
tabifyDockWidget(dockTracesList, dockMarkers);
tabifyDockWidget(dockMarkers, dockLimits);
tabifyDockWidget(dockMarkers, dockNotes);
dockFiles->raise();
setDockNestingEnabled(true);
@ -535,10 +546,13 @@ Qucs_S_SPAR_Viewer::Qucs_S_SPAR_Viewer()
dockAxisSettings->setFixedHeight(minHeight);
setAcceptDrops(true);//Enable drag and drop feature to open files
loadRecentFiles();// Load "Recent Files" list
}
Qucs_S_SPAR_Viewer::~Qucs_S_SPAR_Viewer()
{
QSettings settings;
settings.setValue("recentFiles", QVariant::fromValue(recentFiles));
}
void Qucs_S_SPAR_Viewer::slotHelpIntro()
@ -784,56 +798,37 @@ void Qucs_S_SPAR_Viewer::addFiles(QStringList fileNames)
double s11_im = file_data["S11_im"].last();
std::complex<double> s11 (s11_re, s11_im);
// Calculate Zin and Zout
std::complex<double> Zin = Z0 * (1.0 + s11) / (1.0 - s11);
file_data["Re{Zin}"].append(Zin.real()); // Re{Zin}
file_data["Im{Zin}"].append(Zin.imag()); // Im{Zin}
// Optional traces. They are not computed now, but only if the user wants to display them
QStringList optional_traces;
optional_traces.append("Re{Zin}");
optional_traces.append("Im{Zin}");
for (int i = 0; i < optional_traces.size(); i++) {
if (!file_data.contains(optional_traces[i])) {
// If not, create an empty list
file_data[optional_traces[i]] = QList<double>();
}
}
}
if (number_of_ports == 2){
// Compute delta, K, mus, mup, MAG and MSG
double s11_re = file_data["S11_re"].last();
double s11_im = file_data["S11_im"].last();
double s12_re = file_data["S12_re"].last();
double s12_im = file_data["S12_im"].last();
double s21_re = file_data["S21_re"].last();
double s21_im = file_data["S21_im"].last();
double s22_re = file_data["S22_re"].last();
double s22_im = file_data["S22_im"].last();
std::complex<double> s11 (s11_re, s11_im);
std::complex<double> s11_conj (s11_re, -s11_im);
std::complex<double> s12 (s12_re, s12_im);
std::complex<double> s21 (s21_re, s21_im);
std::complex<double> s22 (s22_re, s22_im);
std::complex<double> s22_conj (s22_re, -s22_im);
double delta = abs(s11*s22 - s12*s21); // Determinant of the S matrix
double K = (1 - abs(s11)*abs(s11) - abs(s22)*abs(s22) + delta*delta) / (2*abs(s12*s21)); // Rollet factor.
double mu = (1 - abs(s11)*abs(s11)) / (abs(s22-delta*s11_conj) + abs(s12*s21));
double mu_p = (1 - abs(s22)*abs(s22)) / (abs(s11-delta*s22_conj) + abs(s12*s21));
double MSG = abs(s21) / abs(s12);
double MAG = MSG * (K - std::sqrt(K * K - 1));
// Calculate Zin and Zout
std::complex<double> Zin = std::complex<double>(Z0) * (1.0 + s11) / (1.0 - s11);
std::complex<double> Zout = std::complex<double>(Z0) * (1.0 + s22) / (1.0 - s22);
// Convert MSG and MAG to dB scale
MSG = 10*log10(MSG);
MAG = 10*log10(abs(MAG));
file_data["delta"].append(delta); //delta
file_data["K"].append(delta); //K
file_data["mu"].append(mu); //mu
file_data["mu_p"].append(mu_p); //mu_p
file_data["MSG"].append(MSG); //MSG
file_data["MAG"].append(MAG); //MAG
file_data["Re{Zin}"].append(Zin.real()); // Re{Zin}
file_data["Im{Zin}"].append(Zin.imag()); // Im{Zin}
file_data["Re{Zout}"].append(Zout.real()); // Re{Zout}
file_data["Im{Zout}"].append(Zout.imag()); // Im{Zout}
// Optional traces. They are not computed now, but only if the user wants to display them
QStringList optional_traces;
optional_traces.append("delta");
optional_traces.append("K");
optional_traces.append("mu");
optional_traces.append("mu_p");
optional_traces.append("MSG");
optional_traces.append("MAG");
optional_traces.append("Re{Zin}");
optional_traces.append("Im{Zin}");
optional_traces.append("Re{Zout}");
optional_traces.append("Im{Zout}");
for (int i = 0; i < optional_traces.size(); i++) {
if (!file_data.contains(optional_traces[i])) {
// If not, create an empty list
file_data[optional_traces[i]] = QList<double>();
}
}
}
}
// 3) Add data to the dataset
@ -1238,6 +1233,28 @@ void Qucs_S_SPAR_Viewer::addTrace(QString selected_dataset, QString selected_tra
List_Trace_LineStyle.append(new_trace_linestyle);
this->TracesGrid->addWidget(new_trace_linestyle, n_trace, 2);
// Capture the pen style to correctly render the trace
Qt::PenStyle pen_style;
if (!trace_style.compare("Solid")) {
pen_style = Qt::SolidLine;
} else {
if (!trace_style.compare("- - - -")) {
pen_style = Qt::DashLine;
} else {
if (!trace_style.compare("·······")) {
pen_style = Qt::DotLine;
} else {
if (!trace_style.compare("-·-·-·-")) {
pen_style = Qt::DashDotLine;
} else {
if (!trace_style.compare("-··-··-")) {
pen_style = Qt::DashDotDotLine;
}
}
}
}
}
// Line width
QSpinBox * new_trace_width = new QSpinBox();
new_trace_width->setObjectName(QStringLiteral("Trace_Width_") + trace_name);
@ -1271,11 +1288,12 @@ void Qucs_S_SPAR_Viewer::addTrace(QString selected_dataset, QString selected_tra
// Color settings
QPen pen;
pen.setColor(trace_color);
pen.setStyle(pen_style);
pen.setWidth(trace_width);
series->setPen(pen);// Apply the pen to the series
chart->addSeries(series);
updatePlot();
}
@ -1596,6 +1614,12 @@ void Qucs_S_SPAR_Viewer::updateTraces()
trace_file = "mu_p";
}
// Check if the trace is empty or not. If empty, it is because the user wants to see K, mu, mu_p, etc. and
// these traces are not calculated at the file load.
if (datasets[data_file][trace_file].isEmpty()){
calculate_Sparameter_trace(data_file, trace_file);
}
// Check the limits of the data in the dataset in order to see if the new settings given by the user
// exceed the limits of the available data
getMinMaxValues(data_file, trace_file, minX_trace, maxX_trace, minY_trace, maxY_trace);
@ -2903,8 +2927,16 @@ bool Qucs_S_SPAR_Viewer::save()
xmlWriter.writeTextElement("lock_status", QString::number(lock_axis));
xmlWriter.writeEndElement(); // Axes
// ----------------------------------------------------------------
// Save notes
xmlWriter.writeStartElement("NOTES");
xmlWriter.writeTextElement("note", Notes_Widget->getText());
xmlWriter.writeEndElement();
// ----------------------------------------------------------------
// Save the datasets
// Only S-parameter data is saved. This is done to minimize the size of the session file.
xmlWriter.writeStartElement("DATASETS");
for (auto outerIt = datasets.constBegin(); outerIt != datasets.constEnd(); ++outerIt)
{
@ -2914,8 +2946,27 @@ bool Qucs_S_SPAR_Viewer::save()
const QMap<QString, QList<double>>& innerMap = outerIt.value();
for (auto innerIt = innerMap.constBegin(); innerIt != innerMap.constEnd(); ++innerIt)
{
QString trace_name = innerIt.key();
QStringList blacklist;
blacklist.append("K");
blacklist.append("mu");
blacklist.append("mu_p");
blacklist.append("delta");
blacklist.append("MAG");
blacklist.append("MSG");
blacklist.append("Re{Zin}");
blacklist.append("Im{Zin}");
blacklist.append("Re{Zout}");
blacklist.append("Im{Zout}");
if (blacklist.contains(trace_name)){
// Zin, Zout, K, mu, etc. traces are discarded
continue;
}
// Only S (Re/Im ang dB/ang) traces here
xmlWriter.writeStartElement("trace");
xmlWriter.writeAttribute("trace_name", innerIt.key());
xmlWriter.writeAttribute("trace_name", trace_name);
const QList<double>& values = innerIt.value();
for (const double& value : values)
@ -2932,7 +2983,6 @@ bool Qucs_S_SPAR_Viewer::save()
xmlWriter.writeEndElement(); // Datasets
// ----------------------------------------------------------------
xmlWriter.writeEndElement(); // Top level
xmlWriter.writeEndDocument();
@ -2963,6 +3013,8 @@ void Qucs_S_SPAR_Viewer::loadSession(QString session_file)
savepath = session_file;
addRecentFile(session_file);// Add it to the "Recent Files" list
QXmlStreamReader xml(&file);
// Trace properties
@ -2990,7 +3042,7 @@ void Qucs_S_SPAR_Viewer::loadSession(QString session_file)
// Read next element
QXmlStreamReader::TokenType token = xml.readNext();
// If token is StartElement, check element name
//qDebug() << xml.name().toString();
if (token == QXmlStreamReader::StartElement) {
if (xml.name() == QStringLiteral("trace")) {
while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == QStringLiteral("trace"))) {
@ -3083,6 +3135,9 @@ void Qucs_S_SPAR_Viewer::loadSession(QString session_file)
}
xml.readNext();
}
} else if (xml.name().toString().contains("note")){
QString note = xml.readElementText();
Notes_Widget->loadText(note);
}
}
}
@ -3233,3 +3288,117 @@ void Qucs_S_SPAR_Viewer::updateGridLayout(QGridLayout* layout)
}
}
// Add session file to the recent files list
void Qucs_S_SPAR_Viewer::addRecentFile(const QString& filePath) {
recentFiles.insert(recentFiles.begin(), filePath);
recentFiles.erase(std::unique(recentFiles.begin(), recentFiles.end()), recentFiles.end());
if (recentFiles.size() > 10) {
recentFiles.resize(10);
}
}
// This function updates teh "Recent Files" list whenever the user hovers the mouse over the menu
void Qucs_S_SPAR_Viewer::updateRecentFilesMenu() {
recentFilesMenu->clear();
for (const auto& filePath : recentFiles) {
QAction* action = recentFilesMenu->addAction(filePath);
connect(action, &QAction::triggered, this, [this, filePath]() {
loadSession(filePath);
});
}
recentFilesMenu->addSeparator();
recentFilesMenu->addAction("Clear Recent Files", this, &Qucs_S_SPAR_Viewer::clearRecentFiles);
}
void Qucs_S_SPAR_Viewer::clearRecentFiles() {
recentFiles.clear();
}
// Save "Recent Files" list. This is called when the program is about to close
void Qucs_S_SPAR_Viewer::saveRecentFiles() {
QSettings settings;
settings.setValue("recentFiles", QVariant::fromValue(recentFiles));
}
// Load "Recent Files" list. This is called when the program starts up
void Qucs_S_SPAR_Viewer::loadRecentFiles() {
QSettings settings;
recentFiles = settings.value("recentFiles").value<std::vector<QString>>();
}
// This function is called when the user wants to see a trace which can be calculated from the S-parameters
void Qucs_S_SPAR_Viewer::calculate_Sparameter_trace(QString file, QString metric){
std::complex<double> s11, s12, s21, s22, s11_conj, s22_conj;
double Z0 = datasets[file]["Rn"].last();
for (int i = 0; i < datasets[file]["S11_re"].size(); i++) {
// S-parameter data (n.u.)
double s11_re = datasets[file]["S11_re"][i];
double s11_im = datasets[file]["S11_im"][i];
s11 = std::complex<double>(s11_re, s11_im);
s11_conj = std::complex<double>(s11_re, -s11_im);
if ( datasets[file]["n_ports"].last() == 2) {
double s12_re = datasets[file]["S12_re"][i];
double s12_im = datasets[file]["S12_im"][i];
double s21_re = datasets[file]["S21_re"][i];
double s21_im = datasets[file]["S21_im"][i];
double s22_re = datasets[file]["S22_re"][i];
double s22_im = datasets[file]["S22_im"][i];
s12 = std::complex<double> (s12_re, s12_im);
s21 = std::complex<double> (s21_re, s21_im);
s22 = std::complex<double> (s22_re, s22_im);
s22_conj = std::complex<double> (s22_re, -s22_im);
}
double delta = abs(s11*s22 - s12*s21); // Determinant of the S matrix
if (!metric.compare("delta")) {
datasets[file]["delta"].append(delta);
} else {
if (!metric.compare("K")) {
double K = (1 - abs(s11)*abs(s11) - abs(s22)*abs(s22) + delta*delta) / (2*abs(s12*s21)); // Rollet factor.
datasets[file]["K"].append(K);
} else {
if (!metric.compare("mu")) {
double mu = (1 - abs(s11)*abs(s11)) / (abs(s22-delta*s11_conj) + abs(s12*s21));
datasets[file]["mu"].append(mu);
} else {
if (!metric.compare("mu_p")) {
double mu_p = (1 - abs(s22)*abs(s22)) / (abs(s11-delta*s22_conj) + abs(s12*s21));
datasets[file]["mu_p"].append(mu_p);
} else {
if (!metric.compare("MSG")) {
double MSG = abs(s21) / abs(s12);
MSG = 10*log10(MSG);
datasets[file]["MSG"].append(MSG);
} else {
if (!metric.compare("MSG")) {
double K = (1 - abs(s11)*abs(s11) - abs(s22)*abs(s22) + delta*delta) / (2*abs(s12*s21)); // Rollet factor.
double MSG = abs(s21) / abs(s12);
double MAG = MSG * (K - std::sqrt(K * K - 1));
MAG = 10*log10(abs(MAG));
datasets[file]["MAG"].append(MAG);
} else {
if (metric.contains("Zin")) {
std::complex<double> Zin = std::complex<double>(Z0) * (1.0 + s11) / (1.0 - s11);
datasets[file]["Re{Zin}"].append(Zin.real());
datasets[file]["Im{Zin}"].append(Zin.imag());
} else {
if (metric.contains("Zout")) {
std::complex<double> Zout = std::complex<double>(Z0) * (1.0 + s22) / (1.0 - s22);
datasets[file]["Re{Zout}"].append(Zout.real());
datasets[file]["Im{Zout}"].append(Zout.imag());
}
}
}
}
}
}
}
}
}
}

17
qucs-s-spar-viewer/qucs-s-spar-viewer.h
View File

@ -1,6 +1,8 @@
#ifndef QUCSSPARVIEWER_H
#define QUCSSPARVIEWER_H
#include "codeeditor.h"
#include <QMainWindow>
#include <QLabel>
#include <QCheckBox>
@ -103,6 +105,8 @@ protected:
void updateGridLayout(QGridLayout*);
void calculate_Sparameter_trace(QString, QString);
protected:
void dragEnterEvent(QDragEnterEvent *event) override;
void dropEvent(QDropEvent *event) override;
@ -206,6 +210,19 @@ protected:
bool save();
void loadSession(QString);
// Notes
QDockWidget *dockNotes;
CodeEditor *Notes_Widget;
// Recent files
std::vector<QString> recentFiles;
QMenu* recentFilesMenu;
void updateRecentFilesMenu();
void loadRecentFiles();
void addRecentFile(const QString&);
void clearRecentFiles();
void saveRecentFiles();
// Utilities
void convert_MA_RI_to_dB(double *, double *, double *, double *, QString);
double getFreqScale();