mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Standard QSettings fixes Windows calibration issue

This commit is contained in:
Chris Esposito 2019-04-01 20:00:37 +11:00
parent cea118a00d
commit 5cc7c9425d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Desktop_Interface/mainwindow.cpp
View File

@ -18,12 +18,17 @@ namespace
"Git hash: <a href='https://github.com/EspoTek/Labrador/commits/" GIT_HASH_SHORT "'>" GIT_HASH_SHORT "</a><br>"\
"Website: <a href='http://espotek.com'>https://espotek.com</a><br>"\
"Contact email: <a href='mailto:admin@espotek.com'>admin@espotek.com</a>";
constexpr char kOrganisationName[] = "EspoTek";
constexpr char kApplicationName[] = "Labrador";
}
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
{
QCoreApplication::setOrganizationName(kOrganisationName);
QCoreApplication::setApplicationName(kApplicationName);
ui->setupUi(this);
calibrationMessages = new QMessageBox();
@ -1206,7 +1211,7 @@ void MainWindow::helloWorld(){
#define QSETTINGS_DEFAULT_RETURN 42069
void MainWindow::readSettingsFile(){
settings = new QSettings("settings.ini", QSettings::IniFormat);
settings = new QSettings();
int connectionType = settings->value("ConnectionType", QSETTINGS_DEFAULT_RETURN).toInt();
double calibrate_vref_ch1 = settings->value("CalibrateVrefCH1", 1.65).toDouble();
double calibrate_vref_ch2 = settings->value("CalibrateVrefCH2", 1.65).toDouble();