Skip to content

Commit c4d4c84

Browse files
committed
win text
1 parent ccf3909 commit c4d4c84

7 files changed

Lines changed: 30 additions & 2 deletions

File tree

cantabform/canfdform.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ CanFdForm::CanFdForm(QWidget *parent) :
2323
ui->arbitSjwLineEdit->setPlaceholderText(this->config.getArbitSjw());
2424
ui->dataSjwLineEdit->setPlaceholderText(this->config.getDataSjw());
2525

26+
#ifdef Q_OS_WIN32
27+
ui->devLineEdit->setValidator(this->validatorPtr);
28+
ui->devPushButton->setVisible(false);
29+
#endif
2630
ui->clkFreqLineEdit->setValidator(this->validatorPtr);
2731
ui->arbitBaudLineEdit->setValidator(this->validatorPtr);
2832
ui->dataBaudLineEdit->setValidator(this->validatorPtr);

cantabform/canstdform.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,18 @@ CanStdForm::CanStdForm(QWidget *parent) :
2828
for(const Baud &baudRef : this->availableBaudrates) {
2929
ui->baudComboBox->addItem(baudRef.name);
3030
}
31+
this->validatorPtr = new QIntValidator(this);
32+
#ifdef Q_OS_WIN32
33+
ui->devLineEdit->setValidator(this->validatorPtr);
34+
ui->devPushButton->setVisible(false);
35+
#endif
3136
ui->baudComboBox->setCurrentIndex(getIndexOfAvailableBaud(this->config.getBaud().toInt()));
3237
}
3338

3439
CanStdForm::~CanStdForm()
3540
{
3641
delete ui;
42+
delete this->validatorPtr;
3743
}
3844

3945
const ConfigStd &CanStdForm::getConfig(void)

cantabform/canstdform.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define CANSTDFORM_H
33

44
#include <QWidget>
5+
#include <QIntValidator>
56
#include "config.h"
67

78
namespace Ui {
@@ -42,6 +43,7 @@ private slots:
4243
};
4344

4445
Ui::CanStdForm *ui;
46+
QIntValidator *validatorPtr;
4547
ConfigStd config;
4648
QVector<Baud> availableBaudrates;
4749
int getIndexOfAvailableBaud(uint64_t baudrate);

logic/config.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,11 @@ ConfigFd::ConfigFd(QObject *parent):
154154
parent,
155155
CmdDef::typeNames[CmdDef::Type::CanFdCfg],
156156
{
157+
#ifdef Q_OS_WIN32
158+
{ CmdDef::devFd.name , "1" },
159+
#else
157160
{ CmdDef::devFd.name , "/dev/pcanusbfd32" },
161+
#endif
158162
{ CmdDef::clkFreqMHz.name, "80" },
159163
{ CmdDef::arbitBaud.name , "500000" },
160164
{ CmdDef::dataBaud.name , "2000000" },
@@ -309,7 +313,11 @@ ConfigStd::ConfigStd(QObject *parent):
309313
parent,
310314
CmdDef::typeNames[CmdDef::Type::CanStdCfg],
311315
{
316+
#ifdef Q_OS_WIN32
317+
{ CmdDef::devFd.name , "1" },
318+
#else
312319
{ CmdDef::devStd.name, "/dev/pcanusb32" },
320+
#endif
313321
{ CmdDef::baud.name, "500000" }
314322
}
315323
)

logic/peak/peakfdcan.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ void PeakFdCan::connect(const void * configPtr)
2424
Util::log(LogType::CmdRespThrow, LogSt::Nok, "Peak fd config pointer is null");
2525
}
2626

27+
#ifdef Q_OS_WIN32
28+
this->pcanHandle = getPeakHandleId(configFdPtr->getDev().toInt());
29+
#else
2730
this->pcanHandle = getPeakHandleId(configFdPtr->getDev());
28-
31+
#endif
2932
this->pcanConfigStr =
3033
QString("f_clock_mhz=%1, ").arg(this->configFdPtr->getClkFreq()) +
3134
QString("nom_bitrate=%1, ").arg(this->configFdPtr->getArbitBaud()) +

logic/peak/peakstdcan.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ void PeakStdCan::connect(const void *configPtr)
2525
}
2626

2727
dev = this->configStdPtr->getDev();
28+
29+
#ifdef Q_OS_WIN32
30+
this->pcanHandle = getPeakHandleId(dev.toInt());
31+
#else
2832
this->pcanHandle = getPeakHandleId(dev);
33+
#endif
2934

3035
if(this->pcanHandle == this->invalidPcanHandle) {
3136
Util::log(LogType::CmdRespThrow, LogSt::Nok, CmdDef::connect, "on", QString("Invalid device %1!").arg(dev));

mainwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ MainWindow::MainWindow(QWidget *parent, Cli &cliRef)
3939
connect(ui->actionAbout, &QAction::triggered, this, &MainWindow::onAboutAction);
4040

4141
QString lastProjectPath = settings.value("lastProjectPath", "").toString();
42-
if (!lastProjectPath.isEmpty()) {
42+
if ((!lastProjectPath.isEmpty()) && QFile::exists(lastProjectPath)) {
4343
this->prjFilePath = QFileInfo(lastProjectPath);
4444
this->cliRef.commandMapWThrow({{CmdDef::loadConfig.name, this->prjFilePath.absoluteFilePath()}});
4545
}

0 commit comments

Comments
 (0)