diff --git a/Software/PC_Application/Application.pro b/Software/PC_Application/Application.pro
index 4ad33b6..38badf3 100644
--- a/Software/PC_Application/Application.pro
+++ b/Software/PC_Application/Application.pro
@@ -223,6 +223,8 @@ SOURCES += \
unit.cpp
LIBS += -lusb-1.0
+unix:LIBS += -L/usr/lib/
+win32:LIBS += -L"$$_PRO_FILE_PWD_" # Github actions placed libusb here
QT += widgets
diff --git a/Software/PC_Application/Generator/signalgenwidget.cpp b/Software/PC_Application/Generator/signalgenwidget.cpp
index ac035cc..57623cc 100644
--- a/Software/PC_Application/Generator/signalgenwidget.cpp
+++ b/Software/PC_Application/Generator/signalgenwidget.cpp
@@ -13,6 +13,7 @@ SignalgeneratorWidget::SignalgeneratorWidget(QWidget *parent) :
ui->span->setUnit("Hz");
ui->span->setPrefixes(" kMG");
ui->span->setPrecision(6); // show enough digits
+ ui->span->setValue(0);
ui->current->setUnit("Hz");
ui->current->setPrefixes(" kMG");
@@ -21,10 +22,10 @@ SignalgeneratorWidget::SignalgeneratorWidget(QWidget *parent) :
ui->dwell->setUnit("s");
ui->dwell->setPrefixes(" m");
ui->dwell->setPrecision(6); // show enough digits
- ui->dwell->setValueQuiet(1);
+ ui->dwell->setValue(1);
m_timerId = startTimer(1000);
- ui->steps->setValueQuiet(100);
+ ui->steps->setValue(100);
ui->steps->setPrefixes(" k");
ui->steps->setPrecision(0);
@@ -57,8 +58,9 @@ SignalgeneratorWidget::SignalgeneratorWidget(QWidget *parent) :
ui->frequency->setValueQuiet(ui->span->value()/2);
}
newF = ui->frequency->value() + ui->span->value()/2;
- if (newF > Device::Info().limits_maxFreq)
+ if (newF > Device::Info().limits_maxFreq) {
ui->frequency->setValueQuiet(Device::Info().limits_maxFreq - ui->span->value()/2);
+ }
newval = ui->frequency->value() - ui->span->value()/2;
@@ -76,8 +78,8 @@ SignalgeneratorWidget::SignalgeneratorWidget(QWidget *parent) :
});
connect(ui->dwell, &SIUnitEdit::valueChanged, [=](double newval) {
- if(newval < 0 ) {
- newval = 0;
+ if(newval < 0.01 ) {
+ newval = 0.01;
} else if (newval > 60) {
newval = 60;
}
@@ -102,8 +104,9 @@ SignalgeneratorWidget::SignalgeneratorWidget(QWidget *parent) :
}
emit SettingsChanged();
});
- connect(ui->EnabledSweep, &QCheckBox::clicked, [=](){
- if(ui->EnabledSweep->isChecked()) {
+ connect(ui->EnabledSweep, &QCheckBox::toggled, [=](bool enabled){
+ ui->current->setEnabled(enabled);
+ if(enabled) {
double newF = ui->frequency->value() - ui->span->value()/2;
if (newF < 0) {
ui->frequency->setValueQuiet(ui->frequency->value() - newF);
diff --git a/Software/PC_Application/Generator/signalgenwidget.ui b/Software/PC_Application/Generator/signalgenwidget.ui
index 774803e..a1bfe94 100644
--- a/Software/PC_Application/Generator/signalgenwidget.ui
+++ b/Software/PC_Application/Generator/signalgenwidget.ui
@@ -38,6 +38,19 @@
-
+
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
-
@@ -59,7 +72,7 @@
-
- Frequency:
+ Frequency
-
@@ -148,125 +161,96 @@
Sweep
-
-
-
- 60
- 40
- 133
- 20
-
-
-
- 0MHz
-
-
-
-
-
- 10
- 40
- 47
- 13
-
-
-
- Span:
-
-
-
-
-
- 60
- 70
- 133
- 20
-
-
-
- 100
-
-
-
-
-
- 10
- 70
- 47
- 13
-
-
-
- Steps:
-
-
-
-
-
- 10
- 100
- 47
- 13
-
-
-
- Dwell:
-
-
-
-
-
- 60
- 100
- 133
- 20
-
-
-
- 100ms
-
-
-
-
-
- 60
- 10
- 101
- 17
-
-
-
- Enabled
-
-
-
-
-
- 10
- 130
- 47
- 13
-
-
-
- Current:
-
-
-
-
-
- 60
- 130
- 133
- 20
-
-
-
- 0MHz
-
-
+
+
-
+
+
+ Enabled
+
+
+
+ -
+
+
-
+
+
+ Span:
+
+
+
+ -
+
+
+ 0MHz
+
+
+
+ -
+
+
+ Steps:
+
+
+
+ -
+
+
+ 100
+
+
+
+ -
+
+
+ Dwell time:
+
+
+
+ -
+
+
+ 100ms
+
+
+
+ -
+
+
+ Current frequency:
+
+
+
+ -
+
+
+ false
+
+
+ 0MHz
+
+
+ true
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
-