kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Select code page during STEP Import (#14416)

Browse Source 
* [STEP Import]
Added the ability to select the encoding of the source file when importing.
Requires OCCT version 7.8.0 and higher

* fix compile error for OCCT < 7.8.0

* Also hide label "CodePage" for OCCT < 7.8.0

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix error

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix error on Ubuntu 20-04

* Fix error on Ubuntu 20-04

---------

Co-authored-by: Kuzma30 <kuzemkoa@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Kuzemko Alexsandr
2024-06-17 18:47:28 +03:00
committed by GitHub
parent f413f5d6d0
commit bf8e8b9157
8 changed files with 210 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Mod/Part/Gui/DlgImportStep.cpp
View File

@@ -27,7 +27,7 @@
#include "DlgImportStep.h"
#include "ui_DlgImportStep.h"
#include <Standard_Version.hxx>
using namespace PartGui;
@@ -36,7 +36,6 @@ DlgImportStep::DlgImportStep(QWidget* parent)
, ui(new Ui_DlgImportStep)
{
ui->setupUi(this);
Part::OCAF::ImportExportSettings settings;
ui->checkBoxMergeCompound->setChecked(settings.getReadShapeCompoundMode());
ui->checkBoxImportHiddenObj->setChecked(settings.getImportHiddenObject());
@@ -45,6 +44,20 @@ DlgImportStep::DlgImportStep(QWidget* parent)
ui->checkBoxReduceObjects->setChecked(settings.getReduceObjects());
ui->checkBoxExpandCompound->setChecked(settings.getExpandCompound());
ui->checkBoxShowProgress->setChecked(settings.getShowProgress());
#if OCC_VERSION_HEX >= 0x070800
ui->checkBoxShowOnImport->setChecked(settings.getReadShowDialogImport());
std::list<Part::OCAF::ImportExportSettings::CodePage> codepagelist;
codepagelist = settings.getCodePageList();
for (const auto& codePage : codepagelist) {
ui->comboBoxImportCodePage->addItem(QString::fromStdString(codePage.codePageName));
}
#else
// hide options that not supported in this OCCT version (7.8.0)
ui->label_6->hide();
ui->checkBoxShowOnImport->hide();
ui->comboBoxImportCodePage->hide();
#endif
}
/**
@@ -55,6 +68,10 @@ DlgImportStep::~DlgImportStep() = default;
void DlgImportStep::saveSettings()
{
// (h)STEP of Import module
#if OCC_VERSION_HEX >= 0x070800
ui->checkBoxShowOnImport->onSave();
ui->comboBoxImportCodePage->onSave();
#endif
ui->checkBoxMergeCompound->onSave();
ui->checkBoxImportHiddenObj->onSave();
ui->checkBoxUseLinkGroup->onSave();
@@ -68,6 +85,10 @@ void DlgImportStep::saveSettings()
void DlgImportStep::loadSettings()
{
// (h)STEP of Import module
#if OCC_VERSION_HEX >= 0x070800
ui->checkBoxShowOnImport->onRestore();
ui->comboBoxImportCodePage->onRestore();
#endif
ui->checkBoxMergeCompound->onRestore();
ui->checkBoxImportHiddenObj->onRestore();
ui->checkBoxUseLinkGroup->onRestore();