Format all files
This commit is contained in:
@@ -44,7 +44,7 @@
|
||||
#include <QRegularExpression>
|
||||
#include <optional>
|
||||
|
||||
SimulationDialog::SimulationDialog(QWidget *parent) : QWidget(parent), ui(new Ui::SimulationDialog)
|
||||
SimulationDialog::SimulationDialog(QWidget* parent) : QWidget(parent), ui(new Ui::SimulationDialog)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
@@ -76,15 +76,15 @@ SimulationDialog::SimulationDialog(QWidget *parent) : QWidget(parent), ui(new Ui
|
||||
|
||||
void SimulationDialog::on_browseDramSysButton_clicked()
|
||||
{
|
||||
QString fileName =
|
||||
QFileDialog::getOpenFileName(this, ui->browseDramSysButton->text(), {}, "DRAMSys executable (*)");
|
||||
QString fileName = QFileDialog::getOpenFileName(
|
||||
this, ui->browseDramSysButton->text(), {}, "DRAMSys executable (*)");
|
||||
ui->dramSysPath->setText(fileName);
|
||||
}
|
||||
|
||||
void SimulationDialog::on_browseConfigButton_clicked()
|
||||
{
|
||||
QString fileName =
|
||||
QFileDialog::getOpenFileName(this, ui->browseConfigButton->text(), {}, "Configuration file (*.json)");
|
||||
QString fileName = QFileDialog::getOpenFileName(
|
||||
this, ui->browseConfigButton->text(), {}, "Configuration file (*.json)");
|
||||
ui->jsonPath->setText(fileName);
|
||||
|
||||
loadConfigurationFromPath();
|
||||
@@ -100,7 +100,8 @@ void SimulationDialog::on_browseOutputButton_clicked()
|
||||
|
||||
void SimulationDialog::on_browseResourceDirButton_clicked()
|
||||
{
|
||||
QString fileName = QFileDialog::getExistingDirectory(this, ui->browseResourceDirButton->text(), {});
|
||||
QString fileName =
|
||||
QFileDialog::getExistingDirectory(this, ui->browseResourceDirButton->text(), {});
|
||||
ui->resourceDirLineEdit->setText(fileName);
|
||||
|
||||
loadConfigurationFromPath();
|
||||
@@ -119,7 +120,9 @@ void SimulationDialog::on_simulateButton_clicked()
|
||||
// Spawn the DRAMSys process
|
||||
simulatorProcess = new QProcess(this);
|
||||
|
||||
QObject::connect(simulatorProcess, &QIODevice::readyRead, this,
|
||||
QObject::connect(simulatorProcess,
|
||||
&QIODevice::readyRead,
|
||||
this,
|
||||
[=]
|
||||
{
|
||||
QByteArray msg = simulatorProcess->read(4096);
|
||||
@@ -127,7 +130,9 @@ void SimulationDialog::on_simulateButton_clicked()
|
||||
processMessage(msg.toStdString());
|
||||
});
|
||||
|
||||
QObject::connect(simulatorProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this,
|
||||
QObject::connect(simulatorProcess,
|
||||
QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
|
||||
this,
|
||||
[=](int exitCode, QProcess::ExitStatus exitStatus)
|
||||
{
|
||||
Q_UNUSED(exitStatus)
|
||||
@@ -192,7 +197,7 @@ void SimulationDialog::showStopButton(bool val)
|
||||
ui->stopButton->setVisible(val);
|
||||
}
|
||||
|
||||
void SimulationDialog::saveConfiguration(QFile &file)
|
||||
void SimulationDialog::saveConfiguration(QFile& file)
|
||||
{
|
||||
if (!file.open(QIODevice::ReadWrite | QIODevice::Text))
|
||||
return;
|
||||
@@ -221,7 +226,7 @@ void SimulationDialog::saveConfiguration(QFile &file)
|
||||
out << dump.c_str();
|
||||
}
|
||||
|
||||
void SimulationDialog::processMessage(const std::string &msg)
|
||||
void SimulationDialog::processMessage(const std::string& msg)
|
||||
{
|
||||
// Get percentages
|
||||
QRegularExpression re("(\\d+(\\.\\d+)?|\\.\\d+) ?%");
|
||||
@@ -252,15 +257,17 @@ void SimulationDialog::loadConfigurationFromTextFields()
|
||||
|
||||
try
|
||||
{
|
||||
nlohmann::json::parse(ui->addressMappingTextEdit->toPlainText().toStdString()).get_to(addressMapping);
|
||||
nlohmann::json::parse(ui->addressMappingTextEdit->toPlainText().toStdString())
|
||||
.get_to(addressMapping);
|
||||
nlohmann::json::parse(ui->mcConfigTextEdit->toPlainText().toStdString()).get_to(mcConfig);
|
||||
nlohmann::json::parse(ui->memSpecTextEdit->toPlainText().toStdString()).get_to(memSpec);
|
||||
nlohmann::json::parse(ui->simConfigTextEdit->toPlainText().toStdString()).get_to(simConfig);
|
||||
|
||||
if (!ui->traceSetupTextEdit->toPlainText().toStdString().empty())
|
||||
nlohmann::json::parse(ui->traceSetupTextEdit->toPlainText().toStdString()).get_to(traceSetup);
|
||||
nlohmann::json::parse(ui->traceSetupTextEdit->toPlainText().toStdString())
|
||||
.get_to(traceSetup);
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
qWarning() << "Error while parsing json:" << e.what();
|
||||
return;
|
||||
@@ -272,8 +279,7 @@ void SimulationDialog::loadConfigurationFromTextFields()
|
||||
memSpec,
|
||||
simConfig,
|
||||
simulationId,
|
||||
std::make_optional<std::vector<Initiator>>(std::move(traceSetup))
|
||||
};
|
||||
std::make_optional<std::vector<Initiator>>(std::move(traceSetup))};
|
||||
|
||||
loadConfiguration();
|
||||
}
|
||||
@@ -289,7 +295,7 @@ void SimulationDialog::loadConfigurationFromPath()
|
||||
{
|
||||
configuration = DRAMSys::Config::from_path(ui->jsonPath->text().toStdString());
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
qWarning() << "Error while parsing json:" << e.what();
|
||||
return;
|
||||
@@ -350,7 +356,7 @@ void SimulationDialog::loadTraceSetup()
|
||||
{
|
||||
ui->traceSetupTextEdit->clear();
|
||||
|
||||
if (const auto &traceSetup = configuration.tracesetup)
|
||||
if (const auto& traceSetup = configuration.tracesetup)
|
||||
{
|
||||
std::string dump = nlohmann::json(*traceSetup).dump(4);
|
||||
ui->traceSetupTextEdit->setText(dump.c_str());
|
||||
@@ -372,7 +378,7 @@ QFileInfoList SimulationDialog::getSimulationResults()
|
||||
// Get the path where the tracefiles are located
|
||||
QDir baseDir(ui->outputDirLineEdit->text());
|
||||
|
||||
for (const auto &fileInfo : baseDir.entryInfoList())
|
||||
for (const auto& fileInfo : baseDir.entryInfoList())
|
||||
{
|
||||
if (fileInfo.baseName().startsWith(configuration.simulationid.c_str()))
|
||||
{
|
||||
@@ -387,8 +393,8 @@ QFileInfoList SimulationDialog::getSimulationResults()
|
||||
return list;
|
||||
}
|
||||
|
||||
void SimulationDialog::openSimulationResults(const QFileInfoList &fileInfos)
|
||||
void SimulationDialog::openSimulationResults(const QFileInfoList& fileInfos)
|
||||
{
|
||||
for (const auto &fileInfo : fileInfos)
|
||||
for (const auto& fileInfo : fileInfos)
|
||||
openFileRequested(fileInfo.absoluteFilePath());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user