electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix naming conflicts

Browse Source
This commit is contained in:
WandererFan
2017-01-29 19:40:34 -05:00
parent 42bb64736d
commit 84b858a142
26 changed files with 184 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mod/TechDraw/App/DrawViewSection.cpp
+3 -3
View File
@@ -81,7 +81,7 @@
#include "DrawUtil.h"
#include "DrawProjGroupItem.h"
#include "DrawProjectSplit.h"
#include "DrawCrosshatch.h"
#include "DrawGeomHatch.h"
#include "DrawViewSection.h"
using namespace TechDraw;
@@ -174,7 +174,7 @@ void DrawViewSection::onChanged(const App::Property* prop)
if ((!FileHatchPattern.isEmpty()) &&
(!NameGeomPattern.isEmpty())) {
std::vector<HatchLine> specs =
DrawCrosshatch::getDecodedSpecsFromFile(FileHatchPattern.getValue(),NameGeomPattern.getValue());
DrawGeomHatch::getDecodedSpecsFromFile(FileHatchPattern.getValue(),NameGeomPattern.getValue());
m_lineSets.clear();
for (auto& hl: specs) {
//hl.dump("hl from section");
@@ -539,7 +539,7 @@ Base::Vector3d DrawViewSection::getSectionVector (const std::string sectionName)
std::vector<LineSet> DrawViewSection::getDrawableLines(int i)
{
std::vector<LineSet> result;
result = DrawCrosshatch::getDrawableLines(this,m_lineSets,i,HatchScale.getValue());
result = DrawGeomHatch::getDrawableLines(this,m_lineSets,i,HatchScale.getValue());
return result;
}