From e1d624b2cb9641b831ace47d3ddea09f82e0b4d3 Mon Sep 17 00:00:00 2001 From: Shai Seger Date: Fri, 27 Oct 2017 00:11:07 +0300 Subject: [PATCH] Fixed some non standard c++ operations. --- src/Mod/Path/PathSimulator/App/PathSim.cpp | 22 +++++++++++++++++++--- src/Mod/Path/PathSimulator/App/VolSim.cpp | 1 - 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/Mod/Path/PathSimulator/App/PathSim.cpp b/src/Mod/Path/PathSimulator/App/PathSim.cpp index b979a8eadb..4c77a6ddde 100644 --- a/src/Mod/Path/PathSimulator/App/PathSim.cpp +++ b/src/Mod/Path/PathSimulator/App/PathSim.cpp @@ -58,7 +58,7 @@ PathSim::~PathSim() void PathSim::BeginSimulation(Part::TopoShape * stock, float resolution) { - Base::BoundBox3d & bbox = stock->getBoundBox(); + Base::BoundBox3d bbox = stock->getBoundBox(); m_stock = new cStock(bbox.MinX, bbox.MinY, bbox.MinZ, bbox.LengthX(), bbox.LengthY(), bbox.LengthZ(), resolution); } @@ -76,6 +76,20 @@ void PathSim::SetCurrentTool(Tool * tool) tp = cSimTool::CHAMFER; angle = tool->CuttingEdgeAngle; break; + + case Tool::UNDEFINED: + case Tool::DRILL: + case Tool::CENTERDRILL: + case Tool::COUNTERSINK: + case Tool::COUNTERBORE: + case Tool::REAMER: + case Tool::TAP: + case Tool::ENDMILL: + case Tool::SLOTCUTTER: + case Tool::CORNERROUND: + case Tool::ENGRAVER: + break; // quiet warnings + } m_tool = new cSimTool(tp, tool->Diameter / 2.0, angle); } @@ -92,12 +106,14 @@ Base::Placement * PathSim::ApplyCommand(Base::Placement * pos, Command * cmd) } else if (cmd->Name == "G2") { - Point3D cent(cmd->getCenter()); + Vector3d vcent = cmd->getCenter(); + Point3D cent(vcent); m_stock->ApplyCircularTool(fromPos, toPos, cent, *m_tool, false); } else if (cmd->Name == "G3") { - Point3D cent(cmd->getCenter()); + Vector3d vcent = cmd->getCenter(); + Point3D cent(vcent); m_stock->ApplyCircularTool(fromPos, toPos, cent, *m_tool, true); } Base::Placement *plc = new Base::Placement(); diff --git a/src/Mod/Path/PathSimulator/App/VolSim.cpp b/src/Mod/Path/PathSimulator/App/VolSim.cpp index 55465d718d..801f100534 100644 --- a/src/Mod/Path/PathSimulator/App/VolSim.cpp +++ b/src/Mod/Path/PathSimulator/App/VolSim.cpp @@ -32,7 +32,6 @@ cStock::cStock(float px, float py, float pz, float lx, float ly, float lz, float { m_x = (int)(lx / res) + 1; m_y = (int)(ly / res) + 1; - int memsize = m_x * m_y; m_stock.Init(m_x, m_y); m_attr.Init(m_x, m_y); m_plane = pz + lz;