Skip to content

Commit

Permalink
Import: move class ExportOCAFGui tp its on source files
Browse files Browse the repository at this point in the history
  • Loading branch information
wwmayer committed Oct 1, 2023
1 parent 1cbd96f commit 0e67929
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 19 deletions.
21 changes: 2 additions & 19 deletions src/Mod/Import/Gui/AppImportGuiPy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@
#endif
#endif

#include "ExportOCAFGui.h"

#include <App/Document.h>
#include <App/DocumentObjectPy.h>
#include <Base/Console.h>
Expand Down Expand Up @@ -343,25 +345,6 @@ class ImportOCAFExt: public Import::ImportOCAF2
}
};

class ExportOCAFGui: public Import::ExportOCAF
{
public:
ExportOCAFGui(Handle(TDocStd_Document) h, bool explicitPlacement)
: ExportOCAF(h, explicitPlacement)
{}
void findColors(Part::Feature* part, std::vector<App::Color>& colors) const override
{
Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(part);
if (vp && vp->isDerivedFrom(PartGui::ViewProviderPartExt::getClassTypeId())) {
colors = static_cast<PartGui::ViewProviderPartExt*>(vp)->DiffuseColor.getValues();
if (colors.empty()) {
colors.push_back(
static_cast<PartGui::ViewProviderPart*>(vp)->ShapeColor.getValue());
}
}
}
};

class Module: public Py::ExtensionModule<Module>
{
public:
Expand Down
2 changes: 2 additions & 0 deletions src/Mod/Import/Gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ SET(ImportGui_SRCS
AppImportGui.cpp
AppImportGuiPy.cpp
Command.cpp
ExportOCAFGui.cpp
ExportOCAFGui.h
PreCompiled.cpp
PreCompiled.h
Workbench.cpp
Expand Down
47 changes: 47 additions & 0 deletions src/Mod/Import/Gui/ExportOCAFGui.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// SPDX-License-Identifier: LGPL-2.1-or-later

/***************************************************************************
* 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 "ExportOCAFGui.h"
#include <Gui/Application.h>
#include <Mod/Part/Gui/ViewProvider.h>

using namespace ImportGui;


ExportOCAFGui::ExportOCAFGui(Handle(TDocStd_Document) hDoc, bool explicitPlacement)
: ExportOCAF(hDoc, explicitPlacement)
{}

void ExportOCAFGui::findColors(Part::Feature* part, std::vector<App::Color>& colors) const
{
Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(part);
if (vp && vp->isDerivedFrom(PartGui::ViewProviderPartExt::getClassTypeId())) {
colors = static_cast<PartGui::ViewProviderPartExt*>(vp)->DiffuseColor.getValues();
if (colors.empty()) {
colors.push_back(static_cast<PartGui::ViewProviderPart*>(vp)->ShapeColor.getValue());
}
}
}
41 changes: 41 additions & 0 deletions src/Mod/Import/Gui/ExportOCAFGui.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// SPDX-License-Identifier: LGPL-2.1-or-later

/***************************************************************************
* 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_EXPORTOCAFGUI_H
#define IMPORT_EXPORTOCAFGUI_H

#include <Mod/Import/App/ExportOCAF.h>

namespace ImportGui
{

class ExportOCAFGui: public Import::ExportOCAF
{
public:
ExportOCAFGui(Handle(TDocStd_Document) hDoc, bool explicitPlacement);
void findColors(Part::Feature* part, std::vector<App::Color>& colors) const override;
};

} // namespace ImportGui

#endif // IMPORT_EXPORTOCAFGUI_H

0 comments on commit 0e67929

Please sign in to comment.