Skip to content

Fix #12746: Add Misra C++ Version dropBox for gui #6413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olabetskyi merged 4 commits into from
May 22, 2024
Merged

Fix #12746: Add Misra C++ Version dropBox for gui #6413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af4e875
Gui fix
olabetskyi May 20, 2024
32d58aa
Fiix
olabetskyi May 20, 2024
585017d
Fix 2
olabetskyi May 21, 2024
554202d
Fix 3
olabetskyi May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions gui/projectfile.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,11 +869,42 @@
</layout>
</item>
<item>
<widget class="QCheckBox" name="mMisraCpp2008">
<property name="text">
<string>Misra C++ 2008</string>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QCheckBox" name="mMisraCpp">
<property name="text">
<string>Misra C++</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mMisraCppVersion">
<item>
<property name="text">
<string>2008</string>
</property>
</item>
<item>
<property name="text">
<string>2023</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="mCertC2016">
Expand Down
14 changes: 11 additions & 3 deletions gui/projectfiledialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
static constexpr char ADDON_MISRA[] = "misra";
static constexpr char CODING_STANDARD_MISRA_C_2023[] = "misra-c-2023";
static constexpr char CODING_STANDARD_MISRA_CPP_2008[] = "misra-cpp-2008";
static constexpr char CODING_STANDARD_MISRA_CPP_2023[] = "misra-cpp-2023";
static constexpr char CODING_STANDARD_CERT_C[] = "cert-c-2016";
static constexpr char CODING_STANDARD_CERT_CPP[] = "cert-cpp-2016";
static constexpr char CODING_STANDARD_AUTOSAR[] = "autosar";
Expand Down Expand Up @@ -391,17 +392,22 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
mUI->mBtnBrowseMisraFile->setEnabled(false);
}

mUI->mMisraCpp->setEnabled(mPremium);
mUI->mMisraCppVersion->setEnabled(mUI->mMisraCpp->isChecked());
connect(mUI->mMisraCpp, &QCheckBox::toggled, mUI->mMisraCppVersion, &QComboBox::setEnabled);

mUI->mMisraCppVersion->setVisible(mPremium);
mUI->mMisraCppVersion->setCurrentIndex(projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_CPP_2023));

mUI->mCertC2016->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_CERT_C));
mUI->mCertCpp2016->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_CERT_CPP));
mUI->mMisraCpp2008->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_CPP_2008));
mUI->mAutosar->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_AUTOSAR));

if (projectFile->getCertIntPrecision() <= 0)
mUI->mEditCertIntPrecision->setText(QString());
else
mUI->mEditCertIntPrecision->setText(QString::number(projectFile->getCertIntPrecision()));

mUI->mMisraCpp2008->setEnabled(mPremium);
mUI->mCertC2016->setEnabled(mPremium);
mUI->mCertCpp2016->setEnabled(mPremium);
mUI->mAutosar->setEnabled(mPremium);
Expand Down Expand Up @@ -482,8 +488,10 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
codingStandards << CODING_STANDARD_CERT_CPP;
if (mPremium && mUI->mMisraVersion->currentIndex() == 1)
codingStandards << CODING_STANDARD_MISRA_C_2023;
if (mUI->mMisraCpp2008->isChecked())
if (mUI->mMisraCpp->isChecked() && mUI->mMisraCppVersion->currentIndex() == 0)
codingStandards << CODING_STANDARD_MISRA_CPP_2008;
if (mUI->mMisraCpp->isChecked() && mUI->mMisraCppVersion->currentIndex() == 1)
codingStandards << CODING_STANDARD_MISRA_CPP_2023;
if (mUI->mAutosar->isChecked())
codingStandards << CODING_STANDARD_AUTOSAR;
projectFile->setCodingStandards(std::move(codingStandards));
Expand Down