From 6b5b1a7443bc17e42f4d806226a206ee5bcf19d3 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Thu, 7 Aug 2014 22:24:57 -0300 Subject: [PATCH] Raytracing: Using names instead of labels in exported files - fixes #1663 --- src/Mod/Raytracing/App/LuxFeature.cpp | 4 ++-- src/Mod/Raytracing/App/RayFeature.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/Raytracing/App/LuxFeature.cpp b/src/Mod/Raytracing/App/LuxFeature.cpp index 65c5804c6c78..4989cd363455 100644 --- a/src/Mod/Raytracing/App/LuxFeature.cpp +++ b/src/Mod/Raytracing/App/LuxFeature.cpp @@ -52,7 +52,7 @@ LuxFeature::LuxFeature(void) App::DocumentObjectExecReturn *LuxFeature::execute(void) { std::stringstream result; - std::string ViewName = Label.getValue(); + std::string ViewName = getNameInDocument(); App::DocumentObject* link = Source.getValue(); if (!link) @@ -60,7 +60,7 @@ App::DocumentObjectExecReturn *LuxFeature::execute(void) if (!link->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) return new App::DocumentObjectExecReturn("Linked object is not a Part object"); TopoDS_Shape shape = static_cast(link)->Shape.getShape()._Shape; - std::string Name(std::string("Lux_")+static_cast(link)->Label.getValue()); + std::string Name(std::string("Lux_")+static_cast(link)->getNameInDocument()); if (shape.IsNull()) return new App::DocumentObjectExecReturn("Linked shape object is empty"); diff --git a/src/Mod/Raytracing/App/RayFeature.cpp b/src/Mod/Raytracing/App/RayFeature.cpp index 4f249772adf5..879cd3c8449d 100644 --- a/src/Mod/Raytracing/App/RayFeature.cpp +++ b/src/Mod/Raytracing/App/RayFeature.cpp @@ -53,7 +53,7 @@ RayFeature::RayFeature(void) App::DocumentObjectExecReturn *RayFeature::execute(void) { std::stringstream result; - std::string ViewName = Label.getValue(); + std::string ViewName = getNameInDocument(); App::DocumentObject* link = Source.getValue(); if (!link) @@ -61,7 +61,7 @@ App::DocumentObjectExecReturn *RayFeature::execute(void) if (!link->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) return new App::DocumentObjectExecReturn("Linked object is not a Part object"); TopoDS_Shape shape = static_cast(link)->Shape.getShape()._Shape; - std::string Name(std::string("Pov_")+static_cast(link)->Label.getValue()); + std::string Name(std::string("Pov_")+static_cast(link)->getNameInDocument()); if (shape.IsNull()) return new App::DocumentObjectExecReturn("Linked shape object is empty");