Import: Apply clang format
This commit is contained in:
wmayer
@@ -22,77 +22,77 @@
|
||||
|
||||
#include "PreCompiled.h"
|
||||
#if defined(__MINGW32__)
|
||||
# define WNT // avoid conflict with GUID
|
||||
#define WNT// avoid conflict with GUID
|
||||
#endif
|
||||
#ifndef _PreComp_
|
||||
# include <climits>
|
||||
# include <iostream>
|
||||
#include <climits>
|
||||
#include <iostream>
|
||||
|
||||
# include <QApplication>
|
||||
# include <QDialog>
|
||||
# include <QDialogButtonBox>
|
||||
# include <QHBoxLayout>
|
||||
# include <QPointer>
|
||||
# include <QString>
|
||||
# include <QStyle>
|
||||
# include <QTreeWidget>
|
||||
# include <QTreeWidgetItem>
|
||||
# include <QTextStream>
|
||||
# include <QVBoxLayout>
|
||||
#include <QApplication>
|
||||
#include <QDialog>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QHBoxLayout>
|
||||
#include <QPointer>
|
||||
#include <QString>
|
||||
#include <QStyle>
|
||||
#include <QTextStream>
|
||||
#include <QTreeWidget>
|
||||
#include <QTreeWidgetItem>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
#if defined(__clang__)
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wextra-semi"
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wextra-semi"
|
||||
#endif
|
||||
|
||||
# include <APIHeaderSection_MakeHeader.hxx>
|
||||
# include <IGESCAFControl_Reader.hxx>
|
||||
# include <IGESCAFControl_Writer.hxx>
|
||||
# include <IGESControl_Controller.hxx>
|
||||
# include <IGESData_GlobalSection.hxx>
|
||||
# include <IGESData_IGESModel.hxx>
|
||||
# include <IGESToBRep_Actor.hxx>
|
||||
# include <Interface_Static.hxx>
|
||||
# include <OSD_Exception.hxx>
|
||||
# include <Standard_Version.hxx>
|
||||
# include <STEPCAFControl_Reader.hxx>
|
||||
# include <STEPCAFControl_Writer.hxx>
|
||||
# include <TColStd_IndexedDataMapOfStringString.hxx>
|
||||
# include <TDataStd.hxx>
|
||||
# include <TDataStd_Integer.hxx>
|
||||
# include <TDataStd_Name.hxx>
|
||||
# include <TDataStd_TreeNode.hxx>
|
||||
# include <TDataXtd_Shape.hxx>
|
||||
# include <TDF_AttributeIterator.hxx>
|
||||
# include <TDF_ChildIterator.hxx>
|
||||
# include <TDF_ChildIDIterator.hxx>
|
||||
# include <TDF_IDList.hxx>
|
||||
# include <TDF_Label.hxx>
|
||||
# include <TDF_ListIteratorOfIDList.hxx>
|
||||
# include <TDF_TagSource.hxx>
|
||||
# include <TDocStd_Document.hxx>
|
||||
# include <TDocStd_Owner.hxx>
|
||||
# include <TNaming_NamedShape.hxx>
|
||||
# include <TNaming_UsedShapes.hxx>
|
||||
# include <Transfer_TransientProcess.hxx>
|
||||
# include <XCAFApp_Application.hxx>
|
||||
# include <XCAFDoc_Color.hxx>
|
||||
# include <XCAFDoc_ColorTool.hxx>
|
||||
# include <XCAFDoc_DocumentTool.hxx>
|
||||
# include <XCAFDoc_LayerTool.hxx>
|
||||
# include <XCAFDoc_Location.hxx>
|
||||
# include <XCAFDoc_ShapeMapTool.hxx>
|
||||
# include <XCAFDoc_ShapeTool.hxx>
|
||||
# include <XSControl_TransferReader.hxx>
|
||||
# include <XSControl_WorkSession.hxx>
|
||||
#include <APIHeaderSection_MakeHeader.hxx>
|
||||
#include <IGESCAFControl_Reader.hxx>
|
||||
#include <IGESCAFControl_Writer.hxx>
|
||||
#include <IGESControl_Controller.hxx>
|
||||
#include <IGESData_GlobalSection.hxx>
|
||||
#include <IGESData_IGESModel.hxx>
|
||||
#include <IGESToBRep_Actor.hxx>
|
||||
#include <Interface_Static.hxx>
|
||||
#include <OSD_Exception.hxx>
|
||||
#include <STEPCAFControl_Reader.hxx>
|
||||
#include <STEPCAFControl_Writer.hxx>
|
||||
#include <Standard_Version.hxx>
|
||||
#include <TColStd_IndexedDataMapOfStringString.hxx>
|
||||
#include <TDF_AttributeIterator.hxx>
|
||||
#include <TDF_ChildIDIterator.hxx>
|
||||
#include <TDF_ChildIterator.hxx>
|
||||
#include <TDF_IDList.hxx>
|
||||
#include <TDF_Label.hxx>
|
||||
#include <TDF_ListIteratorOfIDList.hxx>
|
||||
#include <TDF_TagSource.hxx>
|
||||
#include <TDataStd.hxx>
|
||||
#include <TDataStd_Integer.hxx>
|
||||
#include <TDataStd_Name.hxx>
|
||||
#include <TDataStd_TreeNode.hxx>
|
||||
#include <TDataXtd_Shape.hxx>
|
||||
#include <TDocStd_Document.hxx>
|
||||
#include <TDocStd_Owner.hxx>
|
||||
#include <TNaming_NamedShape.hxx>
|
||||
#include <TNaming_UsedShapes.hxx>
|
||||
#include <Transfer_TransientProcess.hxx>
|
||||
#include <XCAFApp_Application.hxx>
|
||||
#include <XCAFDoc_Color.hxx>
|
||||
#include <XCAFDoc_ColorTool.hxx>
|
||||
#include <XCAFDoc_DocumentTool.hxx>
|
||||
#include <XCAFDoc_LayerTool.hxx>
|
||||
#include <XCAFDoc_Location.hxx>
|
||||
#include <XCAFDoc_ShapeMapTool.hxx>
|
||||
#include <XCAFDoc_ShapeTool.hxx>
|
||||
#include <XSControl_TransferReader.hxx>
|
||||
#include <XSControl_WorkSession.hxx>
|
||||
|
||||
# if OCC_VERSION_HEX >= 0x070500
|
||||
# include <Message_ProgressRange.hxx>
|
||||
# include <RWGltf_CafWriter.hxx>
|
||||
# endif
|
||||
# if defined(__clang__)
|
||||
# pragma clang diagnostic pop
|
||||
# endif
|
||||
#if OCC_VERSION_HEX >= 0x070500
|
||||
#include <Message_ProgressRange.hxx>
|
||||
#include <RWGltf_CafWriter.hxx>
|
||||
#endif
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <App/Document.h>
|
||||
@@ -105,19 +105,20 @@
|
||||
#include <Gui/MainWindow.h>
|
||||
#include <Gui/ViewProviderLink.h>
|
||||
#include <Mod/Import/App/ImportOCAF2.h>
|
||||
#include <Mod/Part/Gui/ViewProvider.h>
|
||||
#include <Mod/Part/App/OCAF/ImportExportSettings.h>
|
||||
#include <Mod/Part/App/encodeFilename.h>
|
||||
#include <Mod/Part/App/ImportIges.h>
|
||||
#include <Mod/Part/App/ImportStep.h>
|
||||
#include <Mod/Part/App/Interface.h>
|
||||
#include <Mod/Part/App/OCAF/ImportExportSettings.h>
|
||||
#include <Mod/Part/App/ProgressIndicator.h>
|
||||
#include <Mod/Part/App/encodeFilename.h>
|
||||
#include <Mod/Part/Gui/DlgExportStep.h>
|
||||
#include <Mod/Part/Gui/ViewProvider.h>
|
||||
|
||||
|
||||
FC_LOG_LEVEL_INIT("Import", true, true)
|
||||
|
||||
namespace ImportGui {
|
||||
namespace ImportGui
|
||||
{
|
||||
class OCAFBrowser
|
||||
{
|
||||
public:
|
||||
@@ -146,10 +147,10 @@ private:
|
||||
void load(const TDF_Label& label, QTreeWidgetItem* item, const QString&);
|
||||
std::string toString(const TCollection_ExtendedString& extstr) const
|
||||
{
|
||||
char* str = new char[extstr.LengthOfCString()+1];
|
||||
char* str = new char[extstr.LengthOfCString() + 1];
|
||||
extstr.ToUTF8CString(str);
|
||||
std::string text(str);
|
||||
delete [] str;
|
||||
delete[] str;
|
||||
return text;
|
||||
}
|
||||
|
||||
@@ -176,15 +177,16 @@ void OCAFBrowser::load(const TDF_Label& label, QTreeWidgetItem* item, const QStr
|
||||
label.Dump(std::cout);
|
||||
|
||||
Handle(TDataStd_Name) name;
|
||||
if (label.FindAttribute(TDataStd_Name::GetID(),name)) {
|
||||
QString text = QString::fromLatin1("%1 %2").arg(s, QString::fromUtf8(toString(name->Get()).c_str()));
|
||||
if (label.FindAttribute(TDataStd_Name::GetID(), name)) {
|
||||
QString text =
|
||||
QString::fromLatin1("%1 %2").arg(s, QString::fromUtf8(toString(name->Get()).c_str()));
|
||||
item->setText(0, text);
|
||||
}
|
||||
|
||||
|
||||
TDF_IDList localList;
|
||||
TDF_AttributeIterator itr (label);
|
||||
for ( ; itr.More(); itr.Next()) {
|
||||
TDF_AttributeIterator itr(label);
|
||||
for (; itr.More(); itr.Next()) {
|
||||
localList.Append(itr.Value()->ID());
|
||||
}
|
||||
|
||||
@@ -221,33 +223,33 @@ void OCAFBrowser::load(const TDF_Label& label, QTreeWidgetItem* item, const QStr
|
||||
str << attr->DynamicType()->Name() << " = ";
|
||||
if (!shape.IsNull()) {
|
||||
switch (shape.ShapeType()) {
|
||||
case TopAbs_COMPOUND:
|
||||
str << "COMPOUND PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_COMPSOLID:
|
||||
str << "COMPSOLID PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_SOLID:
|
||||
str << "SOLID PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_SHELL:
|
||||
str << "SHELL PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_FACE:
|
||||
str << "FACE PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_WIRE:
|
||||
str << "WIRE PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_EDGE:
|
||||
str << "EDGE PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_VERTEX:
|
||||
str << "VERTEX PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_SHAPE:
|
||||
str << "SHAPE PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_COMPOUND:
|
||||
str << "COMPOUND PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_COMPSOLID:
|
||||
str << "COMPSOLID PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_SOLID:
|
||||
str << "SOLID PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_SHELL:
|
||||
str << "SHELL PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_FACE:
|
||||
str << "FACE PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_WIRE:
|
||||
str << "WIRE PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_EDGE:
|
||||
str << "EDGE PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_VERTEX:
|
||||
str << "VERTEX PRIMITIVE";
|
||||
break;
|
||||
case TopAbs_SHAPE:
|
||||
str << "SHAPE PRIMITIVE";
|
||||
break;
|
||||
}
|
||||
}
|
||||
child->setText(0, text);
|
||||
@@ -259,8 +261,8 @@ void OCAFBrowser::load(const TDF_Label& label, QTreeWidgetItem* item, const QStr
|
||||
}
|
||||
|
||||
|
||||
int i=1;
|
||||
for (TDF_ChildIterator it(label); it.More(); it.Next(),i++) {
|
||||
int i = 1;
|
||||
for (TDF_ChildIterator it(label); it.More(); it.Next(), i++) {
|
||||
QString text = QString::fromLatin1("%1:%2").arg(s).arg(i);
|
||||
QTreeWidgetItem* child = new QTreeWidgetItem();
|
||||
child->setText(0, text);
|
||||
@@ -270,24 +272,26 @@ void OCAFBrowser::load(const TDF_Label& label, QTreeWidgetItem* item, const QStr
|
||||
}
|
||||
}
|
||||
|
||||
class ImportOCAFExt : public Import::ImportOCAF2
|
||||
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)
|
||||
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()) {
|
||||
}
|
||||
if (colors.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(colors.size() == 1) {
|
||||
if (colors.size() == 1) {
|
||||
vp->ShapeColor.setValue(colors.front());
|
||||
vp->Transparency.setValue(100 * colors.front().a);
|
||||
}
|
||||
@@ -295,99 +299,120 @@ private:
|
||||
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)
|
||||
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)
|
||||
}
|
||||
if (colors.size() == 1) {
|
||||
vp->LineColor.setValue(colors.front());
|
||||
else
|
||||
}
|
||||
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)
|
||||
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) {
|
||||
}
|
||||
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);
|
||||
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);
|
||||
if (vp->MaterialList.getSize() <= index) {
|
||||
vp->MaterialList.setSize(index + 1, mat);
|
||||
}
|
||||
mat.diffuseColor = color;
|
||||
vp->MaterialList.set1Value(index,mat);
|
||||
vp->MaterialList.set1Value(index, mat);
|
||||
}
|
||||
void applyElementColors(App::DocumentObject *obj,
|
||||
const std::map<std::string,App::Color> &colors) override
|
||||
void applyElementColors(App::DocumentObject* obj,
|
||||
const std::map<std::string, App::Color>& colors) override
|
||||
{
|
||||
auto vp = Gui::Application::Instance->getViewProvider(obj);
|
||||
if(!vp)
|
||||
if (!vp) {
|
||||
return;
|
||||
}
|
||||
(void)colors;
|
||||
}
|
||||
};
|
||||
|
||||
class ExportOCAFGui : public Import::ExportOCAF
|
||||
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());
|
||||
if (colors.empty()) {
|
||||
colors.push_back(
|
||||
static_cast<PartGui::ViewProviderPart*>(vp)->ShapeColor.getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
class Module : public Py::ExtensionModule<Module>
|
||||
class Module: public Py::ExtensionModule<Module>
|
||||
{
|
||||
public:
|
||||
Module() : Py::ExtensionModule<Module>("ImportGui")
|
||||
Module()
|
||||
: Py::ExtensionModule<Module>("ImportGui")
|
||||
{
|
||||
add_keyword_method("open",&Module::insert,
|
||||
"open(string) -- Open the file and create a new document."
|
||||
);
|
||||
add_keyword_method("insert",&Module::insert,
|
||||
"insert(string,string) -- Insert the file into the given document."
|
||||
);
|
||||
add_varargs_method("exportOptions",&Module::exportOptions,
|
||||
"exportOptions(string) -- Return the export options of a file type."
|
||||
);
|
||||
add_keyword_method("export",&Module::exporter,
|
||||
"export(list,string) -- Export a list of objects into a single file."
|
||||
);
|
||||
add_varargs_method("ocaf",&Module::ocaf,
|
||||
"ocaf(string) -- Browse the ocaf structure."
|
||||
);
|
||||
initialize("This module is the ImportGui module."); // register with Python
|
||||
add_keyword_method("open",
|
||||
&Module::insert,
|
||||
"open(string) -- Open the file and create a new document.");
|
||||
add_keyword_method("insert",
|
||||
&Module::insert,
|
||||
"insert(string,string) -- Insert the file into the given document.");
|
||||
add_varargs_method("exportOptions",
|
||||
&Module::exportOptions,
|
||||
"exportOptions(string) -- Return the export options of a file type.");
|
||||
add_keyword_method("export",
|
||||
&Module::exporter,
|
||||
"export(list,string) -- Export a list of objects into a single file.");
|
||||
add_varargs_method("ocaf", &Module::ocaf, "ocaf(string) -- Browse the ocaf structure.");
|
||||
initialize("This module is the ImportGui module.");// register with Python
|
||||
}
|
||||
|
||||
private:
|
||||
Py::Object insert(const Py::Tuple& args, const Py::Dict &kwds)
|
||||
Py::Object insert(const Py::Tuple& args, const Py::Dict& kwds)
|
||||
{
|
||||
char* Name;
|
||||
char* DocName=nullptr;
|
||||
PyObject *importHidden = Py_None;
|
||||
PyObject *merge = Py_None;
|
||||
PyObject *useLinkGroup = Py_None;
|
||||
char* DocName = nullptr;
|
||||
PyObject* importHidden = Py_None;
|
||||
PyObject* merge = Py_None;
|
||||
PyObject* useLinkGroup = Py_None;
|
||||
int mode = -1;
|
||||
static const std::array<const char *, 7> kwd_list{"name", "docName", "importHidden", "merge", "useLinkGroup",
|
||||
"mode", nullptr};
|
||||
if (!Base::Wrapped_ParseTupleAndKeywords(args.ptr(), kwds.ptr(), "et|sO!O!O!i",
|
||||
kwd_list, "utf-8", &Name, &DocName, &PyBool_Type, &importHidden,
|
||||
&PyBool_Type, &merge,
|
||||
&PyBool_Type, &useLinkGroup, &mode)) {
|
||||
static const std::array<const char*, 7>
|
||||
kwd_list {"name", "docName", "importHidden", "merge", "useLinkGroup", "mode", nullptr};
|
||||
if (!Base::Wrapped_ParseTupleAndKeywords(args.ptr(),
|
||||
kwds.ptr(),
|
||||
"et|sO!O!O!i",
|
||||
kwd_list,
|
||||
"utf-8",
|
||||
&Name,
|
||||
&DocName,
|
||||
&PyBool_Type,
|
||||
&importHidden,
|
||||
&PyBool_Type,
|
||||
&merge,
|
||||
&PyBool_Type,
|
||||
&useLinkGroup,
|
||||
&mode)) {
|
||||
throw Py::Exception();
|
||||
}
|
||||
|
||||
@@ -398,7 +423,7 @@ private:
|
||||
try {
|
||||
Base::FileInfo file(Utf8Name.c_str());
|
||||
|
||||
App::Document *pcDoc = nullptr;
|
||||
App::Document* pcDoc = nullptr;
|
||||
if (DocName) {
|
||||
pcDoc = App::GetApplication().getDocument(DocName);
|
||||
}
|
||||
@@ -412,16 +437,18 @@ private:
|
||||
ImportOCAFExt ocaf(hDoc, pcDoc, file.fileNamePure());
|
||||
ocaf.setImportOptions(ImportOCAFExt::customImportOptions());
|
||||
FC_TIME_INIT(t);
|
||||
FC_DURATION_DECL_INIT2(d1,d2);
|
||||
FC_DURATION_DECL_INIT2(d1, d2);
|
||||
|
||||
if (file.hasExtension({"stp", "step"})) {
|
||||
|
||||
if(mode<0)
|
||||
if (mode < 0) {
|
||||
mode = ocaf.getMode();
|
||||
if(mode && !pcDoc->isSaved()) {
|
||||
}
|
||||
if (mode && !pcDoc->isSaved()) {
|
||||
auto gdoc = Gui::Application::Instance->getDocument(pcDoc);
|
||||
if(!gdoc->save())
|
||||
if (!gdoc->save()) {
|
||||
return Py::Object();
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -449,20 +476,24 @@ private:
|
||||
Base::Console().Error("%s\n", e.GetMessageString());
|
||||
Base::Console().Message("Try to load STEP file without colors...\n");
|
||||
|
||||
Part::ImportStepParts(pcDoc,Utf8Name.c_str());
|
||||
Part::ImportStepParts(pcDoc, Utf8Name.c_str());
|
||||
pcDoc->recompute();
|
||||
}
|
||||
}
|
||||
else if (file.hasExtension({"igs", "iges"})) {
|
||||
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
|
||||
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Part")->GetGroup("IGES");
|
||||
Base::Reference<ParameterGrp> hGrp = App::GetApplication()
|
||||
.GetUserParameter()
|
||||
.GetGroup("BaseApp")
|
||||
->GetGroup("Preferences")
|
||||
->GetGroup("Mod/Part")
|
||||
->GetGroup("IGES");
|
||||
|
||||
try {
|
||||
IGESControl_Controller::Init();
|
||||
IGESCAFControl_Reader aReader;
|
||||
// http://www.opencascade.org/org/forum/thread_20603/?forum=3
|
||||
aReader.SetReadVisible(hGrp->GetBool("SkipBlankEntities", true)
|
||||
? Standard_True : Standard_False);
|
||||
aReader.SetReadVisible(
|
||||
hGrp->GetBool("SkipBlankEntities", true) ? Standard_True : Standard_False);
|
||||
aReader.SetColorMode(true);
|
||||
aReader.SetNameMode(true);
|
||||
aReader.SetLayerMode(true);
|
||||
@@ -482,13 +513,13 @@ private:
|
||||
#endif
|
||||
// http://opencascade.blogspot.de/2009/03/unnoticeable-memory-leaks-part-2.html
|
||||
Handle(IGESToBRep_Actor)::DownCast(aReader.WS()->TransferReader()->Actor())
|
||||
->SetModel(new IGESData_IGESModel);
|
||||
->SetModel(new IGESData_IGESModel);
|
||||
}
|
||||
catch (OSD_Exception& e) {
|
||||
Base::Console().Error("%s\n", e.GetMessageString());
|
||||
Base::Console().Message("Try to load IGES file without colors...\n");
|
||||
|
||||
Part::ImportIgesParts(pcDoc,Utf8Name.c_str());
|
||||
Part::ImportIgesParts(pcDoc, Utf8Name.c_str());
|
||||
pcDoc->recompute();
|
||||
}
|
||||
}
|
||||
@@ -496,25 +527,28 @@ private:
|
||||
throw Py::Exception(PyExc_IOError, "no supported file format");
|
||||
}
|
||||
|
||||
FC_DURATION_PLUS(d1,t);
|
||||
if (merge != Py_None)
|
||||
FC_DURATION_PLUS(d1, t);
|
||||
if (merge != Py_None) {
|
||||
ocaf.setMerge(Base::asBoolean(merge));
|
||||
if (importHidden != Py_None)
|
||||
}
|
||||
if (importHidden != Py_None) {
|
||||
ocaf.setImportHiddenObject(Base::asBoolean(importHidden));
|
||||
if (useLinkGroup != Py_None)
|
||||
}
|
||||
if (useLinkGroup != Py_None) {
|
||||
ocaf.setUseLinkGroup(Base::asBoolean(useLinkGroup));
|
||||
}
|
||||
ocaf.setMode(mode);
|
||||
auto ret = ocaf.loadShapes();
|
||||
hApp->Close(hDoc);
|
||||
FC_DURATION_PLUS(d2,t);
|
||||
FC_DURATION_LOG(d1,"file read");
|
||||
FC_DURATION_LOG(d2,"import");
|
||||
FC_DURATION_LOG((d1+d2),"total");
|
||||
FC_DURATION_PLUS(d2, t);
|
||||
FC_DURATION_LOG(d1, "file read");
|
||||
FC_DURATION_LOG(d2, "import");
|
||||
FC_DURATION_LOG((d1 + d2), "total");
|
||||
|
||||
if(ret) {
|
||||
if (ret) {
|
||||
App::GetApplication().setActiveDocument(pcDoc);
|
||||
auto gdoc = Gui::Application::Instance->getDocument(pcDoc);
|
||||
if(gdoc) {
|
||||
if (gdoc) {
|
||||
gdoc->setActiveView();
|
||||
Gui::Application::Instance->commandManager().runCommandByName("Std_ViewFitAll");
|
||||
}
|
||||
@@ -532,18 +566,22 @@ private:
|
||||
return Py::None();
|
||||
}
|
||||
|
||||
static std::map<std::string, App::Color> getShapeColors(App::DocumentObject *obj, const char *subname) {
|
||||
static std::map<std::string, App::Color> getShapeColors(App::DocumentObject* obj,
|
||||
const char* subname)
|
||||
{
|
||||
auto vp = Gui::Application::Instance->getViewProvider(obj);
|
||||
if(vp)
|
||||
if (vp) {
|
||||
return vp->getElementColors(subname);
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
Py::Object exportOptions(const Py::Tuple& args)
|
||||
{
|
||||
char* Name;
|
||||
if (!PyArg_ParseTuple(args.ptr(), "et", "utf-8", &Name))
|
||||
if (!PyArg_ParseTuple(args.ptr(), "et", "utf-8", &Name)) {
|
||||
throw Py::Exception();
|
||||
}
|
||||
|
||||
std::string Utf8Name = std::string(Name);
|
||||
PyMem_Free(Name);
|
||||
@@ -565,23 +603,31 @@ private:
|
||||
return options;
|
||||
}
|
||||
|
||||
Py::Object exporter(const Py::Tuple& args, const Py::Dict &kwds)
|
||||
Py::Object exporter(const Py::Tuple& args, const Py::Dict& kwds)
|
||||
{
|
||||
PyObject* object;
|
||||
char* Name;
|
||||
PyObject *pyoptions = nullptr;
|
||||
PyObject *pyexportHidden = Py_None;
|
||||
PyObject *pylegacy = Py_None;
|
||||
PyObject *pykeepPlacement = Py_None;
|
||||
static const std::array<const char *, 7> kwd_list{"obj", "name", "options", "exportHidden", "legacy",
|
||||
"keepPlacement", nullptr};
|
||||
if (!Base::Wrapped_ParseTupleAndKeywords(args.ptr(), kwds.ptr(), "Oet|O!O!O!O!",
|
||||
kwd_list, &object,
|
||||
"utf-8", &Name,
|
||||
&PyDict_Type, &pyoptions,
|
||||
&PyBool_Type, &pyexportHidden,
|
||||
&PyBool_Type, &pylegacy,
|
||||
&PyBool_Type, &pykeepPlacement)) {
|
||||
PyObject* pyoptions = nullptr;
|
||||
PyObject* pyexportHidden = Py_None;
|
||||
PyObject* pylegacy = Py_None;
|
||||
PyObject* pykeepPlacement = Py_None;
|
||||
static const std::array<const char*, 7>
|
||||
kwd_list {"obj", "name", "options", "exportHidden", "legacy", "keepPlacement", nullptr};
|
||||
if (!Base::Wrapped_ParseTupleAndKeywords(args.ptr(),
|
||||
kwds.ptr(),
|
||||
"Oet|O!O!O!O!",
|
||||
kwd_list,
|
||||
&object,
|
||||
"utf-8",
|
||||
&Name,
|
||||
&PyDict_Type,
|
||||
&pyoptions,
|
||||
&PyBool_Type,
|
||||
&pyexportHidden,
|
||||
&PyBool_Type,
|
||||
&pylegacy,
|
||||
&PyBool_Type,
|
||||
&pykeepPlacement)) {
|
||||
throw Py::Exception();
|
||||
}
|
||||
|
||||
@@ -593,9 +639,12 @@ private:
|
||||
Part::OCAF::ImportExportSettings settings;
|
||||
|
||||
// still support old way
|
||||
bool legacyExport = (pylegacy == Py_None ? settings.getExportLegacy() : Base::asBoolean(pylegacy));
|
||||
bool exportHidden = (pyexportHidden == Py_None ? settings.getExportHiddenObject() : Base::asBoolean(pyexportHidden));
|
||||
bool keepPlacement = (pykeepPlacement == Py_None ? settings.getExportKeepPlacement() : Base::asBoolean(pykeepPlacement));
|
||||
bool legacyExport =
|
||||
(pylegacy == Py_None ? settings.getExportLegacy() : Base::asBoolean(pylegacy));
|
||||
bool exportHidden = (pyexportHidden == Py_None ? settings.getExportHiddenObject()
|
||||
: Base::asBoolean(pyexportHidden));
|
||||
bool keepPlacement = (pykeepPlacement == Py_None ? settings.getExportKeepPlacement()
|
||||
: Base::asBoolean(pykeepPlacement));
|
||||
|
||||
// new way
|
||||
if (pyoptions) {
|
||||
@@ -617,11 +666,13 @@ private:
|
||||
Handle(TDocStd_Document) hDoc;
|
||||
hApp->NewDocument(TCollection_ExtendedString("MDTV-CAF"), hDoc);
|
||||
|
||||
std::vector<App::DocumentObject *> objs;
|
||||
std::vector<App::DocumentObject*> objs;
|
||||
for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) {
|
||||
PyObject* item = (*it).ptr();
|
||||
if (PyObject_TypeCheck(item, &(App::DocumentObjectPy::Type)))
|
||||
objs.push_back(static_cast<App::DocumentObjectPy*>(item)->getDocumentObjectPtr());
|
||||
if (PyObject_TypeCheck(item, &(App::DocumentObjectPy::Type))) {
|
||||
objs.push_back(
|
||||
static_cast<App::DocumentObjectPy*>(item)->getDocumentObjectPtr());
|
||||
}
|
||||
}
|
||||
|
||||
Import::ExportOCAF2 ocaf(hDoc, &getShapeColors);
|
||||
@@ -636,32 +687,36 @@ private:
|
||||
bool keepExplicitPlacement = Standard_True;
|
||||
ExportOCAFGui ocaf(hDoc, keepExplicitPlacement);
|
||||
// That stuff is exporting a list of selected objects into FreeCAD Tree
|
||||
std::vector <TDF_Label> hierarchical_label;
|
||||
std::vector <TopLoc_Location> hierarchical_loc;
|
||||
std::vector <App::DocumentObject*> hierarchical_part;
|
||||
for(auto obj : objs)
|
||||
ocaf.exportObject(obj,hierarchical_label, hierarchical_loc,hierarchical_part);
|
||||
std::vector<TDF_Label> hierarchical_label;
|
||||
std::vector<TopLoc_Location> hierarchical_loc;
|
||||
std::vector<App::DocumentObject*> hierarchical_part;
|
||||
for (auto obj : objs) {
|
||||
ocaf.exportObject(obj, hierarchical_label, hierarchical_loc, hierarchical_part);
|
||||
}
|
||||
|
||||
// Free Shapes must have absolute placement and not explicit
|
||||
std::vector <TDF_Label> FreeLabels;
|
||||
std::vector <int> part_id;
|
||||
ocaf.getFreeLabels(hierarchical_label,FreeLabels, part_id);
|
||||
// Got issue with the colors as they are coming from the View Provider they can't be determined into
|
||||
// the App Code.
|
||||
std::vector< std::vector<App::Color> > Colors;
|
||||
ocaf.getPartColors(hierarchical_part,FreeLabels,part_id,Colors);
|
||||
ocaf.reallocateFreeShape(hierarchical_part,FreeLabels,part_id,Colors);
|
||||
std::vector<TDF_Label> FreeLabels;
|
||||
std::vector<int> part_id;
|
||||
ocaf.getFreeLabels(hierarchical_label, FreeLabels, part_id);
|
||||
// Got issue with the colors as they are coming from the View Provider they can't be
|
||||
// determined into the App Code.
|
||||
std::vector<std::vector<App::Color>> Colors;
|
||||
ocaf.getPartColors(hierarchical_part, FreeLabels, part_id, Colors);
|
||||
ocaf.reallocateFreeShape(hierarchical_part, FreeLabels, part_id, Colors);
|
||||
|
||||
XCAFDoc_DocumentTool::ShapeTool(hDoc->Main())->UpdateAssemblies();
|
||||
}
|
||||
|
||||
Base::FileInfo file(Utf8Name.c_str());
|
||||
if (file.hasExtension({"stp", "step"})) {
|
||||
ParameterGrp::handle hGrp_stp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Part/STEP");
|
||||
std::string scheme = hGrp_stp->GetASCII("Scheme", Part::Interface::writeStepScheme());
|
||||
ParameterGrp::handle hGrp_stp = App::GetApplication().GetParameterGroupByPath(
|
||||
"User parameter:BaseApp/Preferences/Mod/Part/STEP");
|
||||
std::string scheme =
|
||||
hGrp_stp->GetASCII("Scheme", Part::Interface::writeStepScheme());
|
||||
std::list<std::string> supported = Part::supportedSTEPSchemes();
|
||||
if (std::find(supported.begin(), supported.end(), scheme) != supported.end())
|
||||
if (std::find(supported.begin(), supported.end(), scheme) != supported.end()) {
|
||||
Part::Interface::writeStepScheme(scheme.c_str());
|
||||
}
|
||||
|
||||
STEPCAFControl_Writer writer;
|
||||
Part::Interface::writeStepAssembly(Part::Interface::Assembly::On);
|
||||
@@ -670,17 +725,27 @@ private:
|
||||
// edit STEP header
|
||||
APIHeaderSection_MakeHeader makeHeader(writer.ChangeWriter().Model());
|
||||
|
||||
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
|
||||
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Part")->GetGroup("STEP");
|
||||
Base::Reference<ParameterGrp> hGrp = App::GetApplication()
|
||||
.GetUserParameter()
|
||||
.GetGroup("BaseApp")
|
||||
->GetGroup("Preferences")
|
||||
->GetGroup("Mod/Part")
|
||||
->GetGroup("STEP");
|
||||
|
||||
// Don't set name because STEP doesn't support UTF-8
|
||||
// https://forum.freecad.org/viewtopic.php?f=8&t=52967
|
||||
makeHeader.SetAuthorValue (1, new TCollection_HAsciiString(hGrp->GetASCII("Author", "Author").c_str()));
|
||||
makeHeader.SetOrganizationValue (1, new TCollection_HAsciiString(hGrp->GetASCII("Company").c_str()));
|
||||
makeHeader.SetOriginatingSystem(new TCollection_HAsciiString(App::Application::getExecutableName().c_str()));
|
||||
makeHeader.SetAuthorValue(
|
||||
1,
|
||||
new TCollection_HAsciiString(hGrp->GetASCII("Author", "Author").c_str()));
|
||||
makeHeader.SetOrganizationValue(
|
||||
1,
|
||||
new TCollection_HAsciiString(hGrp->GetASCII("Company").c_str()));
|
||||
makeHeader.SetOriginatingSystem(
|
||||
new TCollection_HAsciiString(App::Application::getExecutableName().c_str()));
|
||||
makeHeader.SetDescriptionValue(1, new TCollection_HAsciiString("FreeCAD Model"));
|
||||
IFSelect_ReturnStatus ret = writer.Write(name8bit.c_str());
|
||||
if (ret == IFSelect_RetError || ret == IFSelect_RetFail || ret == IFSelect_RetStop) {
|
||||
if (ret == IFSelect_RetError || ret == IFSelect_RetFail
|
||||
|| ret == IFSelect_RetStop) {
|
||||
PyErr_Format(PyExc_IOError, "Cannot open file '%s'", Utf8Name.c_str());
|
||||
throw Py::Exception();
|
||||
}
|
||||
@@ -689,9 +754,12 @@ private:
|
||||
IGESControl_Controller::Init();
|
||||
IGESCAFControl_Writer writer;
|
||||
IGESData_GlobalSection header = writer.Model()->GlobalSection();
|
||||
header.SetAuthorName(new TCollection_HAsciiString(Part::Interface::writeIgesHeaderAuthor()));
|
||||
header.SetCompanyName(new TCollection_HAsciiString(Part::Interface::writeIgesHeaderCompany()));
|
||||
header.SetSendName(new TCollection_HAsciiString(Part::Interface::writeIgesHeaderProduct()));
|
||||
header.SetAuthorName(
|
||||
new TCollection_HAsciiString(Part::Interface::writeIgesHeaderAuthor()));
|
||||
header.SetCompanyName(
|
||||
new TCollection_HAsciiString(Part::Interface::writeIgesHeaderCompany()));
|
||||
header.SetSendName(
|
||||
new TCollection_HAsciiString(Part::Interface::writeIgesHeaderProduct()));
|
||||
writer.Model()->SetGlobalSection(header);
|
||||
writer.Transfer(hDoc);
|
||||
Standard_Boolean ret = writer.Write((const char*)name8bit.c_str());
|
||||
@@ -703,15 +771,16 @@ private:
|
||||
else if (file.hasExtension({"glb", "gltf"})) {
|
||||
#if OCC_VERSION_HEX >= 0x070500
|
||||
TColStd_IndexedDataMapOfStringString aMetadata;
|
||||
RWGltf_CafWriter aWriter (name8bit.c_str(), file.hasExtension("glb"));
|
||||
aWriter.SetTransformationFormat (RWGltf_WriterTrsfFormat_Compact);
|
||||
RWGltf_CafWriter aWriter(name8bit.c_str(), file.hasExtension("glb"));
|
||||
aWriter.SetTransformationFormat(RWGltf_WriterTrsfFormat_Compact);
|
||||
// https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#coordinate-system-and-units
|
||||
aWriter.ChangeCoordinateSystemConverter().SetInputLengthUnit (0.001);
|
||||
aWriter.ChangeCoordinateSystemConverter().SetInputCoordinateSystem (RWMesh_CoordinateSystem_Zup);
|
||||
aWriter.ChangeCoordinateSystemConverter().SetInputLengthUnit(0.001);
|
||||
aWriter.ChangeCoordinateSystemConverter().SetInputCoordinateSystem(
|
||||
RWMesh_CoordinateSystem_Zup);
|
||||
#if OCC_VERSION_HEX >= 0x070700
|
||||
aWriter.SetParallel(true);
|
||||
#endif
|
||||
Standard_Boolean ret = aWriter.Perform (hDoc, aMetadata, Message_ProgressRange());
|
||||
Standard_Boolean ret = aWriter.Perform(hDoc, aMetadata, Message_ProgressRange());
|
||||
if (!ret) {
|
||||
PyErr_Format(PyExc_IOError, "Cannot save to file '%s'", Utf8Name.c_str());
|
||||
throw Py::Exception();
|
||||
@@ -736,8 +805,9 @@ private:
|
||||
Py::Object ocaf(const Py::Tuple& args)
|
||||
{
|
||||
const char* Name;
|
||||
if (!PyArg_ParseTuple(args.ptr(), "s",&Name))
|
||||
if (!PyArg_ParseTuple(args.ptr(), "s", &Name)) {
|
||||
throw Py::Exception();
|
||||
}
|
||||
|
||||
try {
|
||||
Base::FileInfo file(Name);
|
||||
@@ -751,7 +821,7 @@ private:
|
||||
aReader.SetColorMode(true);
|
||||
aReader.SetNameMode(true);
|
||||
aReader.SetLayerMode(true);
|
||||
aReader.SetSHUOMode(true);
|
||||
aReader.SetSHUOMode(true);
|
||||
if (aReader.ReadFile((Standard_CString)Name) != IFSelect_RetDone) {
|
||||
throw Py::Exception(PyExc_IOError, "cannot read STEP file");
|
||||
}
|
||||
@@ -768,13 +838,17 @@ private:
|
||||
#endif
|
||||
}
|
||||
else if (file.hasExtension({"igs", "iges"})) {
|
||||
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
|
||||
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Part")->GetGroup("IGES");
|
||||
Base::Reference<ParameterGrp> hGrp = App::GetApplication()
|
||||
.GetUserParameter()
|
||||
.GetGroup("BaseApp")
|
||||
->GetGroup("Preferences")
|
||||
->GetGroup("Mod/Part")
|
||||
->GetGroup("IGES");
|
||||
IGESControl_Controller::Init();
|
||||
IGESCAFControl_Reader aReader;
|
||||
// http://www.opencascade.org/org/forum/thread_20603/?forum=3
|
||||
aReader.SetReadVisible(hGrp->GetBool("SkipBlankEntities", true)
|
||||
? Standard_True : Standard_False);
|
||||
aReader.SetReadVisible(hGrp->GetBool("SkipBlankEntities", true) ? Standard_True
|
||||
: Standard_False);
|
||||
aReader.SetColorMode(true);
|
||||
aReader.SetNameMode(true);
|
||||
aReader.SetLayerMode(true);
|
||||
@@ -794,7 +868,7 @@ private:
|
||||
#endif
|
||||
// http://opencascade.blogspot.de/2009/03/unnoticeable-memory-leaks-part-2.html
|
||||
Handle(IGESToBRep_Actor)::DownCast(aReader.WS()->TransferReader()->Actor())
|
||||
->SetModel(new IGESData_IGESModel);
|
||||
->SetModel(new IGESData_IGESModel);
|
||||
}
|
||||
else {
|
||||
throw Py::Exception(PyExc_IOError, "no supported file format");
|
||||
@@ -806,14 +880,14 @@ private:
|
||||
QTreeWidget* tree = new QTreeWidget();
|
||||
tree->setHeaderLabel(QString::fromLatin1("OCAF Browser"));
|
||||
|
||||
QVBoxLayout *layout = new QVBoxLayout;
|
||||
QVBoxLayout* layout = new QVBoxLayout;
|
||||
layout->addWidget(tree);
|
||||
dlg->setLayout(layout);
|
||||
|
||||
QDialogButtonBox* btn = new QDialogButtonBox(dlg);
|
||||
btn->setStandardButtons(QDialogButtonBox::Close);
|
||||
QObject::connect(btn, &QDialogButtonBox::rejected, dlg, &QDialog::reject);
|
||||
QHBoxLayout *boxlayout = new QHBoxLayout;
|
||||
QHBoxLayout* boxlayout = new QHBoxLayout;
|
||||
boxlayout->addWidget(btn);
|
||||
layout->addLayout(boxlayout);
|
||||
}
|
||||
@@ -843,4 +917,4 @@ PyObject* initModule()
|
||||
return Base::Interpreter().addModule(new Module);
|
||||
}
|
||||
|
||||
} // namespace ImportGui
|
||||
}// namespace ImportGui
|
||||
|
||||
Reference in New Issue
Block a user