Base: Move App::Color to Base
Every basic data type is stored in Base module, color is standing out as one that does not. Moving it to Base opens possibilities to integrate it better with the rest of FreeCAD.
This commit is contained in:
@@ -232,7 +232,7 @@ void ExportOCAF2::setupObject(TDF_Label label,
|
||||
return;
|
||||
}
|
||||
|
||||
std::map<std::string, std::map<std::string, App::Color>> colors;
|
||||
std::map<std::string, std::map<std::string, Base::Color>> colors;
|
||||
static std::string marker(App::DocumentObject::hiddenMarker() + "*");
|
||||
static std::array<const char*, 3> keys = {"Face*", "Edge*", marker.c_str()};
|
||||
std::string childName;
|
||||
@@ -280,7 +280,7 @@ void ExportOCAF2::setupObject(TDF_Label label,
|
||||
aColorTool->SetVisibility(nodeLabel, Standard_False);
|
||||
continue;
|
||||
}
|
||||
const App::Color& c = vv.second;
|
||||
const Base::Color& c = vv.second;
|
||||
Quantity_ColorRGBA color = Tools::convertColor(c);
|
||||
auto colorType = vv.first[0] == 'F' ? XCAFDoc_ColorSurf : XCAFDoc_ColorCurv;
|
||||
if (vv.first == "Face" || vv.first == "Edge") {
|
||||
|
||||
Reference in New Issue
Block a user