win text

Author: aslansq

cantabform/canfdform.cpp

@@ -23,6 +23,10 @@ CanFdForm::CanFdForm(QWidget *parent) :
 	ui->arbitSjwLineEdit->setPlaceholderText(this->config.getArbitSjw());
 	ui->dataSjwLineEdit->setPlaceholderText(this->config.getDataSjw());
 
+#ifdef Q_OS_WIN32
+	ui->devLineEdit->setValidator(this->validatorPtr);
+	ui->devPushButton->setVisible(false);
+#endif
 	ui->clkFreqLineEdit->setValidator(this->validatorPtr);
 	ui->arbitBaudLineEdit->setValidator(this->validatorPtr);
 	ui->dataBaudLineEdit->setValidator(this->validatorPtr);

cantabform/canstdform.cpp

@@ -28,12 +28,18 @@ CanStdForm::CanStdForm(QWidget *parent) :
 	for(const Baud &baudRef : this->availableBaudrates) {
 		ui->baudComboBox->addItem(baudRef.name);
 	}
+	this->validatorPtr = new QIntValidator(this);
+#ifdef Q_OS_WIN32
+	ui->devLineEdit->setValidator(this->validatorPtr);
+	ui->devPushButton->setVisible(false);
+#endif
 	ui->baudComboBox->setCurrentIndex(getIndexOfAvailableBaud(this->config.getBaud().toInt()));
 }
 
 CanStdForm::~CanStdForm()
 {
 	delete ui;
+	delete this->validatorPtr;
 }
 
 const ConfigStd &CanStdForm::getConfig(void)

cantabform/canstdform.h

@@ -2,6 +2,7 @@
 #define CANSTDFORM_H
 
 #include <QWidget>
+#include <QIntValidator>
 #include "config.h"
 
 namespace Ui {
@@ -42,6 +43,7 @@ private slots:
 	};
 
 	Ui::CanStdForm *ui;
+	QIntValidator *validatorPtr;
 	ConfigStd config;
 	QVector<Baud> availableBaudrates;
 	int getIndexOfAvailableBaud(uint64_t baudrate);

logic/config.cpp

@@ -154,7 +154,11 @@ ConfigFd::ConfigFd(QObject *parent):
 		parent,
 		CmdDef::typeNames[CmdDef::Type::CanFdCfg],
 		{
+#ifdef Q_OS_WIN32
+			{ CmdDef::devFd.name     , "1" },
+#else
 			{ CmdDef::devFd.name     , "/dev/pcanusbfd32" },
+#endif
 			{ CmdDef::clkFreqMHz.name, "80" },
 			{ CmdDef::arbitBaud.name , "500000" },
 			{ CmdDef::dataBaud.name  , "2000000" },
@@ -309,7 +313,11 @@ ConfigStd::ConfigStd(QObject *parent):
 		parent,
 		CmdDef::typeNames[CmdDef::Type::CanStdCfg],
 		{
+#ifdef Q_OS_WIN32
+			{ CmdDef::devFd.name     , "1" },
+#else
 			{ CmdDef::devStd.name, "/dev/pcanusb32" },
+#endif
 			{ CmdDef::baud.name, "500000" }
 		}
 	)

logic/peak/peakfdcan.cpp

@@ -24,8 +24,11 @@ void PeakFdCan::connect(const void * configPtr)
 		Util::log(LogType::CmdRespThrow, LogSt::Nok, "Peak fd config pointer is null");
 	}
 
+#ifdef Q_OS_WIN32
+	this->pcanHandle = getPeakHandleId(configFdPtr->getDev().toInt());
+#else
 	this->pcanHandle = getPeakHandleId(configFdPtr->getDev());
-
+#endif
 	this->pcanConfigStr =
 		QString("f_clock_mhz=%1, ").arg(this->configFdPtr->getClkFreq()) +
 		QString("nom_bitrate=%1, ").arg(this->configFdPtr->getArbitBaud()) +

logic/peak/peakstdcan.cpp

@@ -25,7 +25,12 @@ void PeakStdCan::connect(const void *configPtr)
 	}
 
 	dev = this->configStdPtr->getDev();
+
+#ifdef Q_OS_WIN32
+	this->pcanHandle = getPeakHandleId(dev.toInt());
+#else
 	this->pcanHandle = getPeakHandleId(dev);
+#endif
 
 	if(this->pcanHandle == this->invalidPcanHandle) {
 		Util::log(LogType::CmdRespThrow, LogSt::Nok, CmdDef::connect, "on", QString("Invalid device %1!").arg(dev));

mainwindow.cpp

@@ -39,7 +39,7 @@ MainWindow::MainWindow(QWidget *parent, Cli &cliRef)
 	connect(ui->actionAbout, &QAction::triggered, this, &MainWindow::onAboutAction);
 
 	QString lastProjectPath = settings.value("lastProjectPath", "").toString();
-	if (!lastProjectPath.isEmpty()) {
+	if ((!lastProjectPath.isEmpty()) && QFile::exists(lastProjectPath)) {
 		this->prjFilePath = QFileInfo(lastProjectPath);
 		this->cliRef.commandMapWThrow({{CmdDef::loadConfig.name, this->prjFilePath.absoluteFilePath()}});
 	}