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

Import: rename ImportOCAFExt to ImportOCAFGui and move to own source files

Browse Source
This commit is contained in:
wmayer
2023-10-01 19:27:25 +02:00
committed by wwmayer
parent 0e679297c9
commit bac2b83537
4 changed files with 161 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,7 @@
#endif
#include "ExportOCAFGui.h"
#include "ImportOCAFGui.h"
#include <App/Document.h>
#include <App/DocumentObjectPy.h>
@@ -96,7 +97,6 @@
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/ViewProviderLink.h>
#include <Mod/Import/App/ImportOCAF2.h>
#include <Mod/Import/App/ReaderGltf.h>
#include <Mod/Import/App/ReaderIges.h>
#include <Mod/Import/App/ReaderStep.h>
@@ -270,81 +270,6 @@ void OCAFBrowser::load(const TDF_Label& label, QTreeWidgetItem* item, const QStr
}
}
class ImportOCAFExt: public Import::ImportOCAF2
{
public:
ImportOCAFExt(Handle(TDocStd_Document) h, App::Document* d, const std::string& name)
: ImportOCAF2(h, d, name)
{}
private:
void applyFaceColors(Part::Feature* part, const std::vector<App::Color>& colors) override
{
auto vp = dynamic_cast<PartGui::ViewProviderPartExt*>(
Gui::Application::Instance->getViewProvider(part));
if (!vp) {
return;
}
if (colors.empty()) {
return;
}
if (colors.size() == 1) {
vp->ShapeColor.setValue(colors.front());
vp->Transparency.setValue(100 * colors.front().a);
}
else {
vp->DiffuseColor.setValues(colors);
}
}
void applyEdgeColors(Part::Feature* part, const std::vector<App::Color>& colors) override
{
auto vp = dynamic_cast<PartGui::ViewProviderPartExt*>(
Gui::Application::Instance->getViewProvider(part));
if (!vp) {
return;
}
if (colors.size() == 1) {
vp->LineColor.setValue(colors.front());
}
else {
vp->LineColorArray.setValues(colors);
}
}
void applyLinkColor(App::DocumentObject* obj, int index, App::Color color) override
{
auto vp =
dynamic_cast<Gui::ViewProviderLink*>(Gui::Application::Instance->getViewProvider(obj));
if (!vp) {
return;
}
if (index < 0) {
vp->OverrideMaterial.setValue(true);
vp->ShapeMaterial.setDiffuseColor(color);
return;
}
if (vp->OverrideMaterialList.getSize() <= index) {
vp->OverrideMaterialList.setSize(index + 1);
}
vp->OverrideMaterialList.set1Value(index, true);
App::Material mat(App::Material::DEFAULT);
if (vp->MaterialList.getSize() <= index) {
vp->MaterialList.setSize(index + 1, mat);
}
mat.diffuseColor = color;
vp->MaterialList.set1Value(index, mat);
}
void applyElementColors(App::DocumentObject* obj,
const std::map<std::string, App::Color>& colors) override
{
auto vp = Gui::Application::Instance->getViewProvider(obj);
if (!vp) {
return;
}
(void)colors;
}
};
class Module: public Py::ExtensionModule<Module>
{
public:
@@ -413,8 +338,8 @@ private:
Handle(XCAFApp_Application) hApp = XCAFApp_Application::GetApplication();
Handle(TDocStd_Document) hDoc;
hApp->NewDocument(TCollection_ExtendedString("MDTV-CAF"), hDoc);
ImportOCAFExt ocaf(hDoc, pcDoc, file.fileNamePure());
ocaf.setImportOptions(ImportOCAFExt::customImportOptions());
ImportOCAFGui ocaf(hDoc, pcDoc, file.fileNamePure());
ocaf.setImportOptions(ImportOCAFGui::customImportOptions());
FC_TIME_INIT(t);
FC_DURATION_DECL_INIT2(d1, d2);

2
src/Mod/Import/Gui/CMakeLists.txt
View File

@@ -32,6 +32,8 @@ SET(ImportGui_SRCS
Command.cpp
ExportOCAFGui.cpp
ExportOCAFGui.h
ImportOCAFGui.cpp
ImportOCAFGui.h
PreCompiled.cpp
PreCompiled.h
Workbench.cpp

108
src/Mod/Import/Gui/ImportOCAFGui.cpp Normal file
View File

@@ -0,0 +1,108 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
/***************************************************************************
* Copyright (c) 2023 Zheng Lei <realthunder.dev@gmail.com> *
* Copyright (c) 2023 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This file is part of FreeCAD. *
* *
* FreeCAD is free software: you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 2.1 of the *
* License, or (at your option) any later version. *
* *
* FreeCAD is distributed in the hope that it will be useful, but *
* WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with FreeCAD. If not, see *
* <https://www.gnu.org/licenses/>. *
* *
**************************************************************************/
#include "PreCompiled.h"
#include "ImportOCAFGui.h"
#include <Gui/Application.h>
#include <Gui/ViewProviderLink.h>
#include <Mod/Part/Gui/ViewProvider.h>
using namespace ImportGui;
ImportOCAFGui::ImportOCAFGui(Handle(TDocStd_Document) hDoc,
App::Document* pDoc,
const std::string& name)
: ImportOCAF2(hDoc, pDoc, name)
{}
void ImportOCAFGui::applyFaceColors(Part::Feature* part, const std::vector<App::Color>& colors)
{
auto vp = dynamic_cast<PartGui::ViewProviderPartExt*>(
Gui::Application::Instance->getViewProvider(part));
if (!vp) {
return;
}
if (colors.empty()) {
return;
}
if (colors.size() == 1) {
vp->ShapeColor.setValue(colors.front());
vp->Transparency.setValue(100 * colors.front().a);
}
else {
vp->DiffuseColor.setValues(colors);
}
}
void ImportOCAFGui::applyEdgeColors(Part::Feature* part, const std::vector<App::Color>& colors)
{
auto vp = dynamic_cast<PartGui::ViewProviderPartExt*>(
Gui::Application::Instance->getViewProvider(part));
if (!vp) {
return;
}
if (colors.size() == 1) {
vp->LineColor.setValue(colors.front());
}
else {
vp->LineColorArray.setValues(colors);
}
}
void ImportOCAFGui::applyLinkColor(App::DocumentObject* obj, int index, App::Color color)
{
auto vp =
dynamic_cast<Gui::ViewProviderLink*>(Gui::Application::Instance->getViewProvider(obj));
if (!vp) {
return;
}
if (index < 0) {
vp->OverrideMaterial.setValue(true);
vp->ShapeMaterial.setDiffuseColor(color);
return;
}
if (vp->OverrideMaterialList.getSize() <= index) {
vp->OverrideMaterialList.setSize(index + 1);
}
vp->OverrideMaterialList.set1Value(index, true);
App::Material mat(App::Material::DEFAULT);
if (vp->MaterialList.getSize() <= index) {
vp->MaterialList.setSize(index + 1, mat);
}
mat.diffuseColor = color;
vp->MaterialList.set1Value(index, mat);
}
void ImportOCAFGui::applyElementColors(App::DocumentObject* obj,
const std::map<std::string, App::Color>& colors)
{
auto vp = Gui::Application::Instance->getViewProvider(obj);
if (!vp) {
return;
}
(void)colors;
}

48
src/Mod/Import/Gui/ImportOCAFGui.h Normal file
View File

@@ -0,0 +1,48 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
/***************************************************************************
* Copyright (c) 2023 Zheng Lei <realthunder.dev@gmail.com> *
* Copyright (c) 2023 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This file is part of FreeCAD. *
* *
* FreeCAD is free software: you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 2.1 of the *
* License, or (at your option) any later version. *
* *
* FreeCAD is distributed in the hope that it will be useful, but *
* WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with FreeCAD. If not, see *
* <https://www.gnu.org/licenses/>. *
* *
**************************************************************************/
#ifndef IMPORT_IMPORTOCAFGUI_H
#define IMPORT_IMPORTOCAFGUI_H
#include <Mod/Import/App/ImportOCAF2.h>
namespace ImportGui
{
class ImportOCAFGui: public Import::ImportOCAF2
{
public:
ImportOCAFGui(Handle(TDocStd_Document) hDoc, App::Document* pDoc, const std::string& name);
private:
void applyFaceColors(Part::Feature* part, const std::vector<App::Color>& colors) override;
void applyEdgeColors(Part::Feature* part, const std::vector<App::Color>& colors) override;
void applyLinkColor(App::DocumentObject* obj, int index, App::Color color) override;
void applyElementColors(App::DocumentObject* obj,
const std::map<std::string, App::Color>& colors) override;
};
} // namespace ImportGui
#endif // IMPORT_IMPORTOCAFGUI_H