From 62d4e306709ecd427c0fc3bd5cc272e8fa9e303b Mon Sep 17 00:00:00 2001 From: Rentlau Date: Tue, 17 Mar 2015 18:56:47 +0100 Subject: [PATCH] Release of 2015-03-15 : Modification : Cut in two parts TAB "Points" and TAB "Axis" Addition : into "Ori. Pref." TAB : bi Color flag Change the successive lines to be bicolor (red and white) for the following functions: - in "Axis 1/2" TAB: Axes=Cut(Wire) - in "Circle" TAB: Arcs=Cut(Circle) into "Points 1/2" TAB : Points = Cut (wire) Create Points by Partition: Cut the selected wire(s) in 2(n) parts and create 2(n) Points with function discretize. The number indicates in how many parts to cut. Wires can be: Line Circle Arc Ellipse An object must also be seleted but before any Wire to cut all his edges! into "Axis 1/2" TAB : Axes=Cut(Wire) Create Axes by Partition: Cut the selected wire(s) in 2(n) parts and create 2(n) Axes with function discretize. The number indicates in how many parts to cut. Wires can be: Line Circle Arc Ellipse An object must also be seleted but before any Wire to cut all his Edges! NB: You can change the successive lines to be bicolor (red and white) in "Ori. Pref." TAB into "Check" TAB : Clearance ? Check for two Objects Clearance distance: Quick measurements between parallel faces and similarly placed objects - Select the 2 Objects and Click this button --- WorkFeature/Icons/WF_check.svg | 306 ++++ WorkFeature/Icons/WF_cutWireAxes.svg | 346 ++++ WorkFeature/Icons/WF_cutWirePoints.svg | 401 +++++ WorkFeature/Icons/WF_isClearance.svg | 721 +++++++++ WorkFeature/WFGui_2015.py | 1147 +++++++------ WorkFeature/WFGui_2015.ui | 2048 ++++++++++++++---------- WorkFeature/__init__.py | 358 ++++- 7 files changed, 3942 insertions(+), 1385 deletions(-) create mode 100644 WorkFeature/Icons/WF_check.svg create mode 100644 WorkFeature/Icons/WF_cutWireAxes.svg create mode 100644 WorkFeature/Icons/WF_cutWirePoints.svg create mode 100644 WorkFeature/Icons/WF_isClearance.svg diff --git a/WorkFeature/Icons/WF_check.svg b/WorkFeature/Icons/WF_check.svg new file mode 100644 index 0000000..e0a6107 --- /dev/null +++ b/WorkFeature/Icons/WF_check.svg @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + ? + + diff --git a/WorkFeature/Icons/WF_cutWireAxes.svg b/WorkFeature/Icons/WF_cutWireAxes.svg new file mode 100644 index 0000000..99e1b27 --- /dev/null +++ b/WorkFeature/Icons/WF_cutWireAxes.svg @@ -0,0 +1,346 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_cutWirePoints.svg b/WorkFeature/Icons/WF_cutWirePoints.svg new file mode 100644 index 0000000..978d904 --- /dev/null +++ b/WorkFeature/Icons/WF_cutWirePoints.svg @@ -0,0 +1,401 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_isClearance.svg b/WorkFeature/Icons/WF_isClearance.svg new file mode 100644 index 0000000..299eabc --- /dev/null +++ b/WorkFeature/Icons/WF_isClearance.svg @@ -0,0 +1,721 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + ? + + diff --git a/WorkFeature/WFGui_2015.py b/WorkFeature/WFGui_2015.py index 98ca6bf..660557a 100644 --- a/WorkFeature/WFGui_2015.py +++ b/WorkFeature/WFGui_2015.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'WFGui_2015_03_08.ui' +# Form implementation generated from reading ui file 'WFGui_2015_03_15.ui' # -# Created: Sun Mar 8 15:24:14 2015 +# Created: Sun Mar 15 19:17:19 2015 # by: PySide UI code generator 4.9.1 # # WARNING! All changes made in this file will be lost! @@ -17,31 +17,20 @@ except AttributeError: class Ui_Form(object): def setupUi(self, Form): Form.setObjectName(_fromUtf8("Form")) - Form.resize(387, 838) + Form.resize(378, 693) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Axes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) Form.setWindowIcon(icon) - self.gridLayout_32 = QtGui.QGridLayout(Form) - self.gridLayout_32.setObjectName(_fromUtf8("gridLayout_32")) - self.horizontalLayout_9 = QtGui.QHBoxLayout() - self.horizontalLayout_9.setObjectName(_fromUtf8("horizontalLayout_9")) - self.button_WF_quit = QtGui.QPushButton(Form) - self.button_WF_quit.setObjectName(_fromUtf8("button_WF_quit")) - self.horizontalLayout_9.addWidget(self.button_WF_quit) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_9.addItem(spacerItem) - self.label_release = QtGui.QLabel(Form) - self.label_release.setObjectName(_fromUtf8("label_release")) - self.horizontalLayout_9.addWidget(self.label_release) - self.gridLayout_32.addLayout(self.horizontalLayout_9, 1, 0, 1, 1) + self.gridLayout_37 = QtGui.QGridLayout(Form) + self.gridLayout_37.setObjectName(_fromUtf8("gridLayout_37")) self.scrollArea = QtGui.QScrollArea(Form) self.scrollArea.setWidgetResizable(True) self.scrollArea.setObjectName(_fromUtf8("scrollArea")) self.scrollAreaWidgetContents_2 = QtGui.QWidget() - self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 351, 813)) + self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 358, 638)) self.scrollAreaWidgetContents_2.setObjectName(_fromUtf8("scrollAreaWidgetContents_2")) - self.gridLayout_4 = QtGui.QGridLayout(self.scrollAreaWidgetContents_2) - self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) + self.gridLayout_9 = QtGui.QGridLayout(self.scrollAreaWidgetContents_2) + self.gridLayout_9.setObjectName(_fromUtf8("gridLayout_9")) self.tabWidget_0 = QtGui.QTabWidget(self.scrollAreaWidgetContents_2) self.tabWidget_0.setTabPosition(QtGui.QTabWidget.South) self.tabWidget_0.setObjectName(_fromUtf8("tabWidget_0")) @@ -54,13 +43,13 @@ class Ui_Form(object): self.tabWidget.setObjectName(_fromUtf8("tabWidget")) self.Origin_Tab = QtGui.QWidget() self.Origin_Tab.setObjectName(_fromUtf8("Origin_Tab")) - self.gridLayout_31 = QtGui.QGridLayout(self.Origin_Tab) - self.gridLayout_31.setObjectName(_fromUtf8("gridLayout_31")) + self.gridLayout_5 = QtGui.QGridLayout(self.Origin_Tab) + self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5")) self.button_origin = QtGui.QPushButton(self.Origin_Tab) self.button_origin.setIcon(icon) self.button_origin.setIconSize(QtCore.QSize(32, 32)) self.button_origin.setObjectName(_fromUtf8("button_origin")) - self.gridLayout_31.addWidget(self.button_origin, 0, 0, 1, 1) + self.gridLayout_5.addWidget(self.button_origin, 0, 0, 1, 1) self.frame_3 = QtGui.QFrame(self.Origin_Tab) self.frame_3.setFrameShape(QtGui.QFrame.StyledPanel) self.frame_3.setFrameShadow(QtGui.QFrame.Raised) @@ -69,11 +58,16 @@ class Ui_Form(object): self.gridLayout_14.setObjectName(_fromUtf8("gridLayout_14")) self.groupBox_5 = QtGui.QGroupBox(self.frame_3) self.groupBox_5.setObjectName(_fromUtf8("groupBox_5")) - self.gridLayout_7 = QtGui.QGridLayout(self.groupBox_5) - self.gridLayout_7.setObjectName(_fromUtf8("gridLayout_7")) + self.gridLayout_3 = QtGui.QGridLayout(self.groupBox_5) + self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) self.radioButton_verbose = QtGui.QRadioButton(self.groupBox_5) + self.radioButton_verbose.setAutoExclusive(False) self.radioButton_verbose.setObjectName(_fromUtf8("radioButton_verbose")) - self.gridLayout_7.addWidget(self.radioButton_verbose, 0, 0, 1, 1) + self.gridLayout_3.addWidget(self.radioButton_verbose, 0, 0, 1, 1) + self.radioButton_biColor = QtGui.QRadioButton(self.groupBox_5) + self.radioButton_biColor.setAutoExclusive(False) + self.radioButton_biColor.setObjectName(_fromUtf8("radioButton_biColor")) + self.gridLayout_3.addWidget(self.radioButton_biColor, 1, 0, 1, 1) self.horizontalLayout_25 = QtGui.QHBoxLayout() self.horizontalLayout_25.setObjectName(_fromUtf8("horizontalLayout_25")) self.label_5 = QtGui.QLabel(self.groupBox_5) @@ -83,84 +77,35 @@ class Ui_Form(object): self.tolerance_edit.setMaximumSize(QtCore.QSize(60, 16777215)) self.tolerance_edit.setObjectName(_fromUtf8("tolerance_edit")) self.horizontalLayout_25.addWidget(self.tolerance_edit) - self.gridLayout_7.addLayout(self.horizontalLayout_25, 1, 0, 1, 1) + self.gridLayout_3.addLayout(self.horizontalLayout_25, 2, 0, 1, 1) self.gridLayout_14.addWidget(self.groupBox_5, 0, 0, 1, 1) - self.gridLayout_31.addWidget(self.frame_3, 1, 0, 1, 1) - spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_31.addItem(spacerItem1, 2, 0, 1, 1) + self.gridLayout_5.addWidget(self.frame_3, 1, 0, 1, 1) + spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_5.addItem(spacerItem, 2, 0, 1, 1) self.tabWidget.addTab(self.Origin_Tab, icon, _fromUtf8("")) - self.Point_Tab = QtGui.QWidget() - self.Point_Tab.setObjectName(_fromUtf8("Point_Tab")) - self.gridLayout_3 = QtGui.QGridLayout(self.Point_Tab) - self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) - self.horizontalLayout_10 = QtGui.QHBoxLayout() - self.horizontalLayout_10.setObjectName(_fromUtf8("horizontalLayout_10")) - self.button_object_center = QtGui.QPushButton(self.Point_Tab) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_center.setIcon(icon1) - self.button_object_center.setIconSize(QtCore.QSize(32, 32)) - self.button_object_center.setObjectName(_fromUtf8("button_object_center")) - self.horizontalLayout_10.addWidget(self.button_object_center) - self.checkBox_object_center = QtGui.QCheckBox(self.Point_Tab) - self.checkBox_object_center.setObjectName(_fromUtf8("checkBox_object_center")) - self.horizontalLayout_10.addWidget(self.checkBox_object_center) - self.gridLayout_3.addLayout(self.horizontalLayout_10, 0, 0, 1, 1) - self.button_Npoints_center = QtGui.QPushButton(self.Point_Tab) - icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_Npoints_center.setIcon(icon2) - self.button_Npoints_center.setIconSize(QtCore.QSize(32, 32)) - self.button_Npoints_center.setObjectName(_fromUtf8("button_Npoints_center")) - self.gridLayout_3.addWidget(self.button_Npoints_center, 1, 0, 1, 1) - self.horizontalLayout_6 = QtGui.QHBoxLayout() - self.horizontalLayout_6.setObjectName(_fromUtf8("horizontalLayout_6")) - self.button_line_center = QtGui.QPushButton(self.Point_Tab) - icon3 = QtGui.QIcon() - icon3.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_center.setIcon(icon3) - self.button_line_center.setIconSize(QtCore.QSize(32, 32)) - self.button_line_center.setObjectName(_fromUtf8("button_line_center")) - self.horizontalLayout_6.addWidget(self.button_line_center) - self.spin_line_center = QtGui.QSpinBox(self.Point_Tab) - self.spin_line_center.setMinimumSize(QtCore.QSize(40, 0)) - self.spin_line_center.setMaximumSize(QtCore.QSize(50, 16777215)) - self.spin_line_center.setMinimum(2) - self.spin_line_center.setMaximum(10) - self.spin_line_center.setSingleStep(1) - self.spin_line_center.setObjectName(_fromUtf8("spin_line_center")) - self.horizontalLayout_6.addWidget(self.spin_line_center) - self.gridLayout_3.addLayout(self.horizontalLayout_6, 2, 0, 1, 1) - self.button_line_extrema = QtGui.QPushButton(self.Point_Tab) - icon4 = QtGui.QIcon() - icon4.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_extremaLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_extrema.setIcon(icon4) - self.button_line_extrema.setIconSize(QtCore.QSize(32, 32)) - self.button_line_extrema.setObjectName(_fromUtf8("button_line_extrema")) - self.gridLayout_3.addWidget(self.button_line_extrema, 3, 0, 1, 1) - self.button_circle_center = QtGui.QPushButton(self.Point_Tab) - icon5 = QtGui.QIcon() - icon5.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerCirclePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_circle_center.setIcon(icon5) - self.button_circle_center.setIconSize(QtCore.QSize(32, 32)) - self.button_circle_center.setObjectName(_fromUtf8("button_circle_center")) - self.gridLayout_3.addWidget(self.button_circle_center, 4, 0, 1, 1) + self.Point_Tab1 = QtGui.QWidget() + self.Point_Tab1.setObjectName(_fromUtf8("Point_Tab1")) + self.gridLayout_7 = QtGui.QGridLayout(self.Point_Tab1) + self.gridLayout_7.setObjectName(_fromUtf8("gridLayout_7")) + spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_7.addItem(spacerItem1, 9, 0, 1, 1) self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout.setSizeConstraint(QtGui.QLayout.SetFixedSize) self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.button_point_on_line = QtGui.QPushButton(self.Point_Tab) + self.button_point_on_line = QtGui.QPushButton(self.Point_Tab1) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_point_on_line.sizePolicy().hasHeightForWidth()) self.button_point_on_line.setSizePolicy(sizePolicy) - icon6 = QtGui.QIcon() - icon6.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_alongLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_on_line.setIcon(icon6) + self.button_point_on_line.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_alongLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_on_line.setIcon(icon1) self.button_point_on_line.setIconSize(QtCore.QSize(32, 32)) self.button_point_on_line.setObjectName(_fromUtf8("button_point_on_line")) self.horizontalLayout.addWidget(self.button_point_on_line) - self.distance_point_on_line = QtGui.QLineEdit(self.Point_Tab) + self.distance_point_on_line = QtGui.QLineEdit(self.Point_Tab1) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -170,137 +115,220 @@ class Ui_Form(object): self.distance_point_on_line.setMaximumSize(QtCore.QSize(60, 16777215)) self.distance_point_on_line.setObjectName(_fromUtf8("distance_point_on_line")) self.horizontalLayout.addWidget(self.distance_point_on_line) - self.gridLayout_3.addLayout(self.horizontalLayout, 5, 0, 1, 1) - self.button_face_center = QtGui.QPushButton(self.Point_Tab) + self.gridLayout_7.addLayout(self.horizontalLayout, 5, 0, 1, 1) + self.horizontalLayout_10 = QtGui.QHBoxLayout() + self.horizontalLayout_10.setObjectName(_fromUtf8("horizontalLayout_10")) + self.button_object_center = QtGui.QPushButton(self.Point_Tab1) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_center.setIcon(icon2) + self.button_object_center.setIconSize(QtCore.QSize(32, 32)) + self.button_object_center.setObjectName(_fromUtf8("button_object_center")) + self.horizontalLayout_10.addWidget(self.button_object_center) + self.checkBox_object_center = QtGui.QCheckBox(self.Point_Tab1) + self.checkBox_object_center.setObjectName(_fromUtf8("checkBox_object_center")) + self.horizontalLayout_10.addWidget(self.checkBox_object_center) + self.gridLayout_7.addLayout(self.horizontalLayout_10, 0, 0, 1, 1) + self.horizontalLayout_6 = QtGui.QHBoxLayout() + self.horizontalLayout_6.setObjectName(_fromUtf8("horizontalLayout_6")) + self.button_line_center = QtGui.QPushButton(self.Point_Tab1) + self.button_line_center.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon3 = QtGui.QIcon() + icon3.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_center.setIcon(icon3) + self.button_line_center.setIconSize(QtCore.QSize(32, 32)) + self.button_line_center.setObjectName(_fromUtf8("button_line_center")) + self.horizontalLayout_6.addWidget(self.button_line_center) + self.spin_line_center = QtGui.QSpinBox(self.Point_Tab1) + self.spin_line_center.setMinimumSize(QtCore.QSize(40, 0)) + self.spin_line_center.setMaximumSize(QtCore.QSize(50, 16777215)) + self.spin_line_center.setMinimum(2) + self.spin_line_center.setMaximum(100) + self.spin_line_center.setSingleStep(1) + self.spin_line_center.setObjectName(_fromUtf8("spin_line_center")) + self.horizontalLayout_6.addWidget(self.spin_line_center) + self.gridLayout_7.addLayout(self.horizontalLayout_6, 2, 0, 1, 1) + self.button_circle_center = QtGui.QPushButton(self.Point_Tab1) + icon4 = QtGui.QIcon() + icon4.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerCirclePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_circle_center.setIcon(icon4) + self.button_circle_center.setIconSize(QtCore.QSize(32, 32)) + self.button_circle_center.setObjectName(_fromUtf8("button_circle_center")) + self.gridLayout_7.addWidget(self.button_circle_center, 4, 0, 1, 1) + self.button_Npoints_center = QtGui.QPushButton(self.Point_Tab1) + icon5 = QtGui.QIcon() + icon5.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_Npoints_center.setIcon(icon5) + self.button_Npoints_center.setIconSize(QtCore.QSize(32, 32)) + self.button_Npoints_center.setObjectName(_fromUtf8("button_Npoints_center")) + self.gridLayout_7.addWidget(self.button_Npoints_center, 1, 0, 1, 1) + self.button_line_extrema = QtGui.QPushButton(self.Point_Tab1) + icon6 = QtGui.QIcon() + icon6.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_extremaLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_extrema.setIcon(icon6) + self.button_line_extrema.setIconSize(QtCore.QSize(32, 32)) + self.button_line_extrema.setObjectName(_fromUtf8("button_line_extrema")) + self.gridLayout_7.addWidget(self.button_line_extrema, 3, 0, 1, 1) + self.button_point_face_point = QtGui.QPushButton(self.Point_Tab1) icon7 = QtGui.QIcon() - icon7.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_face_center.setIcon(icon7) - self.button_face_center.setIconSize(QtCore.QSize(32, 32)) - self.button_face_center.setObjectName(_fromUtf8("button_face_center")) - self.gridLayout_3.addWidget(self.button_face_center, 6, 0, 1, 1) - self.button_line_face_point = QtGui.QPushButton(self.Point_Tab) - icon8 = QtGui.QIcon() - icon8.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_face_point.setIcon(icon8) - self.button_line_face_point.setIconSize(QtCore.QSize(32, 32)) - self.button_line_face_point.setObjectName(_fromUtf8("button_line_face_point")) - self.gridLayout_3.addWidget(self.button_line_face_point, 7, 0, 1, 1) - self.button_point_line_point = QtGui.QPushButton(self.Point_Tab) - icon9 = QtGui.QIcon() - icon9.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_line_point.setIcon(icon9) - self.button_point_line_point.setIconSize(QtCore.QSize(32, 32)) - self.button_point_line_point.setObjectName(_fromUtf8("button_point_line_point")) - self.gridLayout_3.addWidget(self.button_point_line_point, 8, 0, 1, 1) - self.button_point_face_point = QtGui.QPushButton(self.Point_Tab) - icon10 = QtGui.QIcon() - icon10.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_face_point.setIcon(icon10) + icon7.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_face_point.setIcon(icon7) self.button_point_face_point.setIconSize(QtCore.QSize(32, 32)) self.button_point_face_point.setObjectName(_fromUtf8("button_point_face_point")) - self.gridLayout_3.addWidget(self.button_point_face_point, 9, 0, 1, 1) - self.button_twolines_point = QtGui.QPushButton(self.Point_Tab) + self.gridLayout_7.addWidget(self.button_point_face_point, 8, 0, 1, 1) + self.button_face_center = QtGui.QPushButton(self.Point_Tab1) + icon8 = QtGui.QIcon() + icon8.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_face_center.setIcon(icon8) + self.button_face_center.setIconSize(QtCore.QSize(32, 32)) + self.button_face_center.setObjectName(_fromUtf8("button_face_center")) + self.gridLayout_7.addWidget(self.button_face_center, 6, 0, 1, 1) + self.button_line_face_point = QtGui.QPushButton(self.Point_Tab1) + icon9 = QtGui.QIcon() + icon9.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_face_point.setIcon(icon9) + self.button_line_face_point.setIconSize(QtCore.QSize(32, 32)) + self.button_line_face_point.setObjectName(_fromUtf8("button_line_face_point")) + self.gridLayout_7.addWidget(self.button_line_face_point, 7, 0, 1, 1) + icon10 = QtGui.QIcon() + icon10.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_point.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget.addTab(self.Point_Tab1, icon10, _fromUtf8("")) + self.Point_Tab2 = QtGui.QWidget() + self.Point_Tab2.setObjectName(_fromUtf8("Point_Tab2")) + self.gridLayout_31 = QtGui.QGridLayout(self.Point_Tab2) + self.gridLayout_31.setObjectName(_fromUtf8("gridLayout_31")) + self.button_click_for_point = QtGui.QRadioButton(self.Point_Tab2) icon11 = QtGui.QIcon() - icon11.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twolines_point.setIcon(icon11) - self.button_twolines_point.setIconSize(QtCore.QSize(32, 32)) - self.button_twolines_point.setObjectName(_fromUtf8("button_twolines_point")) - self.gridLayout_3.addWidget(self.button_twolines_point, 10, 0, 1, 1) - self.button_click_for_point = QtGui.QRadioButton(self.Point_Tab) - icon12 = QtGui.QIcon() - icon12.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_click_for_point.setIcon(icon12) + icon11.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_click_for_point.setIcon(icon11) self.button_click_for_point.setIconSize(QtCore.QSize(32, 32)) self.button_click_for_point.setCheckable(True) self.button_click_for_point.setObjectName(_fromUtf8("button_click_for_point")) - self.gridLayout_3.addWidget(self.button_click_for_point, 11, 0, 1, 1) - self.button_object_base_point = QtGui.QPushButton(self.Point_Tab) + self.gridLayout_31.addWidget(self.button_click_for_point, 3, 0, 1, 1) + self.button_point_line_point = QtGui.QPushButton(self.Point_Tab2) + icon12 = QtGui.QIcon() + icon12.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_line_point.setIcon(icon12) + self.button_point_line_point.setIconSize(QtCore.QSize(32, 32)) + self.button_point_line_point.setObjectName(_fromUtf8("button_point_line_point")) + self.gridLayout_31.addWidget(self.button_point_line_point, 1, 0, 1, 1) + self.button_object_base_point = QtGui.QPushButton(self.Point_Tab2) icon13 = QtGui.QIcon() icon13.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectBasePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.button_object_base_point.setIcon(icon13) self.button_object_base_point.setIconSize(QtCore.QSize(32, 32)) self.button_object_base_point.setObjectName(_fromUtf8("button_object_base_point")) - self.gridLayout_3.addWidget(self.button_object_base_point, 12, 0, 1, 1) - self.button_point_to_sketch = QtGui.QPushButton(self.Point_Tab) + self.gridLayout_31.addWidget(self.button_object_base_point, 4, 0, 1, 1) + self.button_twolines_point = QtGui.QPushButton(self.Point_Tab2) icon14 = QtGui.QIcon() - icon14.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2Sketch.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_to_sketch.setIcon(icon14) + icon14.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twolines_point.setIcon(icon14) + self.button_twolines_point.setIconSize(QtCore.QSize(32, 32)) + self.button_twolines_point.setObjectName(_fromUtf8("button_twolines_point")) + self.gridLayout_31.addWidget(self.button_twolines_point, 0, 0, 1, 1) + self.button_point_to_sketch = QtGui.QPushButton(self.Point_Tab2) + icon15 = QtGui.QIcon() + icon15.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2Sketch.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_to_sketch.setIcon(icon15) self.button_point_to_sketch.setIconSize(QtCore.QSize(32, 32)) self.button_point_to_sketch.setObjectName(_fromUtf8("button_point_to_sketch")) - self.gridLayout_3.addWidget(self.button_point_to_sketch, 13, 0, 1, 1) - icon15 = QtGui.QIcon() - icon15.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_point.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget.addTab(self.Point_Tab, icon15, _fromUtf8("")) - self.Axis_Tab = QtGui.QWidget() - self.Axis_Tab.setObjectName(_fromUtf8("Axis_Tab")) - self.gridLayout_22 = QtGui.QGridLayout(self.Axis_Tab) - self.gridLayout_22.setObjectName(_fromUtf8("gridLayout_22")) - self.button_object_axis = QtGui.QPushButton(self.Axis_Tab) + self.gridLayout_31.addWidget(self.button_point_to_sketch, 5, 0, 1, 1) + self.horizontalLayout_27 = QtGui.QHBoxLayout() + self.horizontalLayout_27.setObjectName(_fromUtf8("horizontalLayout_27")) + self.button_cut_wire_point = QtGui.QPushButton(self.Point_Tab2) + self.button_cut_wire_point.setMaximumSize(QtCore.QSize(16777215, 16777215)) icon16 = QtGui.QIcon() - icon16.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_axis.setIcon(icon16) - self.button_object_axis.setIconSize(QtCore.QSize(32, 32)) - self.button_object_axis.setObjectName(_fromUtf8("button_object_axis")) - self.gridLayout_22.addWidget(self.button_object_axis, 0, 0, 1, 1) + icon16.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutWirePoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_wire_point.setIcon(icon16) + self.button_cut_wire_point.setIconSize(QtCore.QSize(32, 32)) + self.button_cut_wire_point.setObjectName(_fromUtf8("button_cut_wire_point")) + self.horizontalLayout_27.addWidget(self.button_cut_wire_point) + self.spin_wire_cut_point = QtGui.QSpinBox(self.Point_Tab2) + self.spin_wire_cut_point.setMinimumSize(QtCore.QSize(40, 0)) + self.spin_wire_cut_point.setMaximumSize(QtCore.QSize(50, 16777215)) + self.spin_wire_cut_point.setMinimum(2) + self.spin_wire_cut_point.setMaximum(100) + self.spin_wire_cut_point.setSingleStep(1) + self.spin_wire_cut_point.setObjectName(_fromUtf8("spin_wire_cut_point")) + self.horizontalLayout_27.addWidget(self.spin_wire_cut_point) + self.gridLayout_31.addLayout(self.horizontalLayout_27, 2, 0, 1, 1) + spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_31.addItem(spacerItem2, 6, 0, 1, 1) + icon17 = QtGui.QIcon() + icon17.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_point.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget.addTab(self.Point_Tab2, icon17, _fromUtf8("")) + self.Axis_Tab1 = QtGui.QWidget() + self.Axis_Tab1.setObjectName(_fromUtf8("Axis_Tab1")) + self.gridLayout_32 = QtGui.QGridLayout(self.Axis_Tab1) + self.gridLayout_32.setObjectName(_fromUtf8("gridLayout_32")) self.horizontalLayout_2 = QtGui.QHBoxLayout() self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) - self.button_twopoints_axis = QtGui.QPushButton(self.Axis_Tab) + self.button_twopoints_axis = QtGui.QPushButton(self.Axis_Tab1) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_twopoints_axis.sizePolicy().hasHeightForWidth()) self.button_twopoints_axis.setSizePolicy(sizePolicy) - icon17 = QtGui.QIcon() - icon17.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2pointsLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twopoints_axis.setIcon(icon17) + self.button_twopoints_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon18 = QtGui.QIcon() + icon18.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2pointsLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twopoints_axis.setIcon(icon18) self.button_twopoints_axis.setIconSize(QtCore.QSize(32, 32)) self.button_twopoints_axis.setObjectName(_fromUtf8("button_twopoints_axis")) self.horizontalLayout_2.addWidget(self.button_twopoints_axis) - self.extension_twopoints_axis = QtGui.QLineEdit(self.Axis_Tab) + self.extension_twopoints_axis = QtGui.QLineEdit(self.Axis_Tab1) self.extension_twopoints_axis.setMaximumSize(QtCore.QSize(40, 16777215)) self.extension_twopoints_axis.setObjectName(_fromUtf8("extension_twopoints_axis")) self.horizontalLayout_2.addWidget(self.extension_twopoints_axis) - self.gridLayout_22.addLayout(self.horizontalLayout_2, 1, 0, 1, 1) + self.gridLayout_32.addLayout(self.horizontalLayout_2, 1, 0, 1, 1) + self.button_object_axis = QtGui.QPushButton(self.Axis_Tab1) + icon19 = QtGui.QIcon() + icon19.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_axis.setIcon(icon19) + self.button_object_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_object_axis.setObjectName(_fromUtf8("button_object_axis")) + self.gridLayout_32.addWidget(self.button_object_axis, 0, 0, 1, 1) self.horizontalLayout_5 = QtGui.QHBoxLayout() self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5")) self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.button_cylinder_axis = QtGui.QPushButton(self.Axis_Tab) - icon18 = QtGui.QIcon() - icon18.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinderAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cylinder_axis.setIcon(icon18) + self.button_cylinder_axis = QtGui.QPushButton(self.Axis_Tab1) + self.button_cylinder_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon20 = QtGui.QIcon() + icon20.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinderAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cylinder_axis.setIcon(icon20) self.button_cylinder_axis.setIconSize(QtCore.QSize(32, 32)) self.button_cylinder_axis.setObjectName(_fromUtf8("button_cylinder_axis")) self.verticalLayout.addWidget(self.button_cylinder_axis) - self.button_plane_axis = QtGui.QPushButton(self.Axis_Tab) + self.button_plane_axis = QtGui.QPushButton(self.Axis_Tab1) self.button_plane_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon19 = QtGui.QIcon() - icon19.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_plane_axis.setIcon(icon19) + icon21 = QtGui.QIcon() + icon21.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_plane_axis.setIcon(icon21) self.button_plane_axis.setIconSize(QtCore.QSize(32, 32)) self.button_plane_axis.setObjectName(_fromUtf8("button_plane_axis")) self.verticalLayout.addWidget(self.button_plane_axis) - self.button_face_normal = QtGui.QPushButton(self.Axis_Tab) + self.button_face_normal = QtGui.QPushButton(self.Axis_Tab1) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_face_normal.sizePolicy().hasHeightForWidth()) self.button_face_normal.setSizePolicy(sizePolicy) self.button_face_normal.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon20 = QtGui.QIcon() - icon20.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceNormal.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_face_normal.setIcon(icon20) + icon22 = QtGui.QIcon() + icon22.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceNormal.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_face_normal.setIcon(icon22) self.button_face_normal.setIconSize(QtCore.QSize(32, 32)) self.button_face_normal.setObjectName(_fromUtf8("button_face_normal")) self.verticalLayout.addWidget(self.button_face_normal) self.horizontalLayout_5.addLayout(self.verticalLayout) - self.frame_4 = QtGui.QFrame(self.Axis_Tab) + self.frame_4 = QtGui.QFrame(self.Axis_Tab1) + self.frame_4.setMinimumSize(QtCore.QSize(60, 0)) + self.frame_4.setMaximumSize(QtCore.QSize(50, 16777215)) self.frame_4.setFrameShape(QtGui.QFrame.StyledPanel) self.frame_4.setFrameShadow(QtGui.QFrame.Raised) self.frame_4.setObjectName(_fromUtf8("frame_4")) self.gridLayout = QtGui.QGridLayout(self.frame_4) - self.gridLayout.setContentsMargins(0, -1, 1, -1) - self.gridLayout.setHorizontalSpacing(0) self.gridLayout.setObjectName(_fromUtf8("gridLayout")) self.extension_face_normal = QtGui.QLineEdit(self.frame_4) self.extension_face_normal.setMinimumSize(QtCore.QSize(40, 0)) @@ -308,128 +336,155 @@ class Ui_Form(object): self.extension_face_normal.setObjectName(_fromUtf8("extension_face_normal")) self.gridLayout.addWidget(self.extension_face_normal, 0, 0, 1, 1) self.horizontalLayout_5.addWidget(self.frame_4) - self.gridLayout_22.addLayout(self.horizontalLayout_5, 2, 0, 1, 1) + self.gridLayout_32.addLayout(self.horizontalLayout_5, 2, 0, 1, 1) self.horizontalLayout_20 = QtGui.QHBoxLayout() self.horizontalLayout_20.setObjectName(_fromUtf8("horizontalLayout_20")) - self.button_point_line_axis = QtGui.QPushButton(self.Axis_Tab) - icon21 = QtGui.QIcon() - icon21.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLineAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_line_axis.setIcon(icon21) + self.button_point_line_axis = QtGui.QPushButton(self.Axis_Tab1) + self.button_point_line_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon23 = QtGui.QIcon() + icon23.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLineAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_line_axis.setIcon(icon23) self.button_point_line_axis.setIconSize(QtCore.QSize(32, 32)) self.button_point_line_axis.setObjectName(_fromUtf8("button_point_line_axis")) self.horizontalLayout_20.addWidget(self.button_point_line_axis) - self.point_loc_comboBox = QtGui.QComboBox(self.Axis_Tab) + self.point_loc_comboBox = QtGui.QComboBox(self.Axis_Tab1) self.point_loc_comboBox.setMaximumSize(QtCore.QSize(60, 16777215)) self.point_loc_comboBox.setObjectName(_fromUtf8("point_loc_comboBox")) self.point_loc_comboBox.addItem(_fromUtf8("")) self.point_loc_comboBox.addItem(_fromUtf8("")) self.point_loc_comboBox.addItem(_fromUtf8("")) self.horizontalLayout_20.addWidget(self.point_loc_comboBox) - self.gridLayout_22.addLayout(self.horizontalLayout_20, 3, 0, 1, 1) + self.gridLayout_32.addLayout(self.horizontalLayout_20, 3, 0, 1, 1) self.horizontalLayout_7 = QtGui.QHBoxLayout() self.horizontalLayout_7.setObjectName(_fromUtf8("horizontalLayout_7")) - self.button_line_point_axis = QtGui.QPushButton(self.Axis_Tab) + self.button_line_point_axis = QtGui.QPushButton(self.Axis_Tab1) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_line_point_axis.sizePolicy().hasHeightForWidth()) self.button_line_point_axis.setSizePolicy(sizePolicy) - icon22 = QtGui.QIcon() - icon22.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_point_axis.setIcon(icon22) + self.button_line_point_axis.setMinimumSize(QtCore.QSize(0, 0)) + self.button_line_point_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon24 = QtGui.QIcon() + icon24.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_point_axis.setIcon(icon24) self.button_line_point_axis.setIconSize(QtCore.QSize(32, 32)) self.button_line_point_axis.setObjectName(_fromUtf8("button_line_point_axis")) self.horizontalLayout_7.addWidget(self.button_line_point_axis) - self.extension_line_point_axis = QtGui.QLineEdit(self.Axis_Tab) + self.extension_line_point_axis = QtGui.QLineEdit(self.Axis_Tab1) self.extension_line_point_axis.setMaximumSize(QtCore.QSize(40, 16777215)) self.extension_line_point_axis.setObjectName(_fromUtf8("extension_line_point_axis")) self.horizontalLayout_7.addWidget(self.extension_line_point_axis) - self.gridLayout_22.addLayout(self.horizontalLayout_7, 4, 0, 1, 1) - self.button_twolines_axis = QtGui.QPushButton(self.Axis_Tab) - icon23 = QtGui.QIcon() - icon23.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_twoLinesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twolines_axis.setIcon(icon23) - self.button_twolines_axis.setIconSize(QtCore.QSize(32, 32)) - self.button_twolines_axis.setObjectName(_fromUtf8("button_twolines_axis")) - self.gridLayout_22.addWidget(self.button_twolines_axis, 5, 0, 1, 1) - self.button_plane_point_line_axis = QtGui.QPushButton(self.Axis_Tab) - icon24 = QtGui.QIcon() - icon24.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_plane_point_line_axis.setIcon(icon24) + self.gridLayout_32.addLayout(self.horizontalLayout_7, 4, 0, 1, 1) + self.button_plane_point_line_axis = QtGui.QPushButton(self.Axis_Tab1) + icon25 = QtGui.QIcon() + icon25.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_plane_point_line_axis.setIcon(icon25) self.button_plane_point_line_axis.setIconSize(QtCore.QSize(32, 32)) self.button_plane_point_line_axis.setObjectName(_fromUtf8("button_plane_point_line_axis")) - self.gridLayout_22.addWidget(self.button_plane_point_line_axis, 6, 0, 1, 1) - self.horizontalLayout_21 = QtGui.QHBoxLayout() - self.horizontalLayout_21.setObjectName(_fromUtf8("horizontalLayout_21")) - self.button_cut_axis = QtGui.QPushButton(self.Axis_Tab) - icon25 = QtGui.QIcon() - icon25.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cut_axis.setIcon(icon25) - self.button_cut_axis.setIconSize(QtCore.QSize(32, 32)) - self.button_cut_axis.setObjectName(_fromUtf8("button_cut_axis")) - self.horizontalLayout_21.addWidget(self.button_cut_axis) - self.spin_axis_cut = QtGui.QSpinBox(self.Axis_Tab) - self.spin_axis_cut.setMinimumSize(QtCore.QSize(40, 0)) - self.spin_axis_cut.setMaximumSize(QtCore.QSize(50, 16777215)) - self.spin_axis_cut.setMinimum(2) - self.spin_axis_cut.setMaximum(10) - self.spin_axis_cut.setSingleStep(1) - self.spin_axis_cut.setObjectName(_fromUtf8("spin_axis_cut")) - self.horizontalLayout_21.addWidget(self.spin_axis_cut) - self.gridLayout_22.addLayout(self.horizontalLayout_21, 7, 0, 1, 1) - self.button_line_plane_axis = QtGui.QPushButton(self.Axis_Tab) + self.gridLayout_32.addWidget(self.button_plane_point_line_axis, 6, 0, 1, 1) + self.button_twolines_axis = QtGui.QPushButton(self.Axis_Tab1) icon26 = QtGui.QIcon() - icon26.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePlaneAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_plane_axis.setIcon(icon26) - self.button_line_plane_axis.setIconSize(QtCore.QSize(32, 32)) - self.button_line_plane_axis.setObjectName(_fromUtf8("button_line_plane_axis")) - self.gridLayout_22.addWidget(self.button_line_plane_axis, 8, 0, 1, 1) - self.button_twoplanes_axis = QtGui.QPushButton(self.Axis_Tab) + icon26.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_twoLinesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twolines_axis.setIcon(icon26) + self.button_twolines_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_twolines_axis.setObjectName(_fromUtf8("button_twolines_axis")) + self.gridLayout_32.addWidget(self.button_twolines_axis, 5, 0, 1, 1) + self.button_twoplanes_axis = QtGui.QPushButton(self.Axis_Tab1) icon27 = QtGui.QIcon() icon27.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2PlanesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.button_twoplanes_axis.setIcon(icon27) self.button_twoplanes_axis.setIconSize(QtCore.QSize(32, 32)) self.button_twoplanes_axis.setObjectName(_fromUtf8("button_twoplanes_axis")) - self.gridLayout_22.addWidget(self.button_twoplanes_axis, 9, 0, 1, 1) - self.button_click_for_axis = QtGui.QRadioButton(self.Axis_Tab) + self.gridLayout_32.addWidget(self.button_twoplanes_axis, 8, 0, 1, 1) + self.button_line_plane_axis = QtGui.QPushButton(self.Axis_Tab1) icon28 = QtGui.QIcon() - icon28.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_click_for_axis.setIcon(icon28) - self.button_click_for_axis.setIconSize(QtCore.QSize(32, 32)) - self.button_click_for_axis.setObjectName(_fromUtf8("button_click_for_axis")) - self.gridLayout_22.addWidget(self.button_click_for_axis, 10, 0, 1, 1) - self.button_object_base_axes = QtGui.QPushButton(self.Axis_Tab) + icon28.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePlaneAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_plane_axis.setIcon(icon28) + self.button_line_plane_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_line_plane_axis.setObjectName(_fromUtf8("button_line_plane_axis")) + self.gridLayout_32.addWidget(self.button_line_plane_axis, 7, 0, 1, 1) + spacerItem3 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_32.addItem(spacerItem3, 9, 0, 1, 1) icon29 = QtGui.QIcon() - icon29.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_baseObjectsAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_base_axes.setIcon(icon29) - self.button_object_base_axes.setIconSize(QtCore.QSize(32, 32)) - self.button_object_base_axes.setObjectName(_fromUtf8("button_object_base_axes")) - self.gridLayout_22.addWidget(self.button_object_base_axes, 11, 0, 1, 1) - self.button_line_to_sketch = QtGui.QPushButton(self.Axis_Tab) - self.button_line_to_sketch.setIcon(icon14) + icon29.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_axis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget.addTab(self.Axis_Tab1, icon29, _fromUtf8("")) + self.Axis_Tab2 = QtGui.QWidget() + self.Axis_Tab2.setObjectName(_fromUtf8("Axis_Tab2")) + self.gridLayout_38 = QtGui.QGridLayout(self.Axis_Tab2) + self.gridLayout_38.setObjectName(_fromUtf8("gridLayout_38")) + self.button_line_to_sketch = QtGui.QPushButton(self.Axis_Tab2) + self.button_line_to_sketch.setIcon(icon15) self.button_line_to_sketch.setIconSize(QtCore.QSize(32, 32)) self.button_line_to_sketch.setObjectName(_fromUtf8("button_line_to_sketch")) - self.gridLayout_22.addWidget(self.button_line_to_sketch, 12, 0, 1, 1) + self.gridLayout_38.addWidget(self.button_line_to_sketch, 4, 0, 1, 1) + self.horizontalLayout_21 = QtGui.QHBoxLayout() + self.horizontalLayout_21.setObjectName(_fromUtf8("horizontalLayout_21")) + self.button_cut_axis = QtGui.QPushButton(self.Axis_Tab2) + self.button_cut_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) icon30 = QtGui.QIcon() - icon30.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_axis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget.addTab(self.Axis_Tab, icon30, _fromUtf8("")) + icon30.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_axis.setIcon(icon30) + self.button_cut_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_cut_axis.setObjectName(_fromUtf8("button_cut_axis")) + self.horizontalLayout_21.addWidget(self.button_cut_axis) + self.spin_axis_cut = QtGui.QSpinBox(self.Axis_Tab2) + self.spin_axis_cut.setMinimumSize(QtCore.QSize(40, 0)) + self.spin_axis_cut.setMaximumSize(QtCore.QSize(50, 16777215)) + self.spin_axis_cut.setMinimum(2) + self.spin_axis_cut.setMaximum(100) + self.spin_axis_cut.setSingleStep(1) + self.spin_axis_cut.setObjectName(_fromUtf8("spin_axis_cut")) + self.horizontalLayout_21.addWidget(self.spin_axis_cut) + self.gridLayout_38.addLayout(self.horizontalLayout_21, 1, 0, 1, 1) + self.button_object_base_axes = QtGui.QPushButton(self.Axis_Tab2) + icon31 = QtGui.QIcon() + icon31.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_baseObjectsAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_base_axes.setIcon(icon31) + self.button_object_base_axes.setIconSize(QtCore.QSize(32, 32)) + self.button_object_base_axes.setObjectName(_fromUtf8("button_object_base_axes")) + self.gridLayout_38.addWidget(self.button_object_base_axes, 3, 0, 1, 1) + self.horizontalLayout_26 = QtGui.QHBoxLayout() + self.horizontalLayout_26.setObjectName(_fromUtf8("horizontalLayout_26")) + self.button_cut_wire_axis = QtGui.QPushButton(self.Axis_Tab2) + self.button_cut_wire_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon32 = QtGui.QIcon() + icon32.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutWireAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_wire_axis.setIcon(icon32) + self.button_cut_wire_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_cut_wire_axis.setObjectName(_fromUtf8("button_cut_wire_axis")) + self.horizontalLayout_26.addWidget(self.button_cut_wire_axis) + self.spin_wire_cut_axis = QtGui.QSpinBox(self.Axis_Tab2) + self.spin_wire_cut_axis.setMinimumSize(QtCore.QSize(40, 0)) + self.spin_wire_cut_axis.setMaximumSize(QtCore.QSize(50, 16777215)) + self.spin_wire_cut_axis.setMinimum(2) + self.spin_wire_cut_axis.setMaximum(100) + self.spin_wire_cut_axis.setSingleStep(1) + self.spin_wire_cut_axis.setObjectName(_fromUtf8("spin_wire_cut_axis")) + self.horizontalLayout_26.addWidget(self.spin_wire_cut_axis) + self.gridLayout_38.addLayout(self.horizontalLayout_26, 0, 0, 1, 1) + self.button_click_for_axis = QtGui.QRadioButton(self.Axis_Tab2) + icon33 = QtGui.QIcon() + icon33.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_click_for_axis.setIcon(icon33) + self.button_click_for_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_click_for_axis.setObjectName(_fromUtf8("button_click_for_axis")) + self.gridLayout_38.addWidget(self.button_click_for_axis, 2, 0, 1, 1) + spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_38.addItem(spacerItem4, 5, 0, 1, 1) + icon34 = QtGui.QIcon() + icon34.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_axis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget.addTab(self.Axis_Tab2, icon34, _fromUtf8("")) self.tab_4 = QtGui.QWidget() self.tab_4.setObjectName(_fromUtf8("tab_4")) - self.gridLayout_5 = QtGui.QGridLayout(self.tab_4) - self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5")) - self.button_linepoint_circle = QtGui.QPushButton(self.tab_4) - icon31 = QtGui.QIcon() - icon31.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_linepoint_circle.setIcon(icon31) - self.button_linepoint_circle.setIconSize(QtCore.QSize(32, 32)) - self.button_linepoint_circle.setObjectName(_fromUtf8("button_linepoint_circle")) - self.gridLayout_5.addWidget(self.button_linepoint_circle, 1, 0, 1, 1) + self.gridLayout_22 = QtGui.QGridLayout(self.tab_4) + self.gridLayout_22.setObjectName(_fromUtf8("gridLayout_22")) self.horizontalLayout_24 = QtGui.QHBoxLayout() self.horizontalLayout_24.setObjectName(_fromUtf8("horizontalLayout_24")) self.button_cut_circle = QtGui.QPushButton(self.tab_4) - icon32 = QtGui.QIcon() - icon32.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cut_circle.setIcon(icon32) + icon35 = QtGui.QIcon() + icon35.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_circle.setIcon(icon35) self.button_cut_circle.setIconSize(QtCore.QSize(32, 32)) self.button_cut_circle.setObjectName(_fromUtf8("button_cut_circle")) self.horizontalLayout_24.addWidget(self.button_cut_circle) @@ -437,24 +492,17 @@ class Ui_Form(object): self.spin_circle_cut.setMinimumSize(QtCore.QSize(40, 0)) self.spin_circle_cut.setMaximumSize(QtCore.QSize(50, 16777215)) self.spin_circle_cut.setMinimum(2) - self.spin_circle_cut.setMaximum(10) + self.spin_circle_cut.setMaximum(100) self.spin_circle_cut.setSingleStep(1) self.spin_circle_cut.setObjectName(_fromUtf8("spin_circle_cut")) self.horizontalLayout_24.addWidget(self.spin_circle_cut) - self.gridLayout_5.addLayout(self.horizontalLayout_24, 3, 0, 1, 1) - self.button_3points_circle = QtGui.QPushButton(self.tab_4) - icon33 = QtGui.QIcon() - icon33.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_3points_circle.setIcon(icon33) - self.button_3points_circle.setIconSize(QtCore.QSize(32, 32)) - self.button_3points_circle.setObjectName(_fromUtf8("button_3points_circle")) - self.gridLayout_5.addWidget(self.button_3points_circle, 2, 0, 1, 1) + self.gridLayout_22.addLayout(self.horizontalLayout_24, 3, 0, 1, 1) self.horizontalLayout_11 = QtGui.QHBoxLayout() self.horizontalLayout_11.setObjectName(_fromUtf8("horizontalLayout_11")) self.button_linecenter_circle = QtGui.QPushButton(self.tab_4) - icon34 = QtGui.QIcon() - icon34.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineCenterCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_linecenter_circle.setIcon(icon34) + icon36 = QtGui.QIcon() + icon36.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineCenterCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_linecenter_circle.setIcon(icon36) self.button_linecenter_circle.setIconSize(QtCore.QSize(32, 32)) self.button_linecenter_circle.setObjectName(_fromUtf8("button_linecenter_circle")) self.horizontalLayout_11.addWidget(self.button_linecenter_circle) @@ -463,44 +511,44 @@ class Ui_Form(object): self.radius_circle.setMaximumSize(QtCore.QSize(60, 16777215)) self.radius_circle.setObjectName(_fromUtf8("radius_circle")) self.horizontalLayout_11.addWidget(self.radius_circle) - self.gridLayout_5.addLayout(self.horizontalLayout_11, 0, 0, 1, 1) + self.gridLayout_22.addLayout(self.horizontalLayout_11, 0, 0, 1, 1) + spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_22.addItem(spacerItem5, 5, 0, 1, 1) + self.button_3points_circle = QtGui.QPushButton(self.tab_4) + icon37 = QtGui.QIcon() + icon37.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_3points_circle.setIcon(icon37) + self.button_3points_circle.setIconSize(QtCore.QSize(32, 32)) + self.button_3points_circle.setObjectName(_fromUtf8("button_3points_circle")) + self.gridLayout_22.addWidget(self.button_3points_circle, 2, 0, 1, 1) self.button_3points_ellipse = QtGui.QPushButton(self.tab_4) - icon35 = QtGui.QIcon() - icon35.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsEllipse.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_3points_ellipse.setIcon(icon35) + icon38 = QtGui.QIcon() + icon38.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsEllipse.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_3points_ellipse.setIcon(icon38) self.button_3points_ellipse.setIconSize(QtCore.QSize(32, 32)) self.button_3points_ellipse.setObjectName(_fromUtf8("button_3points_ellipse")) - self.gridLayout_5.addWidget(self.button_3points_ellipse, 4, 0, 1, 1) - spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_5.addItem(spacerItem2, 5, 0, 1, 1) - icon36 = QtGui.QIcon() - icon36.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_circle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget.addTab(self.tab_4, icon36, _fromUtf8("")) + self.gridLayout_22.addWidget(self.button_3points_ellipse, 4, 0, 1, 1) + self.button_linepoint_circle = QtGui.QPushButton(self.tab_4) + icon39 = QtGui.QIcon() + icon39.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_linepoint_circle.setIcon(icon39) + self.button_linepoint_circle.setIconSize(QtCore.QSize(32, 32)) + self.button_linepoint_circle.setObjectName(_fromUtf8("button_linepoint_circle")) + self.gridLayout_22.addWidget(self.button_linepoint_circle, 1, 0, 1, 1) + icon40 = QtGui.QIcon() + icon40.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_circle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget.addTab(self.tab_4, icon40, _fromUtf8("")) self.Plane_Tab = QtGui.QWidget() self.Plane_Tab.setObjectName(_fromUtf8("Plane_Tab")) - self.gridLayout_9 = QtGui.QGridLayout(self.Plane_Tab) - self.gridLayout_9.setObjectName(_fromUtf8("gridLayout_9")) + self.gridLayout_4 = QtGui.QGridLayout(self.Plane_Tab) + self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) self.button_axis_point_plane = QtGui.QPushButton(self.Plane_Tab) - icon37 = QtGui.QIcon() - icon37.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane2.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_axis_point_plane.setIcon(icon37) + icon41 = QtGui.QIcon() + icon41.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane2.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_axis_point_plane.setIcon(icon41) self.button_axis_point_plane.setIconSize(QtCore.QSize(32, 32)) self.button_axis_point_plane.setObjectName(_fromUtf8("button_axis_point_plane")) - self.gridLayout_9.addWidget(self.button_axis_point_plane, 2, 0, 1, 1) - self.button_axisandpoint_plane = QtGui.QPushButton(self.Plane_Tab) - icon38 = QtGui.QIcon() - icon38.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_axisandpoint_plane.setIcon(icon38) - self.button_axisandpoint_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_axisandpoint_plane.setObjectName(_fromUtf8("button_axisandpoint_plane")) - self.gridLayout_9.addWidget(self.button_axisandpoint_plane, 1, 0, 1, 1) - self.button_threepoints_plane = QtGui.QPushButton(self.Plane_Tab) - icon39 = QtGui.QIcon() - icon39.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_threePointsPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_threepoints_plane.setIcon(icon39) - self.button_threepoints_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_threepoints_plane.setObjectName(_fromUtf8("button_threepoints_plane")) - self.gridLayout_9.addWidget(self.button_threepoints_plane, 0, 0, 1, 1) + self.gridLayout_4.addWidget(self.button_axis_point_plane, 2, 0, 1, 1) self.horizontalLayout_12 = QtGui.QHBoxLayout() self.horizontalLayout_12.setObjectName(_fromUtf8("horizontalLayout_12")) self.button_face_tangent = QtGui.QPushButton(self.Plane_Tab) @@ -509,9 +557,9 @@ class Ui_Form(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_face_tangent.sizePolicy().hasHeightForWidth()) self.button_face_tangent.setSizePolicy(sizePolicy) - icon40 = QtGui.QIcon() - icon40.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceTangent.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_face_tangent.setIcon(icon40) + icon42 = QtGui.QIcon() + icon42.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceTangent.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_face_tangent.setIcon(icon42) self.button_face_tangent.setIconSize(QtCore.QSize(32, 32)) self.button_face_tangent.setObjectName(_fromUtf8("button_face_tangent")) self.horizontalLayout_12.addWidget(self.button_face_tangent) @@ -535,24 +583,7 @@ class Ui_Form(object): self.width_plane_2.setMaximumSize(QtCore.QSize(60, 16777215)) self.width_plane_2.setObjectName(_fromUtf8("width_plane_2")) self.horizontalLayout_12.addWidget(self.width_plane_2) - self.gridLayout_9.addLayout(self.horizontalLayout_12, 5, 0, 1, 1) - spacerItem3 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_9.addItem(spacerItem3, 6, 0, 1, 1) - self.gridLayout_16 = QtGui.QGridLayout() - self.gridLayout_16.setObjectName(_fromUtf8("gridLayout_16")) - self.button_planeandpoint_plane = QtGui.QPushButton(self.Plane_Tab) - icon41 = QtGui.QIcon() - icon41.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointPlanePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_planeandpoint_plane.setIcon(icon41) - self.button_planeandpoint_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_planeandpoint_plane.setObjectName(_fromUtf8("button_planeandpoint_plane")) - self.gridLayout_16.addWidget(self.button_planeandpoint_plane, 0, 0, 1, 1) - self.extension_planePointPlane = QtGui.QLineEdit(self.Plane_Tab) - self.extension_planePointPlane.setMinimumSize(QtCore.QSize(40, 0)) - self.extension_planePointPlane.setMaximumSize(QtCore.QSize(60, 16777215)) - self.extension_planePointPlane.setObjectName(_fromUtf8("extension_planePointPlane")) - self.gridLayout_16.addWidget(self.extension_planePointPlane, 0, 1, 1, 1) - self.gridLayout_9.addLayout(self.gridLayout_16, 3, 0, 1, 1) + self.gridLayout_4.addLayout(self.horizontalLayout_12, 5, 0, 1, 1) self.gridLayout_8 = QtGui.QGridLayout() self.gridLayout_8.setObjectName(_fromUtf8("gridLayout_8")) self.button_planeandaxis_plane = QtGui.QPushButton(self.Plane_Tab) @@ -561,9 +592,9 @@ class Ui_Form(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_planeandaxis_plane.sizePolicy().hasHeightForWidth()) self.button_planeandaxis_plane.setSizePolicy(sizePolicy) - icon42 = QtGui.QIcon() - icon42.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_planeandaxis_plane.setIcon(icon42) + icon43 = QtGui.QIcon() + icon43.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_planeandaxis_plane.setIcon(icon43) self.button_planeandaxis_plane.setIconSize(QtCore.QSize(32, 32)) self.button_planeandaxis_plane.setObjectName(_fromUtf8("button_planeandaxis_plane")) self.gridLayout_8.addWidget(self.button_planeandaxis_plane, 0, 0, 1, 1) @@ -577,16 +608,36 @@ class Ui_Form(object): self.angle_planeandaxis_plane.setMaximumSize(QtCore.QSize(60, 16777215)) self.angle_planeandaxis_plane.setObjectName(_fromUtf8("angle_planeandaxis_plane")) self.gridLayout_8.addWidget(self.angle_planeandaxis_plane, 0, 1, 1, 1) - self.gridLayout_9.addLayout(self.gridLayout_8, 4, 0, 1, 1) + self.gridLayout_4.addLayout(self.gridLayout_8, 4, 0, 1, 1) + self.gridLayout_16 = QtGui.QGridLayout() + self.gridLayout_16.setObjectName(_fromUtf8("gridLayout_16")) + self.button_planeandpoint_plane = QtGui.QPushButton(self.Plane_Tab) + icon44 = QtGui.QIcon() + icon44.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointPlanePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_planeandpoint_plane.setIcon(icon44) + self.button_planeandpoint_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_planeandpoint_plane.setObjectName(_fromUtf8("button_planeandpoint_plane")) + self.gridLayout_16.addWidget(self.button_planeandpoint_plane, 0, 0, 1, 1) + self.extension_planePointPlane = QtGui.QLineEdit(self.Plane_Tab) + self.extension_planePointPlane.setMinimumSize(QtCore.QSize(40, 0)) + self.extension_planePointPlane.setMaximumSize(QtCore.QSize(60, 16777215)) + self.extension_planePointPlane.setObjectName(_fromUtf8("extension_planePointPlane")) + self.gridLayout_16.addWidget(self.extension_planePointPlane, 0, 1, 1, 1) + self.gridLayout_4.addLayout(self.gridLayout_16, 3, 0, 1, 1) + self.button_threepoints_plane = QtGui.QPushButton(self.Plane_Tab) + icon45 = QtGui.QIcon() + icon45.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_threePointsPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_threepoints_plane.setIcon(icon45) + self.button_threepoints_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_threepoints_plane.setObjectName(_fromUtf8("button_threepoints_plane")) + self.gridLayout_4.addWidget(self.button_threepoints_plane, 0, 0, 1, 1) self.button_object_center_planes = QtGui.QPushButton(self.Plane_Tab) - icon43 = QtGui.QIcon() - icon43.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsPlanes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_center_planes.setIcon(icon43) + icon46 = QtGui.QIcon() + icon46.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsPlanes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_center_planes.setIcon(icon46) self.button_object_center_planes.setIconSize(QtCore.QSize(32, 32)) self.button_object_center_planes.setObjectName(_fromUtf8("button_object_center_planes")) - self.gridLayout_9.addWidget(self.button_object_center_planes, 9, 0, 1, 1) - spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_9.addItem(spacerItem4, 8, 0, 1, 1) + self.gridLayout_4.addWidget(self.button_object_center_planes, 8, 0, 1, 1) self.horizontalLayout_3 = QtGui.QHBoxLayout() self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3")) self.button_click_for_plane = QtGui.QPushButton(self.Plane_Tab) @@ -595,9 +646,9 @@ class Ui_Form(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_click_for_plane.sizePolicy().hasHeightForWidth()) self.button_click_for_plane.setSizePolicy(sizePolicy) - icon44 = QtGui.QIcon() - icon44.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_click_for_plane.setIcon(icon44) + icon47 = QtGui.QIcon() + icon47.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_click_for_plane.setIcon(icon47) self.button_click_for_plane.setIconSize(QtCore.QSize(32, 32)) self.button_click_for_plane.setObjectName(_fromUtf8("button_click_for_plane")) self.horizontalLayout_3.addWidget(self.button_click_for_plane) @@ -621,10 +672,19 @@ class Ui_Form(object): self.width_plane.setMaximumSize(QtCore.QSize(60, 16777215)) self.width_plane.setObjectName(_fromUtf8("width_plane")) self.horizontalLayout_3.addWidget(self.width_plane) - self.gridLayout_9.addLayout(self.horizontalLayout_3, 7, 0, 1, 1) - icon45 = QtGui.QIcon() - icon45.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_plane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget.addTab(self.Plane_Tab, icon45, _fromUtf8("")) + self.gridLayout_4.addLayout(self.horizontalLayout_3, 7, 0, 1, 1) + self.button_axisandpoint_plane = QtGui.QPushButton(self.Plane_Tab) + icon48 = QtGui.QIcon() + icon48.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_axisandpoint_plane.setIcon(icon48) + self.button_axisandpoint_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_axisandpoint_plane.setObjectName(_fromUtf8("button_axisandpoint_plane")) + self.gridLayout_4.addWidget(self.button_axisandpoint_plane, 1, 0, 1, 1) + spacerItem6 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_4.addItem(spacerItem6, 9, 0, 1, 1) + icon49 = QtGui.QIcon() + icon49.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_plane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget.addTab(self.Plane_Tab, icon49, _fromUtf8("")) self.Objects_Tab2 = QtGui.QWidget() self.Objects_Tab2.setEnabled(True) self.Objects_Tab2.setMinimumSize(QtCore.QSize(0, 0)) @@ -634,9 +694,9 @@ class Ui_Form(object): self.gridLayout_6 = QtGui.QGridLayout() self.gridLayout_6.setObjectName(_fromUtf8("gridLayout_6")) self.button_cylinder_create = QtGui.QPushButton(self.Objects_Tab2) - icon46 = QtGui.QIcon() - icon46.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinder.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cylinder_create.setIcon(icon46) + icon50 = QtGui.QIcon() + icon50.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinder.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cylinder_create.setIcon(icon50) self.button_cylinder_create.setIconSize(QtCore.QSize(32, 32)) self.button_cylinder_create.setObjectName(_fromUtf8("button_cylinder_create")) self.gridLayout_6.addWidget(self.button_cylinder_create, 0, 0, 1, 1) @@ -664,9 +724,9 @@ class Ui_Form(object): self.horizontalLayout_4 = QtGui.QHBoxLayout() self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4")) self.button_cube_create = QtGui.QPushButton(self.Objects_Tab2) - icon47 = QtGui.QIcon() - icon47.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cube.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cube_create.setIcon(icon47) + icon51 = QtGui.QIcon() + icon51.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cube.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cube_create.setIcon(icon51) self.button_cube_create.setIconSize(QtCore.QSize(32, 32)) self.button_cube_create.setObjectName(_fromUtf8("button_cube_create")) self.horizontalLayout_4.addWidget(self.button_cube_create) @@ -692,18 +752,18 @@ class Ui_Form(object): self.horizontalLayout_4.addWidget(self.height_cube) self.gridLayout_12.addLayout(self.horizontalLayout_4, 4, 0, 1, 1) self.button_boundingboxes = QtGui.QPushButton(self.Objects_Tab2) - icon48 = QtGui.QIcon() - icon48.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBoxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_boundingboxes.setIcon(icon48) + icon52 = QtGui.QIcon() + icon52.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBoxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_boundingboxes.setIcon(icon52) self.button_boundingboxes.setIconSize(QtCore.QSize(32, 32)) self.button_boundingboxes.setObjectName(_fromUtf8("button_boundingboxes")) self.gridLayout_12.addWidget(self.button_boundingboxes, 0, 0, 1, 1) - spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_12.addItem(spacerItem5, 5, 0, 1, 1) + spacerItem7 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_12.addItem(spacerItem7, 5, 0, 1, 1) self.button_boundingbox = QtGui.QPushButton(self.Objects_Tab2) - icon49 = QtGui.QIcon() - icon49.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBox.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_boundingbox.setIcon(icon49) + icon53 = QtGui.QIcon() + icon53.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBox.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_boundingbox.setIcon(icon53) self.button_boundingbox.setIconSize(QtCore.QSize(32, 32)) self.button_boundingbox.setObjectName(_fromUtf8("button_boundingbox")) self.gridLayout_12.addWidget(self.button_boundingbox, 1, 0, 1, 1) @@ -715,9 +775,9 @@ class Ui_Form(object): self.line.setFrameShadow(QtGui.QFrame.Sunken) self.line.setObjectName(_fromUtf8("line")) self.gridLayout_12.addWidget(self.line, 2, 0, 1, 1) - icon50 = QtGui.QIcon() - icon50.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_box.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget.addTab(self.Objects_Tab2, icon50, _fromUtf8("")) + icon54 = QtGui.QIcon() + icon54.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_box.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget.addTab(self.Objects_Tab2, icon54, _fromUtf8("")) self.View_Tab = QtGui.QWidget() self.View_Tab.setObjectName(_fromUtf8("View_Tab")) self.gridLayout_13 = QtGui.QGridLayout(self.View_Tab) @@ -728,17 +788,17 @@ class Ui_Form(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_alignview.sizePolicy().hasHeightForWidth()) self.button_alignview.setSizePolicy(sizePolicy) - icon51 = QtGui.QIcon() - icon51.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_viewAlign.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_alignview.setIcon(icon51) + icon55 = QtGui.QIcon() + icon55.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_viewAlign.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_alignview.setIcon(icon55) self.button_alignview.setIconSize(QtCore.QSize(32, 32)) self.button_alignview.setObjectName(_fromUtf8("button_alignview")) self.gridLayout_13.addWidget(self.button_alignview, 0, 0, 1, 1) - spacerItem6 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_13.addItem(spacerItem6, 1, 0, 1, 1) - icon52 = QtGui.QIcon() - icon52.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_view.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget.addTab(self.View_Tab, icon52, _fromUtf8("")) + spacerItem8 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_13.addItem(spacerItem8, 1, 0, 1, 1) + icon56 = QtGui.QIcon() + icon56.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_view.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget.addTab(self.View_Tab, icon56, _fromUtf8("")) self.Modif_Tab = QtGui.QWidget() self.Modif_Tab.setObjectName(_fromUtf8("Modif_Tab")) self.gridLayout_11 = QtGui.QGridLayout(self.Modif_Tab) @@ -747,17 +807,76 @@ class Ui_Form(object): self.tabWidget_2.setObjectName(_fromUtf8("tabWidget_2")) self.cutting_tab = QtGui.QWidget() self.cutting_tab.setObjectName(_fromUtf8("cutting_tab")) - self.gridLayout_2 = QtGui.QGridLayout(self.cutting_tab) + self.frame_7 = QtGui.QFrame(self.cutting_tab) + self.frame_7.setGeometry(QtCore.QRect(9, 9, 190, 369)) + self.frame_7.setFrameShape(QtGui.QFrame.StyledPanel) + self.frame_7.setFrameShadow(QtGui.QFrame.Raised) + self.frame_7.setObjectName(_fromUtf8("frame_7")) + self.gridLayout_36 = QtGui.QGridLayout(self.frame_7) + self.gridLayout_36.setObjectName(_fromUtf8("gridLayout_36")) + self.groupBox_6 = QtGui.QGroupBox(self.frame_7) + self.groupBox_6.setObjectName(_fromUtf8("groupBox_6")) + self.gridLayout_2 = QtGui.QGridLayout(self.groupBox_6) self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) + self.gridLayout_18 = QtGui.QGridLayout() + self.gridLayout_18.setObjectName(_fromUtf8("gridLayout_18")) + self.button_cut_select_object = QtGui.QPushButton(self.groupBox_6) + self.button_cut_select_object.setMinimumSize(QtCore.QSize(130, 31)) + self.button_cut_select_object.setMaximumSize(QtCore.QSize(250, 40)) + self.button_cut_select_object.setObjectName(_fromUtf8("button_cut_select_object")) + self.gridLayout_18.addWidget(self.button_cut_select_object, 0, 0, 1, 1) + self.info_cut_select_object = QtGui.QLineEdit(self.groupBox_6) + self.info_cut_select_object.setEnabled(False) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.info_cut_select_object.sizePolicy().hasHeightForWidth()) + self.info_cut_select_object.setSizePolicy(sizePolicy) + self.info_cut_select_object.setReadOnly(True) + self.info_cut_select_object.setObjectName(_fromUtf8("info_cut_select_object")) + self.gridLayout_18.addWidget(self.info_cut_select_object, 1, 0, 1, 1) + self.button_cut_select_line = QtGui.QPushButton(self.groupBox_6) + self.button_cut_select_line.setEnabled(False) + self.button_cut_select_line.setMinimumSize(QtCore.QSize(130, 31)) + self.button_cut_select_line.setMaximumSize(QtCore.QSize(250, 40)) + self.button_cut_select_line.setObjectName(_fromUtf8("button_cut_select_line")) + self.gridLayout_18.addWidget(self.button_cut_select_line, 2, 0, 1, 1) + self.info_cut_select_axis = QtGui.QLineEdit(self.groupBox_6) + self.info_cut_select_axis.setEnabled(False) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.info_cut_select_axis.sizePolicy().hasHeightForWidth()) + self.info_cut_select_axis.setSizePolicy(sizePolicy) + self.info_cut_select_axis.setReadOnly(True) + self.info_cut_select_axis.setObjectName(_fromUtf8("info_cut_select_axis")) + self.gridLayout_18.addWidget(self.info_cut_select_axis, 3, 0, 1, 1) + self.button_cut_select_plane = QtGui.QPushButton(self.groupBox_6) + self.button_cut_select_plane.setEnabled(False) + self.button_cut_select_plane.setMinimumSize(QtCore.QSize(130, 31)) + self.button_cut_select_plane.setMaximumSize(QtCore.QSize(250, 40)) + self.button_cut_select_plane.setObjectName(_fromUtf8("button_cut_select_plane")) + self.gridLayout_18.addWidget(self.button_cut_select_plane, 4, 0, 1, 1) + self.info_cut_select_plane = QtGui.QLineEdit(self.groupBox_6) + self.info_cut_select_plane.setEnabled(False) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.info_cut_select_plane.sizePolicy().hasHeightForWidth()) + self.info_cut_select_plane.setSizePolicy(sizePolicy) + self.info_cut_select_plane.setReadOnly(True) + self.info_cut_select_plane.setObjectName(_fromUtf8("info_cut_select_plane")) + self.gridLayout_18.addWidget(self.info_cut_select_plane, 5, 0, 1, 1) + self.gridLayout_2.addLayout(self.gridLayout_18, 0, 0, 1, 1) self.gridLayout_17 = QtGui.QGridLayout() self.gridLayout_17.setObjectName(_fromUtf8("gridLayout_17")) self.gridLayout_19 = QtGui.QGridLayout() self.gridLayout_19.setObjectName(_fromUtf8("gridLayout_19")) - self.label_angle = QtGui.QLabel(self.cutting_tab) + self.label_angle = QtGui.QLabel(self.groupBox_6) self.label_angle.setMaximumSize(QtCore.QSize(70, 16777215)) self.label_angle.setObjectName(_fromUtf8("label_angle")) self.gridLayout_19.addWidget(self.label_angle, 0, 0, 1, 1) - self.angle_cut_object = QtGui.QLineEdit(self.cutting_tab) + self.angle_cut_object = QtGui.QLineEdit(self.groupBox_6) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -770,11 +889,11 @@ class Ui_Form(object): self.gridLayout_17.addLayout(self.gridLayout_19, 0, 0, 1, 1) self.gridLayout_20 = QtGui.QGridLayout() self.gridLayout_20.setObjectName(_fromUtf8("gridLayout_20")) - self.label_thickness = QtGui.QLabel(self.cutting_tab) + self.label_thickness = QtGui.QLabel(self.groupBox_6) self.label_thickness.setMaximumSize(QtCore.QSize(70, 16777215)) self.label_thickness.setObjectName(_fromUtf8("label_thickness")) self.gridLayout_20.addWidget(self.label_thickness, 0, 0, 1, 1) - self.thickness_cut_object = QtGui.QLineEdit(self.cutting_tab) + self.thickness_cut_object = QtGui.QLineEdit(self.groupBox_6) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -786,14 +905,14 @@ class Ui_Form(object): self.gridLayout_17.addLayout(self.gridLayout_20, 1, 0, 1, 1) self.horizontalLayout_8 = QtGui.QHBoxLayout() self.horizontalLayout_8.setObjectName(_fromUtf8("horizontalLayout_8")) - self.button_cut_reset = QtGui.QPushButton(self.cutting_tab) + self.button_cut_reset = QtGui.QPushButton(self.groupBox_6) self.button_cut_reset.setMinimumSize(QtCore.QSize(40, 0)) self.button_cut_reset.setMaximumSize(QtCore.QSize(60, 16777215)) self.button_cut_reset.setObjectName(_fromUtf8("button_cut_reset")) self.horizontalLayout_8.addWidget(self.button_cut_reset) - spacerItem7 = QtGui.QSpacerItem(18, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_8.addItem(spacerItem7) - self.button_cut_apply = QtGui.QPushButton(self.cutting_tab) + spacerItem9 = QtGui.QSpacerItem(18, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_8.addItem(spacerItem9) + self.button_cut_apply = QtGui.QPushButton(self.groupBox_6) self.button_cut_apply.setEnabled(False) self.button_cut_apply.setMaximumSize(QtCore.QSize(50, 16777215)) self.button_cut_apply.setIconSize(QtCore.QSize(32, 32)) @@ -801,58 +920,7 @@ class Ui_Form(object): self.horizontalLayout_8.addWidget(self.button_cut_apply) self.gridLayout_17.addLayout(self.horizontalLayout_8, 2, 0, 1, 1) self.gridLayout_2.addLayout(self.gridLayout_17, 1, 0, 1, 1) - self.gridLayout_18 = QtGui.QGridLayout() - self.gridLayout_18.setObjectName(_fromUtf8("gridLayout_18")) - self.button_cut_select_object = QtGui.QPushButton(self.cutting_tab) - self.button_cut_select_object.setMinimumSize(QtCore.QSize(130, 31)) - self.button_cut_select_object.setMaximumSize(QtCore.QSize(250, 40)) - self.button_cut_select_object.setObjectName(_fromUtf8("button_cut_select_object")) - self.gridLayout_18.addWidget(self.button_cut_select_object, 0, 0, 1, 1) - self.info_cut_select_object = QtGui.QLineEdit(self.cutting_tab) - self.info_cut_select_object.setEnabled(False) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.info_cut_select_object.sizePolicy().hasHeightForWidth()) - self.info_cut_select_object.setSizePolicy(sizePolicy) - self.info_cut_select_object.setReadOnly(True) - self.info_cut_select_object.setObjectName(_fromUtf8("info_cut_select_object")) - self.gridLayout_18.addWidget(self.info_cut_select_object, 1, 0, 1, 1) - self.button_cut_select_line = QtGui.QPushButton(self.cutting_tab) - self.button_cut_select_line.setEnabled(False) - self.button_cut_select_line.setMinimumSize(QtCore.QSize(130, 31)) - self.button_cut_select_line.setMaximumSize(QtCore.QSize(250, 40)) - self.button_cut_select_line.setObjectName(_fromUtf8("button_cut_select_line")) - self.gridLayout_18.addWidget(self.button_cut_select_line, 2, 0, 1, 1) - self.info_cut_select_axis = QtGui.QLineEdit(self.cutting_tab) - self.info_cut_select_axis.setEnabled(False) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.info_cut_select_axis.sizePolicy().hasHeightForWidth()) - self.info_cut_select_axis.setSizePolicy(sizePolicy) - self.info_cut_select_axis.setReadOnly(True) - self.info_cut_select_axis.setObjectName(_fromUtf8("info_cut_select_axis")) - self.gridLayout_18.addWidget(self.info_cut_select_axis, 3, 0, 1, 1) - self.button_cut_select_plane = QtGui.QPushButton(self.cutting_tab) - self.button_cut_select_plane.setEnabled(False) - self.button_cut_select_plane.setMinimumSize(QtCore.QSize(130, 31)) - self.button_cut_select_plane.setMaximumSize(QtCore.QSize(250, 40)) - self.button_cut_select_plane.setObjectName(_fromUtf8("button_cut_select_plane")) - self.gridLayout_18.addWidget(self.button_cut_select_plane, 4, 0, 1, 1) - self.info_cut_select_plane = QtGui.QLineEdit(self.cutting_tab) - self.info_cut_select_plane.setEnabled(False) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.info_cut_select_plane.sizePolicy().hasHeightForWidth()) - self.info_cut_select_plane.setSizePolicy(sizePolicy) - self.info_cut_select_plane.setReadOnly(True) - self.info_cut_select_plane.setObjectName(_fromUtf8("info_cut_select_plane")) - self.gridLayout_18.addWidget(self.info_cut_select_plane, 5, 0, 1, 1) - self.gridLayout_2.addLayout(self.gridLayout_18, 0, 0, 1, 1) - spacerItem8 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_2.addItem(spacerItem8, 2, 0, 1, 1) + self.gridLayout_36.addWidget(self.groupBox_6, 0, 0, 1, 1) self.tabWidget_2.addTab(self.cutting_tab, _fromUtf8("")) self.gridLayout_11.addWidget(self.tabWidget_2, 0, 0, 1, 1) self.tabWidget.addTab(self.Modif_Tab, _fromUtf8("")) @@ -860,55 +928,93 @@ class Ui_Form(object): self.tab_3.setObjectName(_fromUtf8("tab_3")) self.gridLayout_35 = QtGui.QGridLayout(self.tab_3) self.gridLayout_35.setObjectName(_fromUtf8("gridLayout_35")) - self.button_isPerpendicular = QtGui.QPushButton(self.tab_3) - icon53 = QtGui.QIcon() - icon53.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isPerpendicular.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isPerpendicular.setIcon(icon53) - self.button_isPerpendicular.setIconSize(QtCore.QSize(32, 32)) - self.button_isPerpendicular.setObjectName(_fromUtf8("button_isPerpendicular")) - self.gridLayout_35.addWidget(self.button_isPerpendicular, 1, 0, 1, 1) self.button_isParallel = QtGui.QPushButton(self.tab_3) - icon54 = QtGui.QIcon() - icon54.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isParallel.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isParallel.setIcon(icon54) + icon57 = QtGui.QIcon() + icon57.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isParallel.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isParallel.setIcon(icon57) self.button_isParallel.setIconSize(QtCore.QSize(32, 32)) self.button_isParallel.setObjectName(_fromUtf8("button_isParallel")) self.gridLayout_35.addWidget(self.button_isParallel, 0, 0, 1, 1) + self.button_isPerpendicular = QtGui.QPushButton(self.tab_3) + icon58 = QtGui.QIcon() + icon58.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isPerpendicular.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isPerpendicular.setIcon(icon58) + self.button_isPerpendicular.setIconSize(QtCore.QSize(32, 32)) + self.button_isPerpendicular.setObjectName(_fromUtf8("button_isPerpendicular")) + self.gridLayout_35.addWidget(self.button_isPerpendicular, 1, 0, 1, 1) self.button_isCoplanar = QtGui.QPushButton(self.tab_3) - icon55 = QtGui.QIcon() - icon55.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isCoplanar.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isCoplanar.setIcon(icon55) + icon59 = QtGui.QIcon() + icon59.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isCoplanar.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isCoplanar.setIcon(icon59) self.button_isCoplanar.setIconSize(QtCore.QSize(32, 32)) self.button_isCoplanar.setObjectName(_fromUtf8("button_isCoplanar")) self.gridLayout_35.addWidget(self.button_isCoplanar, 2, 0, 1, 1) - spacerItem9 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_35.addItem(spacerItem9, 3, 0, 1, 1) - self.tabWidget.addTab(self.tab_3, _fromUtf8("")) + self.button_isClearance = QtGui.QPushButton(self.tab_3) + icon60 = QtGui.QIcon() + icon60.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isClearance.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isClearance.setIcon(icon60) + self.button_isClearance.setIconSize(QtCore.QSize(32, 32)) + self.button_isClearance.setObjectName(_fromUtf8("button_isClearance")) + self.gridLayout_35.addWidget(self.button_isClearance, 3, 0, 1, 1) + spacerItem10 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_35.addItem(spacerItem10, 4, 0, 1, 1) + icon61 = QtGui.QIcon() + icon61.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_check.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget.addTab(self.tab_3, icon61, _fromUtf8("")) self.gridLayout_30.addWidget(self.tabWidget, 0, 0, 1, 1) self.tabWidget_0.addTab(self.tab_2, _fromUtf8("")) - self.gridLayout_4.addWidget(self.tabWidget_0, 0, 0, 1, 1) + self.gridLayout_9.addWidget(self.tabWidget_0, 0, 0, 1, 1) self.scrollArea.setWidget(self.scrollAreaWidgetContents_2) - self.gridLayout_32.addWidget(self.scrollArea, 0, 0, 1, 1) + self.gridLayout_37.addWidget(self.scrollArea, 0, 0, 1, 1) + self.horizontalLayout_9 = QtGui.QHBoxLayout() + self.horizontalLayout_9.setObjectName(_fromUtf8("horizontalLayout_9")) + self.button_WF_quit = QtGui.QPushButton(Form) + self.button_WF_quit.setObjectName(_fromUtf8("button_WF_quit")) + self.horizontalLayout_9.addWidget(self.button_WF_quit) + spacerItem11 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_9.addItem(spacerItem11) + self.label_release = QtGui.QLabel(Form) + self.label_release.setObjectName(_fromUtf8("label_release")) + self.horizontalLayout_9.addWidget(self.label_release) + self.gridLayout_37.addLayout(self.horizontalLayout_9, 1, 0, 1, 1) self.retranslateUi(Form) self.tabWidget_0.setCurrentIndex(0) - self.tabWidget.setCurrentIndex(1) + self.tabWidget.setCurrentIndex(0) self.point_loc_comboBox.setCurrentIndex(1) self.tabWidget_2.setCurrentIndex(0) QtCore.QMetaObject.connectSlotsByName(Form) def retranslateUi(self, Form): Form.setWindowTitle(QtGui.QApplication.translate("Form", "WorkFeature", None, QtGui.QApplication.UnicodeUTF8)) - self.button_WF_quit.setText(QtGui.QApplication.translate("Form", "Close", None, QtGui.QApplication.UnicodeUTF8)) - self.label_release.setText(QtGui.QApplication.translate("Form", "2015", None, QtGui.QApplication.UnicodeUTF8)) self.button_origin.setToolTip(QtGui.QApplication.translate("Form", "Create at origin: a point and X,Y and Z axis and XZ,XY and YZ planes", None, QtGui.QApplication.UnicodeUTF8)) self.button_origin.setText(QtGui.QApplication.translate("Form", "Origin", None, QtGui.QApplication.UnicodeUTF8)) self.groupBox_5.setTitle(QtGui.QApplication.translate("Form", "Preferences :", None, QtGui.QApplication.UnicodeUTF8)) self.radioButton_verbose.setToolTip(QtGui.QApplication.translate("Form", "Toggle here if you want a lot of information printed into report View.", None, QtGui.QApplication.UnicodeUTF8)) self.radioButton_verbose.setText(QtGui.QApplication.translate("Form", "Verbose", None, QtGui.QApplication.UnicodeUTF8)) + self.radioButton_biColor.setToolTip(QtGui.QApplication.translate("Form", "Change the successive lines to be bicolor (red and white) for the following functions:\n" +" - in \"Axis\" TAB:\n" +" Axes=Cut(Wire)\n" +"", None, QtGui.QApplication.UnicodeUTF8)) + self.radioButton_biColor.setText(QtGui.QApplication.translate("Form", "bi Color", None, QtGui.QApplication.UnicodeUTF8)) + self.label_5.setToolTip(QtGui.QApplication.translate("Form", "Change the tolerance for the following functions:\n" +" - in \"Check\" TAB:\n" +" are Parallel?\n" +" are Perpendicular?\n" +" are Coplanar?", None, QtGui.QApplication.UnicodeUTF8)) self.label_5.setText(QtGui.QApplication.translate("Form", "Tolerance", None, QtGui.QApplication.UnicodeUTF8)) + self.tolerance_edit.setToolTip(QtGui.QApplication.translate("Form", "Change the tolerance for the following functions:\n" +" - in \"Check\" TAB:\n" +" are Parallel?\n" +" are Perpendicular?\n" +" are Coplanar?", None, QtGui.QApplication.UnicodeUTF8)) self.tolerance_edit.setText(QtGui.QApplication.translate("Form", "1e-10", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.Origin_Tab), QtGui.QApplication.translate("Form", "Ori. Pref.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_point_on_line.setToolTip(QtGui.QApplication.translate("Form", "Create a Point at a certain distance along the line \n" +"respecting to the choosen reference starting point.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_point_on_line.setText(QtGui.QApplication.translate("Form", "Point along Line", None, QtGui.QApplication.UnicodeUTF8)) + self.distance_point_on_line.setToolTip(QtGui.QApplication.translate("Form", "Distance from the extremity", None, QtGui.QApplication.UnicodeUTF8)) + self.distance_point_on_line.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) self.button_object_center.setToolTip(QtGui.QApplication.translate("Form", "Create a Point at center location of all selected Object(s).\n" " if BBox is not toggled\n" " This point is the MEAN location of all center of Mass (if exist) of all objects.\n" @@ -919,52 +1025,60 @@ class Ui_Form(object): " Be aware this point is not necessary the center of Mass of all Objects!", None, QtGui.QApplication.UnicodeUTF8)) self.button_object_center.setText(QtGui.QApplication.translate("Form", "Object(s) Center", None, QtGui.QApplication.UnicodeUTF8)) self.checkBox_object_center.setText(QtGui.QApplication.translate("Form", "BBox", None, QtGui.QApplication.UnicodeUTF8)) - self.button_Npoints_center.setToolTip(QtGui.QApplication.translate("Form", "Create a Point at mean location of all selected points.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_Npoints_center.setText(QtGui.QApplication.translate("Form", "Points Center", None, QtGui.QApplication.UnicodeUTF8)) self.button_line_center.setToolTip(QtGui.QApplication.translate("Form", "Create Point(s):\n" "Cut each selected Line(s) in 2 (n) parts and create a (n-1) Point(s) at ends of edge(s).\n" "The number indicates how many parts to consider.", None, QtGui.QApplication.UnicodeUTF8)) self.button_line_center.setText(QtGui.QApplication.translate("Form", "Line(s) Center", None, QtGui.QApplication.UnicodeUTF8)) self.spin_line_center.setToolTip(QtGui.QApplication.translate("Form", "The number indicates in how many parts each selected Lines(s) will be cut.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_line_extrema.setToolTip(QtGui.QApplication.translate("Form", "Create Points at start and end location of each selected Line(s).", None, QtGui.QApplication.UnicodeUTF8)) - self.button_line_extrema.setText(QtGui.QApplication.translate("Form", "Line(s) Extrema", None, QtGui.QApplication.UnicodeUTF8)) self.button_circle_center.setToolTip(QtGui.QApplication.translate("Form", "Create a Point at center location of each selected Circle(s) or Arc(s).", None, QtGui.QApplication.UnicodeUTF8)) self.button_circle_center.setText(QtGui.QApplication.translate("Form", "Circle(s) Center", None, QtGui.QApplication.UnicodeUTF8)) - self.button_point_on_line.setToolTip(QtGui.QApplication.translate("Form", "Create a Point at a certain distance along the line \n" -"respecting to the choosen reference starting point.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_point_on_line.setText(QtGui.QApplication.translate("Form", "Point along Line", None, QtGui.QApplication.UnicodeUTF8)) - self.distance_point_on_line.setToolTip(QtGui.QApplication.translate("Form", "Distance from the extremity", None, QtGui.QApplication.UnicodeUTF8)) - self.distance_point_on_line.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) + self.button_Npoints_center.setToolTip(QtGui.QApplication.translate("Form", "Create a Point at mean location of all selected points.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_Npoints_center.setText(QtGui.QApplication.translate("Form", "Points Center", None, QtGui.QApplication.UnicodeUTF8)) + self.button_line_extrema.setToolTip(QtGui.QApplication.translate("Form", "Create Points at start and end location of each selected Line(s).", None, QtGui.QApplication.UnicodeUTF8)) + self.button_line_extrema.setText(QtGui.QApplication.translate("Form", "Line(s) Extrema", None, QtGui.QApplication.UnicodeUTF8)) + self.button_point_face_point.setToolTip(QtGui.QApplication.translate("Form", "Create a projection Point of a Point onto a Face.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_point_face_point.setText(QtGui.QApplication.translate("Form", "Point=(Point,Face)", None, QtGui.QApplication.UnicodeUTF8)) self.button_face_center.setToolTip(QtGui.QApplication.translate("Form", "Create a Point at center location of each selected Face(s).", None, QtGui.QApplication.UnicodeUTF8)) self.button_face_center.setText(QtGui.QApplication.translate("Form", "Face(s) Center", None, QtGui.QApplication.UnicodeUTF8)) self.button_line_face_point.setToolTip(QtGui.QApplication.translate("Form", "Create a point at the intersection of the Line and Plane selected.", None, QtGui.QApplication.UnicodeUTF8)) self.button_line_face_point.setText(QtGui.QApplication.translate("Form", "Point=(Line,Face) ", None, QtGui.QApplication.UnicodeUTF8)) - self.button_point_line_point.setToolTip(QtGui.QApplication.translate("Form", "Create a projection Point of a Point onto a Line and symetric point.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_point_line_point.setText(QtGui.QApplication.translate("Form", "Point=(Line,Point) ", None, QtGui.QApplication.UnicodeUTF8)) - self.button_point_face_point.setToolTip(QtGui.QApplication.translate("Form", "Create a projection Point of a Point onto a Face.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_point_face_point.setText(QtGui.QApplication.translate("Form", "Point=(Point,Face)", None, QtGui.QApplication.UnicodeUTF8)) - self.button_twolines_point.setToolTip(QtGui.QApplication.translate("Form", "Plot one or two Point(s) at minimum distance of two Lines\n" -"Create a Point at intersection of 2 crossing Lines.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_twolines_point.setText(QtGui.QApplication.translate("Form", "Point=(Line,Line) ", None, QtGui.QApplication.UnicodeUTF8)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.Point_Tab1), QtGui.QApplication.translate("Form", "Point 1/2", None, QtGui.QApplication.UnicodeUTF8)) + self.tabWidget.setTabToolTip(self.tabWidget.indexOf(self.Point_Tab1), QtGui.QApplication.translate("Form", "Point", None, QtGui.QApplication.UnicodeUTF8)) self.button_click_for_point.setToolTip(QtGui.QApplication.translate("Form", "Create a set of Points on a Plane perpendicular to the view at location of mouse clicks.\n" "- Click first on the Button then click on the View (with no object in background).\n" "- Click first on the Button then click on the View (with an object in background), it will attach the points to the surface of the object.\n" "", None, QtGui.QApplication.UnicodeUTF8)) self.button_click_for_point.setText(QtGui.QApplication.translate("Form", "Click", None, QtGui.QApplication.UnicodeUTF8)) + self.button_point_line_point.setToolTip(QtGui.QApplication.translate("Form", "Create a projection Point of a Point onto a Line and symetric point.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_point_line_point.setText(QtGui.QApplication.translate("Form", "Point=(Line,Point) ", None, QtGui.QApplication.UnicodeUTF8)) self.button_object_base_point.setToolTip(QtGui.QApplication.translate("Form", "Create Base Point of all selected Object(s).", None, QtGui.QApplication.UnicodeUTF8)) self.button_object_base_point.setText(QtGui.QApplication.translate("Form", "Object(s) Base Point", None, QtGui.QApplication.UnicodeUTF8)) + self.button_twolines_point.setToolTip(QtGui.QApplication.translate("Form", "Plot one or two Point(s) at minimum distance of two Lines\n" +"Create a Point at intersection of 2 crossing Lines.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_twolines_point.setText(QtGui.QApplication.translate("Form", "Point=(Line,Line) ", None, QtGui.QApplication.UnicodeUTF8)) self.button_point_to_sketch.setToolTip(QtGui.QApplication.translate("Form", "Transform Point(s) in Sketch\'s Point(s) by projection onto the Sketch\'s Plane:\n" "- First select an existing Skecth;\n" "- Select as much as Points needed;\n" "Then click on this button.", None, QtGui.QApplication.UnicodeUTF8)) self.button_point_to_sketch.setText(QtGui.QApplication.translate("Form", "Point(s) to Sketch", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.Point_Tab), QtGui.QApplication.translate("Form", "Point", None, QtGui.QApplication.UnicodeUTF8)) - self.button_object_axis.setToolTip(QtGui.QApplication.translate("Form", "Create 3 Axes at center location of all selected Object(s).", None, QtGui.QApplication.UnicodeUTF8)) - self.button_object_axis.setText(QtGui.QApplication.translate("Form", "Object(s) X, Y, Z Axes", None, QtGui.QApplication.UnicodeUTF8)) + self.button_cut_wire_point.setToolTip(QtGui.QApplication.translate("Form", "Create Points by Partition:\n" +"Cut the selected wire(s) in 2(n) parts and create 2(n) Points with function discretize.\n" +"The number indicates in how many parts to cut.\n" +"Wires can be:\n" +" Line\n" +" Circle\n" +" Arc\n" +" Ellipse\n" +"An object must also be seleted but before any Wire! ", None, QtGui.QApplication.UnicodeUTF8)) + self.button_cut_wire_point.setText(QtGui.QApplication.translate("Form", "Points=Cut(wire)", None, QtGui.QApplication.UnicodeUTF8)) + self.spin_wire_cut_point.setToolTip(QtGui.QApplication.translate("Form", "The number indicates in how many parts the selected Line will be cut.", None, QtGui.QApplication.UnicodeUTF8)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.Point_Tab2), QtGui.QApplication.translate("Form", "Point 2/2", None, QtGui.QApplication.UnicodeUTF8)) self.button_twopoints_axis.setToolTip(QtGui.QApplication.translate("Form", "Create an Axis crossing 2 Points.", None, QtGui.QApplication.UnicodeUTF8)) self.button_twopoints_axis.setText(QtGui.QApplication.translate("Form", "Two Points Axis", None, QtGui.QApplication.UnicodeUTF8)) self.extension_twopoints_axis.setToolTip(QtGui.QApplication.translate("Form", "Distance for the extensions on extrema", None, QtGui.QApplication.UnicodeUTF8)) self.extension_twopoints_axis.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) + self.button_object_axis.setToolTip(QtGui.QApplication.translate("Form", "Create 3 Axes at center location of all selected Object(s).", None, QtGui.QApplication.UnicodeUTF8)) + self.button_object_axis.setText(QtGui.QApplication.translate("Form", "Object(s) X, Y, Z Axes", None, QtGui.QApplication.UnicodeUTF8)) self.button_cylinder_axis.setToolTip(QtGui.QApplication.translate("Form", "Create the Axis of a Cylinder.", None, QtGui.QApplication.UnicodeUTF8)) self.button_cylinder_axis.setText(QtGui.QApplication.translate("Form", "Cylinder(s) Axis", None, QtGui.QApplication.UnicodeUTF8)) self.button_plane_axis.setToolTip(QtGui.QApplication.translate("Form", "Create 2 Perpendicular Axes at center location of a Plane.", None, QtGui.QApplication.UnicodeUTF8)) @@ -993,61 +1107,78 @@ class Ui_Form(object): self.button_line_point_axis.setText(QtGui.QApplication.translate("Form", "Axis=(Axis,Point)", None, QtGui.QApplication.UnicodeUTF8)) self.extension_line_point_axis.setToolTip(QtGui.QApplication.translate("Form", "Distance for the extensions on extrema.", None, QtGui.QApplication.UnicodeUTF8)) self.extension_line_point_axis.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) - self.button_twolines_axis.setToolTip(QtGui.QApplication.translate("Form", "Create an Axis between two Axes.\n" -"-Select two Axes.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_twolines_axis.setText(QtGui.QApplication.translate("Form", "Axis=(Line,Line)", None, QtGui.QApplication.UnicodeUTF8)) self.button_plane_point_line_axis.setToolTip(QtGui.QApplication.translate("Form", "Create an Axis Perpendicular to an Axis, crossing a Point and Parallel to a Plane.\n" "-Select one Plane, one Axis and one Point ON the previous Axis.", None, QtGui.QApplication.UnicodeUTF8)) self.button_plane_point_line_axis.setText(QtGui.QApplication.translate("Form", "Axis=(Plane,Point,Axis)", None, QtGui.QApplication.UnicodeUTF8)) - self.button_cut_axis.setToolTip(QtGui.QApplication.translate("Form", "Create Axes:\n" -"Cut the selected Line in 2(n) parts and create 2(n) Axes.\n" -"The number indicates in how many parts to cut.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_cut_axis.setText(QtGui.QApplication.translate("Form", "Axes=Cut(Axis)", None, QtGui.QApplication.UnicodeUTF8)) - self.spin_axis_cut.setToolTip(QtGui.QApplication.translate("Form", "The number indicates in how many parts the selected Line will be cut.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_line_plane_axis.setToolTip(QtGui.QApplication.translate("Form", "Create an Axis on a Plane by projection from anoher Axis.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_line_plane_axis.setText(QtGui.QApplication.translate("Form", "Axis=(Plane,Axis)", None, QtGui.QApplication.UnicodeUTF8)) + self.button_twolines_axis.setToolTip(QtGui.QApplication.translate("Form", "Create an Axis between two Axes.\n" +"-Select two Axes.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_twolines_axis.setText(QtGui.QApplication.translate("Form", "Axis=(Line,Line)", None, QtGui.QApplication.UnicodeUTF8)) self.button_twoplanes_axis.setToolTip(QtGui.QApplication.translate("Form", "Create an Axis by intersect of 2 Planes.", None, QtGui.QApplication.UnicodeUTF8)) self.button_twoplanes_axis.setText(QtGui.QApplication.translate("Form", "Axis=(Plane,Plane)", None, QtGui.QApplication.UnicodeUTF8)) - self.button_click_for_axis.setToolTip(QtGui.QApplication.translate("Form", "Create a set of Lines on a Plane perpendicular to the view at location of 2 mouse clicks.\n" -"- Click first on the Button then at least twice click on the View (with no object in background).\n" -"- Click first on the Button then at least twice click on the View (with an object in background), it will attach the lines to the surface of the object.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_click_for_axis.setText(QtGui.QApplication.translate("Form", "Click", None, QtGui.QApplication.UnicodeUTF8)) - self.button_object_base_axes.setToolTip(QtGui.QApplication.translate("Form", "Create 3 Axes at Base location of all selected Object(s).", None, QtGui.QApplication.UnicodeUTF8)) - self.button_object_base_axes.setText(QtGui.QApplication.translate("Form", "Object(s) Base Axes", None, QtGui.QApplication.UnicodeUTF8)) + self.button_line_plane_axis.setToolTip(QtGui.QApplication.translate("Form", "Create an Axis on a Plane by projection from anoher Axis.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_line_plane_axis.setText(QtGui.QApplication.translate("Form", "Axis=(Plane,Axis)", None, QtGui.QApplication.UnicodeUTF8)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.Axis_Tab1), QtGui.QApplication.translate("Form", "Axis 1/2", None, QtGui.QApplication.UnicodeUTF8)) self.button_line_to_sketch.setToolTip(QtGui.QApplication.translate("Form", "Transform Line(s) in Sketch\'s Line(s) by projection onto the Sketch\'s Plane:\n" "- First select an existing Skecth;\n" "- Select as much as Lines needed;\n" "Then click on this button.", None, QtGui.QApplication.UnicodeUTF8)) self.button_line_to_sketch.setText(QtGui.QApplication.translate("Form", "Axis(es) to Sketch", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.Axis_Tab), QtGui.QApplication.translate("Form", "Axis", None, QtGui.QApplication.UnicodeUTF8)) - self.button_linepoint_circle.setToolTip(QtGui.QApplication.translate("Form", "Select an Axis and a Point to create a Circle\n" -"centered on the Axis and tangenting the Point.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_linepoint_circle.setText(QtGui.QApplication.translate("Form", "Circle=(Axis, point)", None, QtGui.QApplication.UnicodeUTF8)) + self.button_cut_axis.setToolTip(QtGui.QApplication.translate("Form", "Create Axes:\n" +"Cut the selected Line in 2(n) parts and create 2(n) Axes.\n" +"The number indicates in how many parts to cut.\n" +"\n" +"NB: You can change the successive lines to be bicolor (red and white) \n" +"in \"Ori. Pref.\" TAB", None, QtGui.QApplication.UnicodeUTF8)) + self.button_cut_axis.setText(QtGui.QApplication.translate("Form", "Axes=Cut(Axis)", None, QtGui.QApplication.UnicodeUTF8)) + self.spin_axis_cut.setToolTip(QtGui.QApplication.translate("Form", "The number indicates in how many parts the selected Line will be cut.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_object_base_axes.setToolTip(QtGui.QApplication.translate("Form", "Create 3 Axes at Base location of all selected Object(s).", None, QtGui.QApplication.UnicodeUTF8)) + self.button_object_base_axes.setText(QtGui.QApplication.translate("Form", "Object(s) Base Axes", None, QtGui.QApplication.UnicodeUTF8)) + self.button_cut_wire_axis.setToolTip(QtGui.QApplication.translate("Form", "Create Axes by Partition:\n" +"Cut the selected wire(s) in 2(n) parts and create 2(n) Axes with function discretize.\n" +"The number indicates in how many parts to cut.\n" +"Wires can be:\n" +" Line\n" +" Circle\n" +" Arc\n" +" Ellipse\n" +"An object must also be seleted but before any Wire!\n" +"NB: You can change the successive lines to be bicolor (red and white) \n" +"in \"Ori. Pref.\" TAB \n" +"", None, QtGui.QApplication.UnicodeUTF8)) + self.button_cut_wire_axis.setText(QtGui.QApplication.translate("Form", "Axes=Cut(Wire)", None, QtGui.QApplication.UnicodeUTF8)) + self.spin_wire_cut_axis.setToolTip(QtGui.QApplication.translate("Form", "The number indicates in how many parts the selected Line will be cut.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_click_for_axis.setToolTip(QtGui.QApplication.translate("Form", "Create a set of Lines on a Plane perpendicular to the view at location of 2 mouse clicks.\n" +"- Click first on the Button then at least twice click on the View (with no object in background).\n" +"- Click first on the Button then at least twice click on the View (with an object in background), it will attach the lines to the surface of the object.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_click_for_axis.setText(QtGui.QApplication.translate("Form", "Click", None, QtGui.QApplication.UnicodeUTF8)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.Axis_Tab2), QtGui.QApplication.translate("Form", "Axis 2/2", None, QtGui.QApplication.UnicodeUTF8)) self.button_cut_circle.setToolTip(QtGui.QApplication.translate("Form", "Create Arcs:\n" "Cut the selected Circle(s) or Arc(s) in 2(n) parts and create 2(n) Arcs.\n" "The number indicates in how many parts to cut.\n" "- First select as many Circles and Arcs you want\n" "- Second set the number of parts\n" -"- Third push this button", None, QtGui.QApplication.UnicodeUTF8)) +"- Third push this button\n" +"\n" +"NB: You can change the successive lines to be bicolor (red and white) \n" +"in \"Ori. Pref.\" TAB", None, QtGui.QApplication.UnicodeUTF8)) self.button_cut_circle.setText(QtGui.QApplication.translate("Form", "Arcs=Cut(Circle)", None, QtGui.QApplication.UnicodeUTF8)) self.spin_circle_cut.setToolTip(QtGui.QApplication.translate("Form", "The number indicates in how many parts the selected Circle will be cut.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_3points_circle.setToolTip(QtGui.QApplication.translate("Form", "Select 3 Points to create a Circle.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_3points_circle.setText(QtGui.QApplication.translate("Form", "Circle=(3 points)", None, QtGui.QApplication.UnicodeUTF8)) self.button_linecenter_circle.setToolTip(QtGui.QApplication.translate("Form", "Select an Axis and a Point to create a Circle\n" "centered on the Point, perpendicular to the Axis \n" "with the given radius.", None, QtGui.QApplication.UnicodeUTF8)) self.button_linecenter_circle.setText(QtGui.QApplication.translate("Form", "Circle=(Axis, center)", None, QtGui.QApplication.UnicodeUTF8)) self.radius_circle.setToolTip(QtGui.QApplication.translate("Form", "Radius of the Circle.", None, QtGui.QApplication.UnicodeUTF8)) self.radius_circle.setText(QtGui.QApplication.translate("Form", "10.0", None, QtGui.QApplication.UnicodeUTF8)) + self.button_3points_circle.setToolTip(QtGui.QApplication.translate("Form", "Select 3 Points to create a Circle.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_3points_circle.setText(QtGui.QApplication.translate("Form", "Circle=(3 points)", None, QtGui.QApplication.UnicodeUTF8)) self.button_3points_ellipse.setToolTip(QtGui.QApplication.translate("Form", "Select a center and 2 Points to create an Ellipse.", None, QtGui.QApplication.UnicodeUTF8)) self.button_3points_ellipse.setText(QtGui.QApplication.translate("Form", "Ellipse=(3 points)", None, QtGui.QApplication.UnicodeUTF8)) + self.button_linepoint_circle.setToolTip(QtGui.QApplication.translate("Form", "Select an Axis and a Point to create a Circle\n" +"centered on the Axis and tangenting the Point.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_linepoint_circle.setText(QtGui.QApplication.translate("Form", "Circle=(Axis, point)", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), QtGui.QApplication.translate("Form", "Circle", None, QtGui.QApplication.UnicodeUTF8)) self.button_axis_point_plane.setToolTip(QtGui.QApplication.translate("Form", "Create a plane perpendicular to a Line and crossing a Point.", None, QtGui.QApplication.UnicodeUTF8)) self.button_axis_point_plane.setText(QtGui.QApplication.translate("Form", "Plane=(Point, _|Axis)", None, QtGui.QApplication.UnicodeUTF8)) - self.button_axisandpoint_plane.setToolTip(QtGui.QApplication.translate("Form", "Create a plane crossing a Line and a Point.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_axisandpoint_plane.setText(QtGui.QApplication.translate("Form", "Plane=(Point, Axis)", None, QtGui.QApplication.UnicodeUTF8)) - self.button_threepoints_plane.setToolTip(QtGui.QApplication.translate("Form", "Create a Plane crossing 3 Points.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_threepoints_plane.setText(QtGui.QApplication.translate("Form", "Three Points Plane", None, QtGui.QApplication.UnicodeUTF8)) self.button_face_tangent.setToolTip(QtGui.QApplication.translate("Form", "Create a tanget Plane at click location of a Face.\n" "Click first in the view to select and object,\n" "then push the button, \n" @@ -1057,14 +1188,16 @@ class Ui_Form(object): self.length_plane_2.setText(QtGui.QApplication.translate("Form", "10.0", None, QtGui.QApplication.UnicodeUTF8)) self.width_plane_2.setToolTip(QtGui.QApplication.translate("Form", "Width of the Plane.", None, QtGui.QApplication.UnicodeUTF8)) self.width_plane_2.setText(QtGui.QApplication.translate("Form", "10.0", None, QtGui.QApplication.UnicodeUTF8)) - self.button_planeandpoint_plane.setToolTip(QtGui.QApplication.translate("Form", "Create a plane crossing a Point and parallel to a Plane.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_planeandpoint_plane.setText(QtGui.QApplication.translate("Form", "Plane=(Point, Plane)", None, QtGui.QApplication.UnicodeUTF8)) - self.extension_planePointPlane.setToolTip(QtGui.QApplication.translate("Form", "Distance for the extensions of the new Plane compared to initial one.", None, QtGui.QApplication.UnicodeUTF8)) - self.extension_planePointPlane.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) self.button_planeandaxis_plane.setToolTip(QtGui.QApplication.translate("Form", "Create a Plane crossing a Line and perpendicular to a Plane.", None, QtGui.QApplication.UnicodeUTF8)) self.button_planeandaxis_plane.setText(QtGui.QApplication.translate("Form", "Plane=(Plane, Axis)", None, QtGui.QApplication.UnicodeUTF8)) self.angle_planeandaxis_plane.setToolTip(QtGui.QApplication.translate("Form", "Angle relative to the Plane (in degrees).", None, QtGui.QApplication.UnicodeUTF8)) self.angle_planeandaxis_plane.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) + self.button_planeandpoint_plane.setToolTip(QtGui.QApplication.translate("Form", "Create a plane crossing a Point and parallel to a Plane.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_planeandpoint_plane.setText(QtGui.QApplication.translate("Form", "Plane=(Point, Plane)", None, QtGui.QApplication.UnicodeUTF8)) + self.extension_planePointPlane.setToolTip(QtGui.QApplication.translate("Form", "Distance for the extensions of the new Plane compared to initial one.", None, QtGui.QApplication.UnicodeUTF8)) + self.extension_planePointPlane.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) + self.button_threepoints_plane.setToolTip(QtGui.QApplication.translate("Form", "Create a Plane crossing 3 Points.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_threepoints_plane.setText(QtGui.QApplication.translate("Form", "Three Points Plane", None, QtGui.QApplication.UnicodeUTF8)) self.button_object_center_planes.setToolTip(QtGui.QApplication.translate("Form", "Create 3 Planes (XY, XZ and YZ) at center location of all selected Object(s).", None, QtGui.QApplication.UnicodeUTF8)) self.button_object_center_planes.setText(QtGui.QApplication.translate("Form", "Object(s) Center Planes", None, QtGui.QApplication.UnicodeUTF8)) self.button_click_for_plane.setToolTip(QtGui.QApplication.translate("Form", "Create a rectangular Plane perpendicular to the view at location of one mouse click.\n" @@ -1079,6 +1212,8 @@ class Ui_Form(object): self.length_plane.setText(QtGui.QApplication.translate("Form", "10.0", None, QtGui.QApplication.UnicodeUTF8)) self.width_plane.setToolTip(QtGui.QApplication.translate("Form", "Width of the Plane.", None, QtGui.QApplication.UnicodeUTF8)) self.width_plane.setText(QtGui.QApplication.translate("Form", "10.0", None, QtGui.QApplication.UnicodeUTF8)) + self.button_axisandpoint_plane.setToolTip(QtGui.QApplication.translate("Form", "Create a plane crossing a Line and a Point.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_axisandpoint_plane.setText(QtGui.QApplication.translate("Form", "Plane=(Point, Axis)", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.Plane_Tab), QtGui.QApplication.translate("Form", "Plane", None, QtGui.QApplication.UnicodeUTF8)) self.button_cylinder_create.setToolTip(QtGui.QApplication.translate("Form", "Create a Cylinder:\n" "- First select an Axis and a Ref. Point. \n" @@ -1115,15 +1250,7 @@ class Ui_Form(object): "ReClick with same selection, will reverse the direction.", None, QtGui.QApplication.UnicodeUTF8)) self.button_alignview.setText(QtGui.QApplication.translate("Form", "Align View to ...", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.View_Tab), QtGui.QApplication.translate("Form", "View", None, QtGui.QApplication.UnicodeUTF8)) - self.label_angle.setText(QtGui.QApplication.translate("Form", "Angle", None, QtGui.QApplication.UnicodeUTF8)) - self.angle_cut_object.setToolTip(QtGui.QApplication.translate("Form", "Angle of cutting relative to the Reference Plane (in degrees).", None, QtGui.QApplication.UnicodeUTF8)) - self.angle_cut_object.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) - self.label_thickness.setText(QtGui.QApplication.translate("Form", "Thickness", None, QtGui.QApplication.UnicodeUTF8)) - self.thickness_cut_object.setToolTip(QtGui.QApplication.translate("Form", "Thickness of the Cut.", None, QtGui.QApplication.UnicodeUTF8)) - self.thickness_cut_object.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) - self.button_cut_reset.setText(QtGui.QApplication.translate("Form", "Reset", None, QtGui.QApplication.UnicodeUTF8)) - self.button_cut_apply.setToolTip(QtGui.QApplication.translate("Form", "Cut an object by selecting a Line cut, a Plane and an Angle regarding the Plane.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_cut_apply.setText(QtGui.QApplication.translate("Form", "Apply", None, QtGui.QApplication.UnicodeUTF8)) + self.groupBox_6.setTitle(QtGui.QApplication.translate("Form", "Object", None, QtGui.QApplication.UnicodeUTF8)) self.button_cut_select_object.setToolTip(QtGui.QApplication.translate("Form", "Select the Object to cut:\n" "First Click on the object in the view \n" "and push this button to accept...", None, QtGui.QApplication.UnicodeUTF8)) @@ -1137,20 +1264,42 @@ class Ui_Form(object): "and push this button to accept...\n" "(Note that the Angle is calculated from this Plane)", None, QtGui.QApplication.UnicodeUTF8)) self.button_cut_select_plane.setText(QtGui.QApplication.translate("Form", "Select Ref. Plane", None, QtGui.QApplication.UnicodeUTF8)) + self.label_angle.setText(QtGui.QApplication.translate("Form", "Angle", None, QtGui.QApplication.UnicodeUTF8)) + self.angle_cut_object.setToolTip(QtGui.QApplication.translate("Form", "Angle of cutting relative to the Reference Plane (in degrees).", None, QtGui.QApplication.UnicodeUTF8)) + self.angle_cut_object.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) + self.label_thickness.setText(QtGui.QApplication.translate("Form", "Thickness", None, QtGui.QApplication.UnicodeUTF8)) + self.thickness_cut_object.setToolTip(QtGui.QApplication.translate("Form", "Thickness of the Cut.", None, QtGui.QApplication.UnicodeUTF8)) + self.thickness_cut_object.setText(QtGui.QApplication.translate("Form", "0.0", None, QtGui.QApplication.UnicodeUTF8)) + self.button_cut_reset.setText(QtGui.QApplication.translate("Form", "Reset", None, QtGui.QApplication.UnicodeUTF8)) + self.button_cut_apply.setToolTip(QtGui.QApplication.translate("Form", "Cut an object by selecting a Line cut, a Plane and an Angle regarding the Plane.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_cut_apply.setText(QtGui.QApplication.translate("Form", "Apply", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.cutting_tab), QtGui.QApplication.translate("Form", "Cutting", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.Modif_Tab), QtGui.QApplication.translate("Form", "Modif.", None, QtGui.QApplication.UnicodeUTF8)) - self.button_isPerpendicular.setToolTip(QtGui.QApplication.translate("Form", "Check if two faces or two Edges are Perpendicular:\n" -"- Select the 2 faces/planes or 2 Edges/Lines and\n" -"Click this button", None, QtGui.QApplication.UnicodeUTF8)) - self.button_isPerpendicular.setText(QtGui.QApplication.translate("Form", "are Perpendicular ?", None, QtGui.QApplication.UnicodeUTF8)) self.button_isParallel.setToolTip(QtGui.QApplication.translate("Form", "Check if two faces or two Edges are Parallel:\n" "- Select the 2 faces/planes or 2 Edges/Lines and\n" -"Click this button", None, QtGui.QApplication.UnicodeUTF8)) +"Click this button\n" +"\n" +"NB: You can change the tolerance in \"Ori. Pref.\" TAB", None, QtGui.QApplication.UnicodeUTF8)) self.button_isParallel.setText(QtGui.QApplication.translate("Form", "are Parallel ?", None, QtGui.QApplication.UnicodeUTF8)) + self.button_isPerpendicular.setToolTip(QtGui.QApplication.translate("Form", "Check if two faces or two Edges are Perpendicular:\n" +"- Select the 2 faces/planes or 2 Edges/Lines and\n" +"Click this button\n" +"\n" +"NB: You can change the tolerance in \"Ori. Pref.\" TAB", None, QtGui.QApplication.UnicodeUTF8)) + self.button_isPerpendicular.setText(QtGui.QApplication.translate("Form", "are Perpendicular ?", None, QtGui.QApplication.UnicodeUTF8)) self.button_isCoplanar.setToolTip(QtGui.QApplication.translate("Form", "Check if two faces or two Edges are Coplanar:\n" "- Select the 2 faces/planes or 2 Edges/Lines and\n" -"Click this button", None, QtGui.QApplication.UnicodeUTF8)) +"Click this button\n" +"\n" +"NB: You can change the tolerance in \"Ori. Pref.\" TAB", None, QtGui.QApplication.UnicodeUTF8)) self.button_isCoplanar.setText(QtGui.QApplication.translate("Form", "are Coplanar ?", None, QtGui.QApplication.UnicodeUTF8)) + self.button_isClearance.setToolTip(QtGui.QApplication.translate("Form", "Check for two Objects Clearance distance:\n" +"Quick measurements between parallel faces and similarly placed objects\n" +"- Select the 2 Objects and\n" +"Click this button", None, QtGui.QApplication.UnicodeUTF8)) + self.button_isClearance.setText(QtGui.QApplication.translate("Form", "Clearance ?", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), QtGui.QApplication.translate("Form", "Check", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget_0.setTabText(self.tabWidget_0.indexOf(self.tab_2), QtGui.QApplication.translate("Form", "W. F.", None, QtGui.QApplication.UnicodeUTF8)) + self.button_WF_quit.setText(QtGui.QApplication.translate("Form", "Close", None, QtGui.QApplication.UnicodeUTF8)) + self.label_release.setText(QtGui.QApplication.translate("Form", "2015", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/WorkFeature/WFGui_2015.ui b/WorkFeature/WFGui_2015.ui index f622a68..6c86c89 100644 --- a/WorkFeature/WFGui_2015.ui +++ b/WorkFeature/WFGui_2015.ui @@ -6,8 +6,8 @@ 0 0 - 387 - 838 + 378 + 693 @@ -17,38 +17,7 @@ Icons/WF_Axes.svgIcons/WF_Axes.svg - - - - - - - Close - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 2015 - - - - - + @@ -59,11 +28,11 @@ 0 0 - 351 - 813 + 358 + 638 - + @@ -83,7 +52,7 @@ QTabWidget::West - 1 + 0 @@ -93,7 +62,7 @@ Ori. Pref. - + @@ -128,7 +97,7 @@ Preferences : - + @@ -137,12 +106,38 @@ Verbose + + false + + + + Change the successive lines to be bicolor (red and white) for the following functions: + - in "Axis" TAB: + Axes=Cut(Wire) + + + + bi Color + + + false + + + + + + Change the tolerance for the following functions: + - in "Check" TAB: + are Parallel? + are Perpendicular? + are Coplanar? + Tolerance @@ -156,6 +151,13 @@ 16777215 + + Change the tolerance for the following functions: + - in "Check" TAB: + are Parallel? + are Perpendicular? + are Coplanar? + 1e-10 @@ -184,166 +186,30 @@ - + Icons/WF_point.svgIcons/WF_point.svg + Point 1/2 + + Point - - - - - - - Create a Point at center location of all selected Object(s). - if BBox is not toggled - This point is the MEAN location of all center of Mass (if exist) of all objects. - All center of Mass will be created too. - if BBox is toggled - This point is the center of the Global X,Y,Z bounding box of all objects. - This bounding box alway exists (especially for draft objects). - Be aware this point is not necessary the center of Mass of all Objects! - - - Object(s) Center - - - - Icons/WF_centerObjectsPoint.svgIcons/WF_centerObjectsPoint.svg - - - - 32 - 32 - - - - - - - - BBox - - - - - - - - - Create a Point at mean location of all selected points. + + + + + Qt::Vertical - - Points Center - - - - Icons/WF_NpointsPoint.svgIcons/WF_NpointsPoint.svg - - + - 32 - 32 + 20 + 40 - - - - - - - - Create Point(s): -Cut each selected Line(s) in 2 (n) parts and create a (n-1) Point(s) at ends of edge(s). -The number indicates how many parts to consider. - - - Line(s) Center - - - - Icons/WF_centerLinePoint.svgIcons/WF_centerLinePoint.svg - - - - 32 - 32 - - - - - - - - - 40 - 0 - - - - - 50 - 16777215 - - - - The number indicates in how many parts each selected Lines(s) will be cut. - - - 2 - - - 10 - - - 1 - - - - - - - - - Create Points at start and end location of each selected Line(s). - - - Line(s) Extrema - - - - Icons/WF_extremaLinePoint.svgIcons/WF_extremaLinePoint.svg - - - - 32 - 32 - - - - - - - - Create a Point at center location of each selected Circle(s) or Arc(s). - - - Circle(s) Center - - - - Icons/WF_centerCirclePoint.svgIcons/WF_centerCirclePoint.svg - - - - 32 - 32 - - - + @@ -358,6 +224,12 @@ The number indicates how many parts to consider. 0 + + + 16777215 + 16777215 + + Create a Point at a certain distance along the line respecting to the choosen reference starting point. @@ -407,6 +279,184 @@ respecting to the choosen reference starting point. + + + + + + Create a Point at center location of all selected Object(s). + if BBox is not toggled + This point is the MEAN location of all center of Mass (if exist) of all objects. + All center of Mass will be created too. + if BBox is toggled + This point is the center of the Global X,Y,Z bounding box of all objects. + This bounding box alway exists (especially for draft objects). + Be aware this point is not necessary the center of Mass of all Objects! + + + Object(s) Center + + + + Icons/WF_centerObjectsPoint.svgIcons/WF_centerObjectsPoint.svg + + + + 32 + 32 + + + + + + + + BBox + + + + + + + + + + + + 16777215 + 16777215 + + + + Create Point(s): +Cut each selected Line(s) in 2 (n) parts and create a (n-1) Point(s) at ends of edge(s). +The number indicates how many parts to consider. + + + Line(s) Center + + + + Icons/WF_centerLinePoint.svgIcons/WF_centerLinePoint.svg + + + + 32 + 32 + + + + + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + The number indicates in how many parts each selected Lines(s) will be cut. + + + 2 + + + 100 + + + 1 + + + + + + + + + Create a Point at center location of each selected Circle(s) or Arc(s). + + + Circle(s) Center + + + + Icons/WF_centerCirclePoint.svgIcons/WF_centerCirclePoint.svg + + + + 32 + 32 + + + + + + + + Create a Point at mean location of all selected points. + + + Points Center + + + + Icons/WF_NpointsPoint.svgIcons/WF_NpointsPoint.svg + + + + 32 + 32 + + + + + + + + Create Points at start and end location of each selected Line(s). + + + Line(s) Extrema + + + + Icons/WF_extremaLinePoint.svgIcons/WF_extremaLinePoint.svg + + + + 32 + 32 + + + + + + + + Create a projection Point of a Point onto a Face. + + + Point=(Point,Face) + + + + Icons/WF_pointFacePoint.svgIcons/WF_pointFacePoint.svg + + + + 32 + 32 + + + + @@ -447,68 +497,25 @@ respecting to the choosen reference starting point. - - - - Create a projection Point of a Point onto a Line and symetric point. - - - Point=(Line,Point) - - - - Icons/WF_pointLinePoint.svgIcons/WF_pointLinePoint.svg - - - - 32 - 32 - - - - - - - - Create a projection Point of a Point onto a Face. - - - Point=(Point,Face) - - - - Icons/WF_pointFacePoint.svgIcons/WF_pointFacePoint.svg - - - - 32 - 32 - - - - - - - - Plot one or two Point(s) at minimum distance of two Lines -Create a Point at intersection of 2 crossing Lines. - - - Point=(Line,Line) - - - - Icons/WF_lineLinePoint.svgIcons/WF_lineLinePoint.svg - - - - 32 - 32 - - - - - + + button_line_extrema + button_circle_center + button_face_center + button_line_face_point + button_point_face_point + button_Npoints_center + verticalSpacer_10 + + + + + ../Icons/WF_point.svg../Icons/WF_point.svg + + + Point 2/2 + + + Create a set of Points on a Plane perpendicular to the view at location of mouse clicks. @@ -534,7 +541,27 @@ Create a Point at intersection of 2 crossing Lines. - + + + + Create a projection Point of a Point onto a Line and symetric point. + + + Point=(Line,Point) + + + + Icons/WF_pointLinePoint.svgIcons/WF_pointLinePoint.svg + + + + 32 + 32 + + + + + Create Base Point of all selected Object(s). @@ -554,7 +581,28 @@ Create a Point at intersection of 2 crossing Lines. - + + + + Plot one or two Point(s) at minimum distance of two Lines +Create a Point at intersection of 2 crossing Lines. + + + Point=(Line,Line) + + + + Icons/WF_lineLinePoint.svgIcons/WF_lineLinePoint.svg + + + + 32 + 32 + + + + + Transform Point(s) in Sketch's Point(s) by projection onto the Sketch's Plane: @@ -577,48 +625,96 @@ Then click on this button. + + + + + + + 16777215 + 16777215 + + + + Create Points by Partition: +Cut the selected wire(s) in 2(n) parts and create 2(n) Points with function discretize. +The number indicates in how many parts to cut. +Wires can be: + Line + Circle + Arc + Ellipse +An object must also be seleted but before any Wire! + + + Points=Cut(wire) + + + + ../Icons/WF_cutWirePoints.svg../Icons/WF_cutWirePoints.svg + + + + 32 + 32 + + + + + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + The number indicates in how many parts the selected Line will be cut. + + + 2 + + + 100 + + + 1 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - button_line_extrema - button_circle_center - button_face_center - button_line_face_point - button_point_line_point - button_point_face_point - button_twolines_point - button_click_for_point - button_object_base_point - button_Npoints_center - button_point_to_sketch - + Icons/WF_axis.svgIcons/WF_axis.svg - Axis + Axis 1/2 - - - - - Create 3 Axes at center location of all selected Object(s). - - - Object(s) X, Y, Z Axes - - - - Icons/WF_centerObjectsAxes.svgIcons/WF_centerObjectsAxes.svg - - - - 32 - 32 - - - - + @@ -629,6 +725,12 @@ Then click on this button. 0 + + + 16777215 + 16777215 + + Create an Axis crossing 2 Points. @@ -665,12 +767,38 @@ Then click on this button. + + + + Create 3 Axes at center location of all selected Object(s). + + + Object(s) X, Y, Z Axes + + + + Icons/WF_centerObjectsAxes.svgIcons/WF_centerObjectsAxes.svg + + + + 32 + 32 + + + + + + + 16777215 + 16777215 + + Create the Axis of a Cylinder. @@ -754,6 +882,18 @@ then click on a location on the selected object. + + + 60 + 0 + + + + + 50 + 16777215 + + QFrame::StyledPanel @@ -761,15 +901,6 @@ then click on a location on the selected object. QFrame::Raised - - 0 - - - 1 - - - 0 - @@ -803,6 +934,12 @@ then click on a location on the selected object. + + + 16777215 + 16777215 + + Create an Axis Parallel to an Axis and crossing a Point. -Select one Axis and one Point NOT on the previous Axis. @@ -868,6 +1005,18 @@ End of the line. 0 + + + 0 + 0 + + + + + 16777215 + 16777215 + + Create an Axis Perpendicular to an Axis and crossing a Point -Select one Axis and one Point NOT on the previous Axis. @@ -905,27 +1054,6 @@ End of the line. - - - - Create an Axis between two Axes. --Select two Axes. - - - Axis=(Line,Line) - - - - Icons/WF_twoLinesAxis.svgIcons/WF_twoLinesAxis.svg - - - - 32 - 32 - - - - @@ -947,14 +1075,131 @@ End of the line. + + + + Create an Axis between two Axes. +-Select two Axes. + + + Axis=(Line,Line) + + + + Icons/WF_twoLinesAxis.svgIcons/WF_twoLinesAxis.svg + + + + 32 + 32 + + + + + + + + Create an Axis by intersect of 2 Planes. + + + Axis=(Plane,Plane) + + + + Icons/WF_2PlanesAxis.svgIcons/WF_2PlanesAxis.svg + + + + 32 + 32 + + + + + + + Create an Axis on a Plane by projection from anoher Axis. + + + Axis=(Plane,Axis) + + + + Icons/WF_linePlaneAxis.svgIcons/WF_linePlaneAxis.svg + + + + 32 + 32 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + ../Icons/WF_axis.svg../Icons/WF_axis.svg + + + Axis 2/2 + + + + + + Transform Line(s) in Sketch's Line(s) by projection onto the Sketch's Plane: +- First select an existing Skecth; +- Select as much as Lines needed; +Then click on this button. + + + Axis(es) to Sketch + + + + ../Icons/WF_2Sketch.svg../Icons/WF_2Sketch.svg + + + + 32 + 32 + + + + + + + + 16777215 + 16777215 + + Create Axes: Cut the selected Line in 2(n) parts and create 2(n) Axes. -The number indicates in how many parts to cut. +The number indicates in how many parts to cut. + +NB: You can change the successive lines to be bicolor (red and white) +in "Ori. Pref." TAB Axes=Cut(Axis) @@ -992,7 +1237,7 @@ The number indicates in how many parts to cut. 2 - 10 + 100 1 @@ -1001,17 +1246,17 @@ The number indicates in how many parts to cut. - - + + - Create an Axis on a Plane by projection from anoher Axis. + Create 3 Axes at Base location of all selected Object(s). - Axis=(Plane,Axis) + Object(s) Base Axes - Icons/WF_linePlaneAxis.svgIcons/WF_linePlaneAxis.svg + Icons/WF_baseObjectsAxes.svgIcons/WF_baseObjectsAxes.svg @@ -1021,27 +1266,76 @@ The number indicates in how many parts to cut. - - - - Create an Axis by intersect of 2 Planes. - - - Axis=(Plane,Plane) - - - - Icons/WF_2PlanesAxis.svgIcons/WF_2PlanesAxis.svg - - - - 32 - 32 - - - + + + + + + + 16777215 + 16777215 + + + + Create Axes by Partition: +Cut the selected wire(s) in 2(n) parts and create 2(n) Axes with function discretize. +The number indicates in how many parts to cut. +Wires can be: + Line + Circle + Arc + Ellipse +An object must also be seleted but before any Wire! +NB: You can change the successive lines to be bicolor (red and white) +in "Ori. Pref." TAB + + + + Axes=Cut(Wire) + + + + ../Icons/WF_cutWireAxes.svg../Icons/WF_cutWireAxes.svg + + + + 32 + 32 + + + + + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + The number indicates in how many parts the selected Line will be cut. + + + 2 + + + 100 + + + 1 + + + + - + Create a set of Lines on a Plane perpendicular to the view at location of 2 mouse clicks. @@ -1063,48 +1357,18 @@ The number indicates in how many parts to cut. - - - - Create 3 Axes at Base location of all selected Object(s). + + + + Qt::Vertical - - Object(s) Base Axes - - - - Icons/WF_baseObjectsAxes.svgIcons/WF_baseObjectsAxes.svg - - + - 32 - 32 + 20 + 40 - - - - - - Transform Line(s) in Sketch's Line(s) by projection onto the Sketch's Plane: -- First select an existing Skecth; -- Select as much as Lines needed; -Then click on this button. - - - Axis(es) to Sketch - - - - ../Icons/WF_2Sketch.svg../Icons/WF_2Sketch.svg - - - - 32 - 32 - - - + @@ -1116,28 +1380,7 @@ Then click on this button. Circle - - - - - Select an Axis and a Point to create a Circle -centered on the Axis and tangenting the Point. - - - Circle=(Axis, point) - - - - ../Icons/WF_linePointCircle.svg../Icons/WF_linePointCircle.svg - - - - 32 - 32 - - - - + @@ -1148,7 +1391,10 @@ Cut the selected Circle(s) or Arc(s) in 2(n) parts and create 2(n) Arcs. The number indicates in how many parts to cut. - First select as many Circles and Arcs you want - Second set the number of parts -- Third push this button +- Third push this button + +NB: You can change the successive lines to be bicolor (red and white) +in "Ori. Pref." TAB Arcs=Cut(Circle) @@ -1186,7 +1432,7 @@ The number indicates in how many parts to cut. 2 - 10 + 100 1 @@ -1195,26 +1441,6 @@ The number indicates in how many parts to cut. - - - - Select 3 Points to create a Circle. - - - Circle=(3 points) - - - - ../Icons/WF_3pointsCircle.svg../Icons/WF_3pointsCircle.svg - - - - 32 - 32 - - - - @@ -1263,6 +1489,39 @@ with the given radius. + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Select 3 Points to create a Circle. + + + Circle=(3 points) + + + + ../Icons/WF_3pointsCircle.svg../Icons/WF_3pointsCircle.svg + + + + 32 + 32 + + + + @@ -1283,18 +1542,26 @@ with the given radius. - - - - Qt::Vertical + + + + Select an Axis and a Point to create a Circle +centered on the Axis and tangenting the Point. - + + Circle=(Axis, point) + + + + ../Icons/WF_linePointCircle.svg../Icons/WF_linePointCircle.svg + + - 20 - 40 + 32 + 32 - + @@ -1306,7 +1573,7 @@ with the given radius. Plane - + @@ -1327,46 +1594,6 @@ with the given radius. - - - - Create a plane crossing a Line and a Point. - - - Plane=(Point, Axis) - - - - Icons/WF_linePointPlane.svgIcons/WF_linePointPlane.svg - - - - 32 - 32 - - - - - - - - Create a Plane crossing 3 Points. - - - Three Points Plane - - - - Icons/WF_threePointsPlane.svgIcons/WF_threePointsPlane.svg - - - - 32 - 32 - - - - @@ -1456,65 +1683,6 @@ then click on a location on the selected object. - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Create a plane crossing a Point and parallel to a Plane. - - - Plane=(Point, Plane) - - - - Icons/WF_pointPlanePoint.svgIcons/WF_pointPlanePoint.svg - - - - 32 - 32 - - - - - - - - - 40 - 0 - - - - - 60 - 16777215 - - - - Distance for the extensions of the new Plane compared to initial one. - - - 0.0 - - - - - @@ -1573,7 +1741,73 @@ then click on a location on the selected object. - + + + + + + Create a plane crossing a Point and parallel to a Plane. + + + Plane=(Point, Plane) + + + + Icons/WF_pointPlanePoint.svgIcons/WF_pointPlanePoint.svg + + + + 32 + 32 + + + + + + + + + 40 + 0 + + + + + 60 + 16777215 + + + + Distance for the extensions of the new Plane compared to initial one. + + + 0.0 + + + + + + + + + Create a Plane crossing 3 Points. + + + Three Points Plane + + + + Icons/WF_threePointsPlane.svgIcons/WF_threePointsPlane.svg + + + + 32 + 32 + + + + + Create 3 Planes (XY, XZ and YZ) at center location of all selected Object(s). @@ -1593,19 +1827,6 @@ then click on a location on the selected object. - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -1698,6 +1919,39 @@ Define the width and the length of the Plane if needed. + + + + Create a plane crossing a Line and a Point. + + + Plane=(Point, Axis) + + + + Icons/WF_linePointPlane.svgIcons/WF_linePointPlane.svg + + + + 32 + 32 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -2028,339 +2282,335 @@ ReClick with same selection, will reverse the direction. Cutting - - - - - + + + + 9 + 9 + 190 + 369 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Object + + - - - - 70 - 16777215 - - - - Angle - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - Angle of cutting relative to the Reference Plane (in degrees). - - - 0.0 - - - - - - - - - - - - 70 - 16777215 - - - - Thickness - - - - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - Thickness of the Cut. - - - 0.0 - - - - - - - - - - - - 40 - 0 - - - - - 60 - 16777215 - - - - Reset - - - - - - - Qt::Horizontal - - - - 18 - 20 - - - - - - - - false - - - - 50 - 16777215 - - - - Cut an object by selecting a Line cut, a Plane and an Angle regarding the Plane. - - - Apply - - - - 32 - 32 - - - - - - - - - - - - - - - 130 - 31 - - - - - 250 - 40 - - - - Select the Object to cut: + + + + + + 130 + 31 + + + + + 250 + 40 + + + + Select the Object to cut: First Click on the object in the view and push this button to accept... - - - Select Object - - - - - - - false - - - - 0 - 0 - - - - true - - - - - - - false - - - - 130 - 31 - - - - - 250 - 40 - - - - Select the Line to cut the Object along: + + + Select Object + + + + + + + false + + + + 0 + 0 + + + + true + + + + + + + false + + + + 130 + 31 + + + + + 250 + 40 + + + + Select the Line to cut the Object along: First Click on the line/edge in the view and push this button to accept... - - - Select Cut Line - - - - - - - false - - - - 0 - 0 - - - - true - - - - - - - false - - - - 130 - 31 - - - - - 250 - 40 - - - - Select the reference Plane to cut the Object from: + + + Select Cut Line + + + + + + + false + + + + 0 + 0 + + + + true + + + + + + + false + + + + 130 + 31 + + + + + 250 + 40 + + + + Select the reference Plane to cut the Object from: First Click on the plane in the view and push this button to accept... (Note that the Angle is calculated from this Plane) - - - Select Ref. Plane - - - - - - - false - - - - 0 - 0 - - - - true - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + Select Ref. Plane + + + + + + + false + + + + 0 + 0 + + + + true + + + + + + + + + + + + + + 70 + 16777215 + + + + Angle + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 50 + 16777215 + + + + Angle of cutting relative to the Reference Plane (in degrees). + + + 0.0 + + + + + + + + + + + + 70 + 16777215 + + + + Thickness + + + + + + + + 0 + 0 + + + + + 50 + 16777215 + + + + Thickness of the Cut. + + + 0.0 + + + + + + + + + + + + 40 + 0 + + + + + 60 + 16777215 + + + + Reset + + + + + + + Qt::Horizontal + + + + 18 + 20 + + + + + + + + false + + + + 50 + 16777215 + + + + Cut an object by selecting a Line cut, a Plane and an Angle regarding the Plane. + + + Apply + + + + 32 + 32 + + + + + + + + + + + + + + + + ../Icons/WF_check.svg../Icons/WF_check.svg + Check - - - - Check if two faces or two Edges are Perpendicular: -- Select the 2 faces/planes or 2 Edges/Lines and -Click this button - - - are Perpendicular ? - - - - ../Icons/WF_isPerpendicular.svg../Icons/WF_isPerpendicular.svg - - - - 32 - 32 - - - - Check if two faces or two Edges are Parallel: - Select the 2 faces/planes or 2 Edges/Lines and -Click this button +Click this button + +NB: You can change the tolerance in "Ori. Pref." TAB are Parallel ? @@ -2377,12 +2627,38 @@ Click this button + + + + Check if two faces or two Edges are Perpendicular: +- Select the 2 faces/planes or 2 Edges/Lines and +Click this button + +NB: You can change the tolerance in "Ori. Pref." TAB + + + are Perpendicular ? + + + + ../Icons/WF_isPerpendicular.svg../Icons/WF_isPerpendicular.svg + + + + 32 + 32 + + + + Check if two faces or two Edges are Coplanar: - Select the 2 faces/planes or 2 Edges/Lines and -Click this button +Click this button + +NB: You can change the tolerance in "Ori. Pref." TAB are Coplanar ? @@ -2400,6 +2676,29 @@ Click this button + + + Check for two Objects Clearance distance: +Quick measurements between parallel faces and similarly placed objects +- Select the 2 Objects and +Click this button + + + Clearance ? + + + + ../Icons/WF_isClearance.svg../Icons/WF_isClearance.svg + + + + 32 + 32 + + + + + Qt::Vertical @@ -2424,6 +2723,37 @@ Click this button + + + + + + Close + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 2015 + + + + + diff --git a/WorkFeature/__init__.py b/WorkFeature/__init__.py index ba78e56..2854c15 100644 --- a/WorkFeature/__init__.py +++ b/WorkFeature/__init__.py @@ -10,7 +10,7 @@ * galou_breizh for macro which creates a circle from 3 selected points * * Eriossoltero for macro Ellipse-Center+2Points * * Many Thanks to wmayer for his active help on testing and debbuging * -* Special thanks to Mario52 for FCCamera code, cutCircle... * +* Special thanks to Mario52 for FCCamera code, cutCircle, cutWire... * * for bounding box codes, advices, diverse pieces of codes * * and all discussions...merci Mario * *************************************************************************** @@ -51,7 +51,7 @@ if not sys.path.__contains__("/usr/lib/freecad/lib"): import WFGui_2015 as WFGui global myRelease -myRelease = "2105_03_08" +myRelease = "2105_03_15" import os.path import math @@ -89,9 +89,13 @@ global verbose verbose=0 global tolerance tolerance=1e-10 +global biColor +biColor=0 m_numberLinePart = 2 m_numberLineCut = 2 +m_numberPointCutWire = 2 +m_numberAxisCutWire = 2 m_numberCircleCut = 2 m_distanceLinePoint = 0.0 m_extensionTwoPointsAxis = 0.0 @@ -217,6 +221,7 @@ def print_segment(segment, msg=""): "z2 =" + str(point2.z)) return + def verbose_toggled(flag): """ Respond to the change of verbose flag. """ @@ -224,6 +229,21 @@ def verbose_toggled(flag): verbose=0 if flag == True: verbose=1 + print_msg("verbose flag is : " + str(verbose)) + + +def biColor_toggled(flag): + """ Respond to the change of biColor flag. + """ + global verbose + msg=verbose + global biColor + biColor=0 + if flag == True: + biColor=1 + if msg != 0: + print_msg("biColor flag is : " + str(biColor)) + def init_min_max(): """ Return min and max values from System. @@ -239,14 +259,15 @@ def init_min_max(): return min_val, max_val -def alignCamera(sub0,sub1,reverse=False,info=0): - """ Align the camera along an Axis crossing 2 points. +def alignCamera(point1,point2,reverse=False,info=0): + """ Align the camera along an Axis crossing the 2 points in input. + reverse=True to exchange points 1 and 2 """ # Build vectors difference if reverse: - v=sub0.sub(sub1) + v=point1.sub(point2) else: - v=sub1.sub(sub0) + v=point2.sub(point1) if info != 0: print_msg("Vectors difference is :" + str(v)) r=App.Rotation(App.Vector(0,0,1),v) @@ -1819,7 +1840,7 @@ def plot_centerLinePoint(): part = "Part::Feature" global m_numberLinePart - if not (m_numberLinePart >= 2 and m_numberLinePart <= 10) : + if not (m_numberLinePart >= 2 and m_numberLinePart <= 100) : m_numberLinePart = 2 Selection = get_SelectedObjects(info=msg, printError=False) try: @@ -2180,6 +2201,149 @@ def plot_2LinesPoint(): printError_msg(error_msg) +def numberPointCutWire(value): + """ Respond to the change in number of cut value from the spin box. + """ + global verbose + msg=verbose + + try: + # First we check if a valid number have been entered + global m_numberPointCutWire + if str(value) == '-': + return + m_numberPointCutWire = int(value) + if msg != 0: + print_msg("New number is :" + str(m_numberPointCutWire)) + except ValueError: + printError_msg("Number must be valid !") + + +def cutWire(numberOfPoints, createPoint=1, createLine=0): + """ Partition a Wire and create points, lines, with possible two colours of line. + + Original code from : Mario52 03/2015 + Adapted to WF by : Rentlau_64 03/2015 + """ + + def createLines(number, listOfPoints): + """ Create line + """ + global biColor + m_points = listOfPoints + m_numberOfLines = number - 1 + m_biColor = biColor + if msg != 0: + print_msg("Number of Lines =" + str(m_numberOfLines)) + print_msg("Points =" + str(m_points)) + print_msg("biColor =" + str(m_biColor)) + + red = 0 + createFolders('WorkAxis') + for m_lin in range(m_numberOfLines): + Vector_A = Base.Vector(m_points[m_lin]) + Vector_B = Base.Vector(m_points[m_lin+1]) + #creaLine = [Vector_A,Vector_B] + axis_User_Name, axis = plot_axis(Vector_A, Vector_B, part="Part::Feature", name="Axis_Wire", grp="WorkAxis") + #wire = Draft.makeWire(creaLine,closed=False,face=False,support=None) + # Optional biColor + if m_biColor != 0 : + if red == 0: + # 255 = 1 (10 = (1/255 * 10 )) + #FreeCADGui.ActiveDocument.getObject(wire.Name).LineColor = (1.0,0.0,0.0) + Gui.ActiveDocument.getObject(axis_User_Name).LineColor = (1.0,0.0,0.0) + red = 1 + else: + #FreeCADGui.ActiveDocument.getObject(wire.Name).LineColor = (1.0,1.0,1.0) + Gui.ActiveDocument.getObject(axis_User_Name).LineColor = (1.0,1.0,1.0) + red = 0 + + global verbose + msg=verbose + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc == None: + return None + + error_msg = "Unable to select Wire(s) : \nSelect at least one Edge\nor one Object !" + m_points = [] + del m_points[:] + if msg != 0: + print_msg("Number of cuts =" + str(numberOfPoints)) + print_msg("CreatePoint flag=" + str(createPoint)) + print_msg("CreateLine flag =" + str(createLine)) + numberOfPoints += 1 + + try: + selectionObjects = Gui.Selection.getSelectionEx() + if msg!=0: + print_msg("SelectionObjects is :" + str(selectionObjects)) + found = 0 + for sel in selectionObjects: + if msg!=0: + print_msg("Selection is :" + str(sel)) + #if hasattr(sel,'SubObjects') + if sel.HasSubObjects: + if msg!=0: + print_msg("Found SubObjects") + for sub in sel.SubObjects: + if hasattr(sub,'Edges'): + compteur = 0 + for edge in sub.Edges: + if msg!=0: + print_msg("Edge is :" + str(edge)) + if hasattr(edge,'discretize'): + found = 1 + compteur += 1 + points = edge.discretize(numberOfPoints) + for p in points: + if createPoint != 0: + plot_point(p, part="Part::Feature", name="Point_Wire", grp="WorkPoints") + #Draft.makePoint( p.x, p.y, p.z) + print_point(p, msg=str(compteur) +" :") + if createLine != 0: + if msg!=0: + print_msg("createLines function call ") + createLines(numberOfPoints, points) + + else: + shape = sel.Object.Shape + if msg!=0: + print_msg("Found NO SubObjects") + print_msg("Shape is :" + str(shape)) + + + if hasattr(shape,'Edges'): + compteur = 0 + for edge in shape.Edges: + if msg!=0: + print_msg("Edge is :" + str(edge)) + if hasattr(edge,'discretize'): + found = 1 + compteur += 1 + points = edge.discretize(numberOfPoints) + for p in points: + if createPoint != 0: + plot_point(p, part="Part::Feature", name="Point_Wire", grp="WorkPoints") + #Draft.makePoint( p.x, p.y, p.z) + print_point(p, msg=str(compteur) +" :") + if createLine != 0: + createLines(numberOfPoints, points) + if found == 0: + printError_msg(error_msg) + except: + printError_msg(error_msg) + + return + +def plot_cutWirePoint(): + createFolders('WorkPoints') + global m_numberPointCutWire + if not (m_numberPointCutWire >= 2 and m_numberPointCutWire <= 100) : + m_numberPointCutWire = 2 + cutWire(m_numberPointCutWire, createPoint=1, createLine=0) + + def plot_clickForPoint(): """ Plot a Point at location of a mouse click. """ @@ -2279,20 +2443,23 @@ def point_toSketch(): # Get Point(s) from the selection for m_i in range(1,m_num): m_obj = m_selEx[m_i] - SubObject = m_obj.SubObjects[0] - if SubObject.ShapeType == "Vertex": - if msg != 0: - print_msg("Found a Points object!") - Point = m_obj.SubObjects[0] - # Get the Point - m_p = Point.Point - # Projection of the Point selected onto the Sketch Plane - Projection = m_p.projectToPlane(m_sketch.Placement.Base, m_recN) - # Append the Projection - geoList.append(Part.Point(Projection)) - # Add the geometry list to the Sketch - m_sketch.addGeometry(geoList) - m_num_point = m_num_point + 1 + if len(m_obj.SubObjects) != 0: + SubObject = m_obj.SubObjects[0] + if SubObject.ShapeType == "Vertex": + if msg != 0: + print_msg("Found a Points object!") + Point = m_obj.SubObjects[0] + # Get the Point + m_p = Point.Point + # Projection of the Point selected onto the Sketch Plane + Projection = m_p.projectToPlane(m_sketch.Placement.Base, m_recN) + # Append the Projection + geoList.append(Part.Point(Projection)) + # Add the geometry list to the Sketch + m_sketch.addGeometry(geoList) + m_num_point = m_num_point + 1 + else: + continue else: continue # Refresh @@ -2656,6 +2823,7 @@ def plot_2LinesAxis(): except: printError_msg(error_msg) + def numberLineCut(value): """ Respond to the change in number of cut value from the spin box. """ @@ -2681,6 +2849,8 @@ def plot_cutAxis(): """ global verbose msg=verbose + global biColor + red = 0 m_actDoc = get_ActiveDocument(info=msg) if m_actDoc == None: @@ -2693,7 +2863,7 @@ def plot_cutAxis(): part = "Part::Feature" global m_numberLineCut - if not (m_numberLineCut >= 2 and m_numberLineCut <= 10) : + if not (m_numberLineCut >= 2 and m_numberLineCut <= 100) : m_numberLineCut = 2 if msg != 0: print_msg("Number_of_cuts=" + str(m_numberLineCut)) @@ -2718,6 +2888,14 @@ def plot_cutAxis(): print_point(Vector_A,"Vector_A is : ") print_point(Vector_B,"Vector_B is : ") Axis_User_Name, axis = plot_axis(Vector_A, Vector_B, part, name) + if biColor != 0: + if red == 0: + Gui.ActiveDocument.getObject(Axis_User_Name).LineColor = (1.0,0.0,0.0) + red = 1 + else: + Gui.ActiveDocument.getObject(Axis_User_Name).LineColor = (1.0,1.0,1.0) + red = 0 + Vector_A = Vector_B #Vector_B = edge.valueAt( edge.Length ) Vector_B = edge.Vertexes[-1].Point @@ -2725,6 +2903,14 @@ def plot_cutAxis(): print_point(Vector_A,"Vector_A is : ") print_point(Vector_B,"Vector_B is : ") Axis_User_Name, axis = plot_axis(Vector_A, Vector_B, part, name) + if biColor != 0: + if red == 0: + Gui.ActiveDocument.getObject(Axis_User_Name).LineColor = (1.0,0.0,0.0) + red = 1 + else: + Gui.ActiveDocument.getObject(Axis_User_Name).LineColor = (1.0,1.0,1.0) + red = 0 + print_msg(str(Axis_User_Name) + result_msg ) Gui.ActiveDocument.getObject(str(m_objNames[i])).Visibility=False @@ -2732,6 +2918,32 @@ def plot_cutAxis(): except: printError_msg(error_msg) + +def numberAxisCutWire(value): + """ Respond to the change in number of cut value from the spin box. + """ + global verbose + msg=verbose + + try: + # First we check if a valid number have been entered + global m_numberAxisCutWire + if str(value) == '-': + return + m_numberAxisCutWire = int(value) + if msg != 0: + print_msg("New number is :" + str(m_numberAxisCutWire)) + except ValueError: + printError_msg("Number must be valid !") + + +def plot_cutWireAxis(): + createFolders('WorkAxis') + global m_numberAxisCutWire + if not (m_numberAxisCutWire >= 2 and m_numberAxisCutWire <= 100) : + m_numberAxisCutWire = 2 + cutWire(m_numberAxisCutWire, createPoint=0, createLine=1) + def extensionLinePointAxis(value): """ Respond to the change in extension value from the text box. @@ -3525,6 +3737,8 @@ def plot_cutCircle(): """ global verbose msg=verbose + global biColor + red = 0 m_actDoc = get_ActiveDocument(info=msg) if m_actDoc == None: @@ -3537,7 +3751,7 @@ def plot_cutCircle(): part = "Part::Feature" global m_numberCircleCut - if not (m_numberCircleCut >= 2 and m_numberCircleCut <= 10) : + if not (m_numberCircleCut >= 2 and m_numberCircleCut <= 100) : m_numberCircleCut = 2 if msg != 0: print_msg("Number of cuts=" + str(m_numberCircleCut)) @@ -3595,9 +3809,17 @@ def plot_cutCircle(): print_msg("Start at =" +str(pivot1)) print_msg("End at =" +str(pivot2)) Arc_User_Name, arc = plot_arc(center, normal, radius, pivot1, pivot2, part, name) + if biColor != 0: + if red == 0: + Gui.ActiveDocument.getObject(Arc_User_Name).LineColor = (1.0,0.0,0.0) + red = 1 + else: + Gui.ActiveDocument.getObject(Arc_User_Name).LineColor = (1.0,1.0,1.0) + red = 0 pivot1 += pivot0 print_msg(str(Arc_User_Name) + result_msg ) + Gui.ActiveDocument.getObject(label).Visibility=False elif (label[:8] == "Cylinder"): if msg != 0: @@ -3629,7 +3851,7 @@ def plot_cutCircle(): First = float(piece.FirstAngle) Last = float(piece.LastAngle) # Part::PartFeature - elif (label[:3] == "Arc") and hasattr(piece.Shape, 'Curve') and hasattr(piece.Shape.Curve, 'Radius'): + elif (label[:3] == "Arc") and hasattr(piece.Shape, 'Curve') and hasattr(piece.Shape.Curve, 'Radius'): radius = piece.Shape.Curve.Radius center = piece.Shape.Curve.Center normal = piece.Shape.Curve.Axis @@ -3649,10 +3871,18 @@ def plot_cutCircle(): print_msg("Start at =" +str(pivot1)) print_msg("End at =" +str(pivot2)) Arc_User_Name, arc = plot_arc(center, normal, radius, pivot1, pivot2, part, name) + if biColor != 0: + if red == 0: + Gui.ActiveDocument.getObject(Arc_User_Name).LineColor = (1.0,0.0,0.0) + red = 1 + else: + Gui.ActiveDocument.getObject(Arc_User_Name).LineColor = (1.0,1.0,1.0) + red = 0 pivot1 += pivot0 print_msg(str(Arc_User_Name) + result_msg ) - Gui.ActiveDocument.getObject(label).Visibility=False + Gui.ActiveDocument.getObject(label).Visibility=False + else: printError_msg(error_msg) @@ -5454,7 +5684,75 @@ def object_perpendicular(): def object_coplanar(): two_objects_are("coplanar") - +def object_clearance(): + """ + Check for two Objects Clearance distance: + Quick measurements between parallel faces and similarly placed objects + + Original code from : Bill 03/2015 + Adapted to WF by : Rentlau_64 03/2015 + """ + global verbose + msg=verbose + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc == None: + return None + + error_msg = "INCORRECT Object(s) Selection :\n\nYou Must Select Two(2) Objects !" + try: + selectionObjects = Gui.Selection.getSelectionEx() + if msg!=0: + print_msg("SelectionObjects is :" + str(selectionObjects)) + print_msg("Number of objects is :" + str(len(selectionObjects))) + if len(selectionObjects) != 2: + printError_msg(error_msg) + return + OBJ1 = selectionObjects[0].ObjectName + OBJ2 = selectionObjects[1].ObjectName + + mindist = App.ActiveDocument.getObject(OBJ1).Shape.distToShape(App.ActiveDocument.getObject(OBJ2).Shape)[0] + print_msg("Distance to Second Object is " + str(mindist) + "\n" ) + if mindist == 0.0: + msg = 'POSSIBLE COLLISION DETECTED \n\nCLEARANCE(S) <= 0 \n\nCheck Clearances and Settings !' + else: + msg = 'Object CLEARANCE is '+ str(mindist) +' units !' + print_gui_msg(msg) + except: + printError_msg(error_msg) + + +def object_align2view(): + """ Place your object selected to the position ActiveView (camera) + __author__ = "Mario52" + """ + # revoir le point de rotation + msg=0 + error_msg = "Select one object !" + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc == None: + return None + + m_num, m_selEx, m_objs, m_objNames = get_InfoObjects(info=msg) + Center = centerObjectsPoint(m_objs) + if Center != None: + pl = FreeCAD.Placement() + pl.Rotation = Gui.ActiveDocument.ActiveView.getCameraOrientation() + pl.Base = App.Vector(0,0,0) + for m_objName in m_objNames: + App.ActiveDocument.getObject(m_objName).Placement=pl + + else: + printError_msg(error_msg) + + #sel = Gui.Selection.getSelection() + #Nameelement = sel[0].Name + #pl = FreeCAD.Placement() + #pl.Rotation = Gui.ActiveDocument.ActiveView.getCameraOrientation() + #pl.Base = FreeCAD.Vector(0.0,0.0,0.0) + #App.ActiveDocument.getObject(Nameelement).Placement=pl + #################################################################################### try: @@ -5517,6 +5815,7 @@ class WorkFeatureTab(): "button_point_line_point" : "plot_pointLinePoint", "button_point_face_point" : "plot_pointFacePoint", "button_twolines_point" : "plot_2LinesPoint", + "button_cut_wire_point" : "plot_cutWirePoint", "button_click_for_point" : "plot_clickForPoint", "button_object_base_point" : "plot_baseObjectPoint", "button_point_to_sketch" : "point_toSketch", @@ -5528,6 +5827,7 @@ class WorkFeatureTab(): "button_face_normal" : "plot_faceNormal", "button_twolines_axis" : "plot_2LinesAxis", "button_cut_axis" : "plot_cutAxis", + "button_cut_wire_axis" : "plot_cutWireAxis", "button_point_line_axis" : "plot_pointLineAxis", "button_line_point_axis" : "plot_linePointAxis", "button_line_plane_axis" : "plot_linePlaneAxis", @@ -5568,7 +5868,8 @@ class WorkFeatureTab(): "button_isParallel" : "object_parallel", "button_isPerpendicular" : "object_perpendicular", "button_isCoplanar" : "object_coplanar", - + "button_isClearance" : "object_clearance", + } self.connections_for_text_changed = { @@ -5602,11 +5903,14 @@ class WorkFeatureTab(): self.connections_for_spin_changed = { "spin_line_center" : "numberLinePart", "spin_axis_cut" : "numberLineCut", + "spin_wire_cut_point" : "numberPointCutWire", + "spin_wire_cut_axis" : "numberAxisCutWire", "spin_circle_cut" : "numberCircleCut", } self.connections_for_radiobutton_clicked = { "radioButton_verbose" : "verbose_toggled", + "radioButton_biColor" : "biColor_toggled", } self.connections_for_combobox_changed = {