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

Add setting for graph behavior when trace no longer supported

Browse source
This commit is contained in:
Jan Käberich 2021-07-10 13:12:30 +02:00
parent b45645f04e
commit dda149f3d5
11 changed files with 363 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Software/PC_Application/preferences.h
View file

@ -6,6 +6,15 @@
#include <exception>
#include "Util/qpointervariant.h"
enum GraphDomainChangeBehavior {
RemoveChangedTraces = 0,
AdjustGraphs = 1,
AdjustGrahpsIfOnlyTrace = 2,
};
Q_DECLARE_METATYPE(GraphDomainChangeBehavior);
class Preferences {
public:
static Preferences& getInstance() {
@ -62,16 +71,17 @@ public:
QColor background;
QColor axis;
QColor divisions;
} graphColors;
} Color;
GraphDomainChangeBehavior domainChangeBehavior;
struct {
bool showDataOnGraphs;
bool showAllData;
} markerDefault;
struct {
bool enabled;
int port;
} SCPI;
} General;
} markerBehavior;
} Graphs;
struct {
bool enabled;
int port;
} SCPIServer;
bool TCPoverride; // in case of manual port specification via command line
private:
@ -83,7 +93,7 @@ private:
QString name;
QVariant def;
};
const std::array<SettingDescription, 34> descr = {{
const std::array<SettingDescription, 35> descr = {{
{&Startup.ConnectToFirstDevice, "Startup.ConnectToFirstDevice", true},
{&Startup.RememberSweepSettings, "Startup.RememberSweepSettings", false},
{&Startup.DefaultSweep.type, "Startup.DefaultSweep.type", "Frequency"},
@ -111,13 +121,14 @@ private:
{&Acquisition.harmonicMixing, "Acquisition.harmonicMixing", false},
{&Acquisition.useDFTinSAmode, "Acquisition.useDFTinSAmode", true},
{&Acquisition.RBWLimitForDFT, "Acquisition.RBWLimitForDFT", 3000.0},
{&General.graphColors.background, "General.graphColors.background", QColor(Qt::black)},
{&General.graphColors.axis, "General.graphColors.axis", QColor(Qt::white)},
{&General.graphColors.divisions, "General.graphColors.divisions", QColor(Qt::gray)},
{&General.markerDefault.showDataOnGraphs, "General.MarkerDefault.ShowDataOnGraphs", true},
{&General.markerDefault.showAllData, "General.MarkerDefault.ShowAllData", false},
{&General.SCPI.enabled, "General.SCPI.enabled", true},
{&General.SCPI.port, "General.SCPI.port", 19542},
{&Graphs.Color.background, "Graphs.Color.background", QColor(Qt::black)},
{&Graphs.Color.axis, "Graphs.Color.axis", QColor(Qt::white)},
{&Graphs.Color.divisions, "Graphs.Color.divisions", QColor(Qt::gray)},
{&Graphs.domainChangeBehavior, "Graphs.domainChangeBehavior", GraphDomainChangeBehavior::AdjustGraphs},
{&Graphs.markerBehavior.showDataOnGraphs, "Graphs.markerBehavior.ShowDataOnGraphs", true},
{&Graphs.markerBehavior.showAllData, "Graphs.markerBehavior.ShowAllData", false},
{&SCPIServer.enabled, "SCPIServer.enabled", true},
{&SCPIServer.port, "SCPIServer.port", 19542},
}};
};