Updated layout

This commit is contained in:
Patrick F
2020-12-26 22:03:40 +01:00
parent 13c42c936b
commit daaed6f0ee
2 changed files with 289 additions and 228 deletions

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>372</width>
<height>466</height>
<width>381</width>
<height>452</height>
</rect>
</property>
<property name="windowTitle">
@@ -36,8 +36,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>354</width>
<height>418</height>
<width>363</width>
<height>403</height>
</rect>
</property>
<attribute name="label">
@@ -48,262 +48,324 @@
<rect>
<x>0</x>
<y>0</y>
<width>351</width>
<height>391</height>
<width>361</width>
<height>401</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>6</number>
</property>
<item row="6" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QCheckBox" name="chkLayers">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Apply Lead In/Out on all layers&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Include Layers</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkUseCRC">
<property name="text">
<string>Use Machine CRC</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Extend In:</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="dsbExtendIn">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Extend Out:</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="dsbExtendOut">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QCheckBox" name="chkLeadIn">
<property name="text">
<string>Enable LeadIn</string>
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkLeadOut">
<property name="text">
<string>Enable LeadOut</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Length / Radius:</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="dsbLen">
<property name="minimumSize">
<size>
<width>80</width>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
<width>180</width>
<height>190</height>
</size>
</property>
<property name="title">
<string>LeadIn</string>
</property>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>161</width>
<height>151</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QCheckBox" name="chkLeadIn">
<property name="text">
<string>Enable LeadIn</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Extend In:</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="dsbExtendIn">
<property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Style In:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cboStyleIn">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<item>
<property name="text">
<string>Arc</string>
</property>
</item>
<item>
<property name="text">
<string>Tangent</string>
</property>
</item>
<item>
<property name="text">
<string>Perpendicular</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="maximumSize">
<size>
<width>180</width>
<height>190</height>
</size>
</property>
<property name="title">
<string>LeadOut</string>
</property>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>161</width>
<height>151</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="chkLeadOut">
<property name="text">
<string>Enable LeadOut</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Extend Out:</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="dsbExtendOut">
<property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Style Out:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cboStyleOut">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<item>
<property name="text">
<string>Arc</string>
</property>
</item>
<item>
<property name="text">
<string>Tangent</string>
</property>
</item>
<item>
<property name="text">
<string>Perpendicular</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Style In:</string>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Length / Radius:</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="dsbLen">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QComboBox" name="cboStyleIn">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<property name="text">
<string>Arc</string>
</property>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Radius / Center:</string>
</property>
</widget>
</item>
<item>
<property name="text">
<string>Tangent</string>
</property>
<widget class="QComboBox" name="cboRadius">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<item>
<property name="text">
<string>Radius</string>
</property>
</item>
<item>
<property name="text">
<string>Center</string>
</property>
</item>
</widget>
</item>
<item>
<property name="text">
<string>Perpendicular</string>
</property>
</item>
</widget>
</layout>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Style Out:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cboStyleOut">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<property name="text">
<string>Arc</string>
</property>
<widget class="QCheckBox" name="chkKeepToolDown">
<property name="text">
<string>Keep Tool Down</string>
</property>
</widget>
</item>
<item>
<property name="text">
<string>Tangent</string>
</property>
<widget class="QCheckBox" name="chkRapidPlunge">
<property name="text">
<string>Rapid Plunge</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QCheckBox" name="chkLayers">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Apply Lead In/Out on all layers&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Include Layers</string>
</property>
</widget>
</item>
<item>
<property name="text">
<string>Perpendicular</string>
</property>
<widget class="QCheckBox" name="chkUseCRC">
<property name="text">
<string>Use Machine CRC</string>
</property>
</widget>
</item>
</widget>
</item>
</layout>
</item>
<item row="5" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QCheckBox" name="chkKeepToolDown">
<property name="text">
<string>Keep Tool Down</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkRapidPlunge">
<property name="text">
<string>Rapid Plunge</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Radius / Center:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cboRadius">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<item>
<property name="text">
<string>Radius</string>
</property>
</item>
<item>
<property name="text">
<string>Center</string>
</property>
</item>
</widget>
</layout>
</item>
</layout>
</item>

View File

@@ -26,7 +26,6 @@ from __future__ import print_function
import FreeCAD
import FreeCADGui
import Path
#import PathScripts.PathDressupLeadInOut as PathDressupLeadInOut
import PathScripts.PathDressup as PathDressup
import PathScripts.PathGeom as PathGeom
import PathScripts.PathLog as PathLog