suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

incorporating TechDraw findShapeOutline

Browse Source
This commit is contained in:
sliptonic 2016-11-10 17:43:50 -06:00
parent 7930db4e5c
commit a38006b5d5
5 changed files with 127 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Path/CMakeLists.txt
View File

@ -33,6 +33,7 @@ SET(PathScripts_SRCS
PathScripts/PathProfile.py
PathScripts/PathProfileEdges.py
PathScripts/PathContour.py
PathScripts/PathMillFace.py
PathScripts/PathPocket.py
PathScripts/PathDrilling.py
PathScripts/PathDressup.py

1
src/Mod/Path/Gui/Resources/Path.qrc
View File

@ -85,6 +85,7 @@
<file>panels/ToolEdit.ui</file>
<file>panels/DlgJobChooser.ui</file>
<file>panels/ContourEdit.ui</file>
<file>panels/MillFaceEdit.ui</file>
<file>panels/ProfileEdgesEdit.ui</file>
<file>panels/DogboneEdit.ui</file>
<file>panels/DlgSelectPostProcessor.ui</file>

112
src/Mod/Path/Gui/Resources/panels/MillFaceEdit.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>352</width>
<height>525</height>
<width>351</width>
<height>520</height>
</rect>
</property>
<property name="minimumSize">
@ -33,12 +33,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<height>329</height>
<width>333</width>
<height>353</height>
</rect>
</property>
<attribute name="icon">
<iconset resource="../../../FreeCAD/src/Mod/Path/Gui/Resources/Path.qrc">
<iconset resource="../Path.qrc">
<normaloff>:/icons/Path-BaseGeometry.svg</normaloff>:/icons/Path-BaseGeometry.svg</iconset>
</attribute>
<attribute name="label">
@ -111,12 +111,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<height>329</height>
<width>333</width>
<height>324</height>
</rect>
</property>
<attribute name="icon">
<iconset resource="../../../FreeCAD/src/Mod/Path/Gui/Resources/Path.qrc">
<iconset resource="../Path.qrc">
<normaloff>:/icons/Path-Depths.svg</normaloff>:/icons/Path-Depths.svg</iconset>
</attribute>
<attribute name="label">
@ -192,12 +192,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<height>329</height>
<width>333</width>
<height>324</height>
</rect>
</property>
<attribute name="icon">
<iconset resource="../../../FreeCAD/src/Mod/Path/Gui/Resources/Path.qrc">
<iconset resource="../Path.qrc">
<normaloff>:/icons/Path-Heights.svg</normaloff>:/icons/Path-Heights.svg</iconset>
</attribute>
<attribute name="label">
@ -237,27 +237,13 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="Entry">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<height>329</height>
</rect>
</property>
<attribute name="label">
<string>Entry</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3"/>
</widget>
<widget class="QWidget" name="Pattern">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<height>329</height>
<width>333</width>
<height>353</height>
</rect>
</property>
<attribute name="label">
@ -330,22 +316,19 @@
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<height>329</height>
<width>333</width>
<height>353</height>
</rect>
</property>
<attribute name="icon">
<iconset resource="../../../FreeCAD/src/Mod/Path/Gui/Resources/Path.qrc">
<iconset resource="../Path.qrc">
<normaloff>:/icons/Path-OperationB.svg</normaloff>:/icons/Path-OperationB.svg</iconset>
</attribute>
<attribute name="label">
<string>Operation</string>
</attribute>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="3" column="0" colspan="2">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QWidget" name="widget_3" native="true">
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
@ -372,7 +355,7 @@
</layout>
</widget>
</item>
<item row="4" column="0" colspan="2">
<item>
<widget class="QWidget" name="widget_2" native="true">
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
@ -385,22 +368,69 @@
</layout>
</widget>
</item>
<item row="5" column="0" colspan="2">
<item>
<widget class="QWidget" name="widget_4" native="true">
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Material Allowance</string>
<string>Pass Extension</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="extraOffset"/>
<widget class="QDoubleSpinBox" name="extraOffset">
<property name="minimum">
<double>-99.000000000000000</double>
</property>
<property name="maximum">
<double>99.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="widget_5" native="true">
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Boundary Shape</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="boundaryShape">
<item>
<property name="text">
<string>Model Perimeter</string>
</property>
</item>
<item>
<property name="text">
<string>Model Boundbox</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>116</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
@ -415,8 +445,8 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../FreeCAD/src/Mod/Path/Gui/Resources/Path.qrc"/>
<include location="../../../FreeCAD/src/Mod/Path/Gui/Resources/Path.qrc"/>
<include location="../Path.qrc"/>
<include location="../Path.qrc"/>
</resources>
<connections/>
</ui>

4
src/Mod/Path/PathScripts/PathContour.py
View File

@ -25,6 +25,7 @@
import FreeCAD
import Path
from FreeCAD import Vector
import TechDraw
from PathScripts import PathUtils
from PathScripts.PathUtils import depth_params
@ -246,8 +247,7 @@ class ObjectContour:
baseobject = parentJob.Base
if baseobject is None:
return
print "base object: " + baseobject.Name
contourwire = PathUtils.silhouette(baseobject)
contourwire = TechDraw.findShapeOutline(baseobject.Shape,1, Vector(0,0,1))
edgelist = contourwire.Edges
edgelist = Part.__sortEdges__(edgelist)

69
src/Mod/Path/PathScripts/PathMillFace.py
View File

@ -29,6 +29,11 @@ from PathScripts import PathUtils
import Part
import PathScripts.PathKurveUtils
import area
import TechDraw
import Drawing
import DraftGeomUtils
from FreeCAD import Vector
import Arch
FreeCADGui = None
if FreeCAD.GuiUp:
@ -74,7 +79,7 @@ class ObjectFace:
# Face Properties
obj.addProperty("App::PropertyEnumeration", "CutMode", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property","The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW"))
obj.CutMode = ['Climb', 'Conventional']
obj.addProperty("App::PropertyDistance", "MaterialAllowance", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property","Amount of material to leave"))
obj.addProperty("App::PropertyDistance", "PassExtension", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property","How far the cutter should extend past the boundary"))
obj.addProperty("App::PropertyEnumeration", "StartAt", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property","Start Faceing at center or boundary"))
obj.StartAt = ['Center', 'Edge']
obj.addProperty("App::PropertyPercent", "StepOver", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property","Percent of cutter diameter to step over on each pass"))
@ -83,6 +88,8 @@ class ObjectFace:
obj.addProperty("App::PropertyBool", "ZigUnidirectional", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property","Lifts tool at the end of each pass to respect cut mode."))
obj.addProperty("App::PropertyBool", "UseZigZag", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property","Use Zig Zag pattern to clear area."))
obj.addProperty("App::PropertyFloat", "ZigZagAngle", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property","Angle of the zigzag pattern"))
obj.addProperty("App::PropertyEnumeration", "BoundaryShape", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property","Shape to use for calculating Boundary"))
obj.BoundaryShape = ['Perimeter', 'BoundBox']
# Start Point Properties
@ -170,7 +177,7 @@ class ObjectFace:
obj.FinishDepth.Value,
obj.FinalDepth.Value)
extraoffset = obj.MaterialAllowance.Value
extraoffset = 1 - obj.PassExtension.Value
stepover = (self.radius * 2) * (float(obj.StepOver)/100)
use_zig_zag = obj.UseZigZag
zig_angle = obj.ZigZagAngle
@ -246,15 +253,22 @@ class ObjectFace:
#Facing is done either against base object
if obj.Base:
faces = []
for b in obj.Base:
print (b)
for sub in b[1]:
if "Face" in sub:
shape = getattr(b[0].Shape, sub)
wire = shape.OuterWire
edgelist = wire.Edges
shape = getattr(b[0].Shape, sub)
if isinstance (shape, Part.Face):
groups = Drawing.project(shape, Vector(0,0,1))
if len(groups[0].Edges) > 0:
p = DraftGeomUtils.superWire(groups[0].Edges, closed=True)
w = []
w.append(p)
faces.append(Arch.makeFace(w))
else:
print ('falling out')
return
contourwire = TechDraw.findShapeOutline(faces[0].multiFuse(faces[1:]).removeSplitter(), 1, Vector(0,0,1))
print ('269: contourwire', contourwire)
#If no base object, do planing of top surface of entire model
else:
@ -264,10 +278,20 @@ class ObjectFace:
baseobject = parentJob.Base
if baseobject is None:
return
print "Plane base object: " + baseobject.Name
contourwire = PathUtils.silhouette(baseobject)
edgelist = contourwire.Edges
edgelist = Part.__sortEdges__(edgelist)
# print "Plane base object: " + baseobject.Name
contourwire = TechDraw.findShapeOutline(baseobject.Shape, 1, Vector(0,0,1))
print ('281: contourwire', contourwire)
if obj.BoundaryShape == 'BoundBox':
print 'boundbox'
bb = contourwire.BoundBox
bbperim = Part.makeBox(bb.XLength, bb.YLength, 1, Vector(bb.XMin, bb.YMin, bb.ZMin), Vector(0,0,1))
contourwire = TechDraw.findShapeOutline(bbperim, 1, Vector(0,0,1))
else:
print 'perimeter'
edgelist = contourwire.Edges
edgelist = Part.__sortEdges__(edgelist)
#use libarea to build the pattern
a = area.Area()
@ -312,8 +336,8 @@ class ViewProviderFace:
FreeCADGui.Control.closeDialog()
taskd = TaskPanel()
taskd.obj = vobj.Object
FreeCADGui.Control.showDialog(taskd)
taskd.setupUi()
FreeCADGui.Control.showDialog(taskd)
return True
def getIcon(self):
@ -385,8 +409,8 @@ else:
class TaskPanel:
def __init__(self):
self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/MillFaceEdit.ui")
#self.form = FreeCADGui.PySideUic.loadUi(":/panels/MillFaceEdit.ui")
#self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/MillFaceEdit.ui")
self.form = FreeCADGui.PySideUic.loadUi(":/panels/MillFaceEdit.ui")
self.updating = False
def accept(self):
@ -408,14 +432,16 @@ class TaskPanel:
self.obj.StartDepth = self.form.startDepth.text()
if hasattr(self.obj, "FinalDepth"):
self.obj.FinalDepth = self.form.finalDepth.text()
if hasattr(self.obj, "FinishDepth"):
self.obj.FinishDepth = self.form.finishDepth.text()
if hasattr(self.obj, "SafeHeight"):
self.obj.SafeHeight = self.form.safeHeight.text()
if hasattr(self.obj, "ClearanceHeight"):
self.obj.ClearanceHeight = self.form.clearanceHeight.text()
if hasattr(self.obj, "StepDown"):
self.obj.StepDown = self.form.stepDown.value()
if hasattr(self.obj, "MaterialAllowance"):
self.obj.MaterialAllowance = self.form.extraOffset.value()
if hasattr(self.obj, "PassExtensioon"):
self.obj.PassExtension = self.form.extraOffset.value()
if hasattr(self.obj, "UseStartPoint"):
self.obj.UseStartPoint = self.form.useStartPoint.isChecked()
if hasattr(self.obj, "CutMode"):
@ -434,10 +460,11 @@ class TaskPanel:
def setFields(self):
self.form.startDepth.setText(str(self.obj.StartDepth.Value))
self.form.finalDepth.setText(str(self.obj.FinalDepth.Value))
self.form.finishDepth.setText(str(self.obj.FinishDepth.Value))
self.form.safeHeight.setText(str(self.obj.SafeHeight.Value))
self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value))
self.form.stepDown.setValue(self.obj.StepDown)
self.form.extraOffset.setValue(self.obj.MaterialAllowance.Value)
self.form.extraOffset.setValue(self.obj.PassExtension.Value)
self.form.useStartPoint.setChecked(self.obj.UseStartPoint)
self.form.useZigZag.setChecked(self.obj.UseZigZag)
self.form.zigZagUnidirectional.setChecked(self.obj.ZigUnidirectional)
@ -523,6 +550,12 @@ class TaskPanel:
if not self.updating:
self.resetObject()
def resetObject(self, remove=None):
"transfers the values from the widget to the object"
self.obj.touch()
FreeCAD.ActiveDocument.recompute()
def setupUi(self):
# Connect Signals and Slots
@ -535,6 +568,7 @@ class TaskPanel:
# Depths
self.form.startDepth.editingFinished.connect(self.getFields)
self.form.finalDepth.editingFinished.connect(self.getFields)
self.form.finishDepth.editingFinished.connect(self.getFields)
self.form.stepDown.editingFinished.connect(self.getFields)
# Heights
@ -545,6 +579,7 @@ class TaskPanel:
self.form.cutMode.currentIndexChanged.connect(self.getFields)
self.form.useStartPoint.clicked.connect(self.getFields)
self.form.extraOffset.editingFinished.connect(self.getFields)
self.form.boundaryShape.currentIndexChanged.connect(self.getFields)
# Pattern
self.form.stepOverPercent.editingFinished.connect(self.getFields)