Skip to content

Commit

Permalink
Path (and PathSimulator): Trim trailing Newlines
Browse files Browse the repository at this point in the history
  • Loading branch information
luzpaz authored and wwmayer committed Jul 14, 2024
1 parent 9c6e78b commit 8a14a7d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/Mod/CAM/Path/Main/Gui/SimulatorGL.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ def FindClosestEdge(self, edges, px, pz):
z2 = edge.valueAt(p2).z
if IsSame(px, rad2) and IsSame(pz, z2):
return edge, p2, p1
# sometimes a flat circle is without edge, so return edge with
# sometimes a flat circle is without edge, so return edge with
# same height and later a connecting edge will be interpolated
if IsSame(pz, z1):
return edge, p1, p2
if IsSame(pz, z2):
return edge, p2, p1
return edge, p2, p1
return None, 0.0, 0.0

def FindTopMostEdge(self, edges):
Expand All @@ -130,7 +130,7 @@ def FindTopMostEdge(self, edges):
maxz = z
return topedge, top_p1, top_p2

#the algo is based on locating the side edge that OCC creates on any revolved object
#the algo is based on locating the side edge that OCC creates on any revolved object
def GetToolProfile(self, tool, resolution):
shape = tool.Shape
sideEdgeList = []
Expand Down Expand Up @@ -177,7 +177,7 @@ def GetToolProfile(self, tool, resolution):
profile.append(startrad)
startz = edge.valueAt(p1).z
profile.append(startz)

return profile

def Activate(self):
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/CAM/Path/Post/scripts/generic_post.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def export(self):
def tooltip(self):

tooltip = """
This is a generic post processor.
This is a generic post processor.
It doesn't do anything yet because we haven't immplemented it.
Implementing it would be a good idea
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/CAM/PathSimulator/AppGL/SimShapes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ void MillSim::Shape::GenerateModel(float* vbuffer, GLushort* ibuffer, int numVer
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)offsetof(Vertex, x));
glEnableVertexAttribArray(1);
glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)offsetof(Vertex, nx));

numIndices = nIndices;
}

Expand Down

0 comments on commit 8a14a7d

Please sign in to comment.