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

Port to occ7.2:

Browse Source 
+ replace Quantity_Parameter with Standard_Real is it's marked deprecated
+ include NCollection_Vector as it's needed by STEPCAFControl_Writer
+ remove GC_MakeConicalSurface used for cone and distance as this was never implemented in any earlier occ version and has been removed now
This commit is contained in:
wmayer
2017-09-01 12:01:50 +02:00
parent aab07674d8
commit 473ea474ce
4 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@
# include <Python.h>
# include <climits>
# include <Standard_Version.hxx>
# include <NCollection_Vector.hxx>
# include <TDocStd_Document.hxx>
# include <XCAFApp_Application.hxx>
# include <TDocStd_Document.hxx>

9
src/Mod/Import/App/ImportOCAF.cpp
View File

@@ -28,6 +28,7 @@
#ifndef _PreComp_
# include <gp_Trsf.hxx>
# include <gp_Ax1.hxx>
# include <NCollection_Vector.hxx>
# include <BRepBuilderAPI_MakeShape.hxx>
# include <BRepAlgoAPI_Fuse.hxx>
# include <BRepAlgoAPI_Common.hxx>
@@ -593,7 +594,7 @@ int ExportOCAF::saveShape(Part::Feature* part, const std::vector<App::Color>& co
aShapeTool->SetShape(faceLabel, xp.Current());
const App::Color& color = colors[index-1];
Quantity_Parameter mat[3];
Standard_Real mat[3];
mat[0] = color.r;
mat[1] = color.g;
mat[2] = color.b;
@@ -605,7 +606,7 @@ int ExportOCAF::saveShape(Part::Feature* part, const std::vector<App::Color>& co
}
else if (!colors.empty()) {
App::Color color = colors.front();
Quantity_Parameter mat[3];
Standard_Real mat[3];
mat[0] = color.r;
mat[1] = color.g;
mat[2] = color.b;
@@ -681,7 +682,7 @@ void ExportOCAF::reallocateFreeShape(std::vector <App::DocumentObject*> hierarch
// TDF_Label faceLabel= TDF_TagSource::NewChild(label);
aShapeTool->SetShape(faceLabel, xp.Current());
const App::Color& color = colors[index-1];
Quantity_Parameter mat[3];
Standard_Real mat[3];
mat[0] = color.r;
mat[1] = color.g;
mat[2] = color.b;
@@ -694,7 +695,7 @@ void ExportOCAF::reallocateFreeShape(std::vector <App::DocumentObject*> hierarch
}
else if (!colors.empty()) {
App::Color color = colors.front();
Quantity_Parameter mat[3];
Standard_Real mat[3];
mat[0] = color.r;
mat[1] = color.g;
mat[2] = color.b;

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

@@ -30,6 +30,7 @@
# include <climits>
# include <QString>
# include <Standard_Version.hxx>
# include <NCollection_Vector.hxx>
# include <BRep_Builder.hxx>
# include <TDocStd_Document.hxx>
# include <XCAFApp_Application.hxx>

20
src/Mod/Part/App/ConePyImp.cpp
View File

@@ -123,26 +123,6 @@ int ConePy::PyInit(PyObject* args, PyObject* kwds)
}
PyObject *pCone;
double dist;
static char* keywords_cd[] = {"Cone","Distance",NULL};
PyErr_Clear();
if (PyArg_ParseTupleAndKeywords(args, kwds, "O!d", keywords_cd,
&(ConePy::Type), &pCone, &dist)) {
ConePy* pcCone = static_cast<ConePy*>(pCone);
Handle(Geom_ConicalSurface) pcone = Handle(Geom_ConicalSurface)::DownCast
(pcCone->getGeometryPtr()->handle());
GC_MakeConicalSurface mc(pcone->Cone(), dist);
if (!mc.IsDone()) {
PyErr_SetString(PartExceptionOCCError, gce_ErrorStatusText(mc.Status()));
return -1;
}
Handle(Geom_ConicalSurface) cone = Handle(Geom_ConicalSurface)::DownCast
(getGeometryPtr()->handle());
cone->SetCone(mc.Value()->Cone());
return 0;
}
static char* keywords_c[] = {"Cone",NULL};
PyErr_Clear();
if (PyArg_ParseTupleAndKeywords(args, kwds, "O!d", keywords_c,