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

Import: use Part::ImportExportSettings to access parameters

Browse Source
This commit is contained in:
wmayer
2022-07-23 21:58:51 +02:00
parent b00044c656
commit fed9f20f48
3 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Import/App/AppImportPy.cpp
View File

@@ -314,9 +314,8 @@ private:
}
if (legacy == Py_None) {
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Import");
legacy = hGrp->GetBool("ExportLegacy",false) ? Py_True : Py_False;
Part::ImportExportSettings settings;
legacy = settings.getExportLegacy() ? Py_True : Py_False;
}
Import::ExportOCAF2 ocaf(hDoc);

33
src/Mod/Import/App/ImportOCAF2.cpp
View File

@@ -176,32 +176,29 @@ ImportOCAF2::ImportOCAF2(Handle(TDocStd_Document) h, App::Document* d, const std
aShapeTool = XCAFDoc_DocumentTool::ShapeTool (pDoc->Main());
aColorTool = XCAFDoc_DocumentTool::ColorTool(pDoc->Main());
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Import/hSTEP");
merge = hGrp->GetBool("ReadShapeCompoundMode", true);
Part::ImportExportSettings settings;
merge = settings.getReadShapeCompoundMode();
useLinkGroup = settings.getUseLinkGroup();
useBaseName = settings.getUseBaseName();
importHidden = settings.getImportHiddenObject();
reduceObjects = settings.getReduceObjects();
showProgress = settings.getShowProgress();
expandCompound = settings.getExpandCompound();
hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Import");
useLinkGroup = hGrp->GetBool("UseLinkGroup",true);
useBaseName = hGrp->GetBool("UseBaseName",true);
importHidden = hGrp->GetBool("ImportHiddenObject",true);
reduceObjects = hGrp->GetBool("ReduceObjects",true);
showProgress = hGrp->GetBool("ShowProgress",true);
expandCompound = hGrp->GetBool("ExpandCompound",true);
if(d->isSaved()) {
if (d->isSaved()) {
Base::FileInfo fi(d->FileName.getValue());
filePath = fi.dirPath();
}
mode = hGrp->GetInt("ImportMode",SingleDoc);
mode = static_cast<int>(settings.getImportMode());
hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
defaultFaceColor.setPackedValue(hGrp->GetUnsigned("DefaultShapeColor",0xCCCCCC00));
defaultFaceColor.a = 0;
defaultEdgeColor.setPackedValue(hGrp->GetUnsigned("DefaultShapeLineColor",421075455UL));
defaultEdgeColor.a = 0;
if(useLinkGroup) {
if (useLinkGroup) {
// Interface_Static::SetIVal("read.stepcaf.subshapes.name",1);
aShapeTool->SetAutoNaming(Standard_False);
}
@@ -888,9 +885,9 @@ ExportOCAF2::ExportOCAF2(Handle(TDocStd_Document) h, GetShapeColorsFunc func)
aShapeTool = XCAFDoc_DocumentTool::ShapeTool(pDoc->Main());
aColorTool = XCAFDoc_DocumentTool::ColorTool(pDoc->Main());
auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Import");
exportHidden = hGrp->GetBool("ExportHiddenObject",true);
keepPlacement = hGrp->GetBool("ExportKeepPlacement",false);
Part::ImportExportSettings settings;
exportHidden = settings.getExportHiddenObject();
keepPlacement = settings.getExportKeepPlacement();
Interface_Static::SetIVal("write.step.assembly",2);

8
src/Mod/Import/Gui/AppImportGuiPy.cpp
View File

@@ -423,10 +423,7 @@ private:
Handle(XCAFApp_Application) hApp = XCAFApp_Application::GetApplication();
Handle(TDocStd_Document) hDoc;
bool optionReadShapeCompoundMode = true;
hApp->NewDocument(TCollection_ExtendedString("MDTV-CAF"), hDoc);
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Import/hSTEP");
optionReadShapeCompoundMode = hGrp->GetBool("ReadShapeCompoundMode", optionReadShapeCompoundMode);
ImportOCAFExt ocaf(hDoc, pcDoc, file.fileNamePure());
FC_TIME_INIT(t);
FC_DURATION_DECL_INIT2(d1,d2);
@@ -586,9 +583,8 @@ private:
}
if (legacy == Py_None) {
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Import");
legacy = hGrp->GetBool("ExportLegacy",false) ? Py_True : Py_False;
Part::ImportExportSettings settings;
legacy = settings.getExportLegacy() ? Py_True : Py_False;
}
Import::ExportOCAF2 ocaf(hDoc, &getShapeColors);