diff --git a/WorkFeature/Doc/WF_releasesDocumentation.pdf b/WorkFeature/Doc/WF_releasesDocumentation.pdf index a857023..d87fe8c 100644 Binary files a/WorkFeature/Doc/WF_releasesDocumentation.pdf and b/WorkFeature/Doc/WF_releasesDocumentation.pdf differ diff --git a/WorkFeature/Icons/WF_BeamMiterCut.svg b/WorkFeature/Icons/WF_BeamMiterCut.svg new file mode 100644 index 0000000..d9ce671 --- /dev/null +++ b/WorkFeature/Icons/WF_BeamMiterCut.svg @@ -0,0 +1,558 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_NpointsPlane.svg b/WorkFeature/Icons/WF_NpointsPlane.svg new file mode 100644 index 0000000..809ddfd --- /dev/null +++ b/WorkFeature/Icons/WF_NpointsPlane.svg @@ -0,0 +1,1034 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_object3Axes.svg b/WorkFeature/Icons/WF_object3Axes.svg new file mode 100644 index 0000000..36e71cb --- /dev/null +++ b/WorkFeature/Icons/WF_object3Axes.svg @@ -0,0 +1,629 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_objectAlignMainAxis.svg b/WorkFeature/Icons/WF_objectAlignMainAxis.svg new file mode 100644 index 0000000..80fc2d9 --- /dev/null +++ b/WorkFeature/Icons/WF_objectAlignMainAxis.svg @@ -0,0 +1,450 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_objectCenterMassPoint.svg b/WorkFeature/Icons/WF_objectCenterMassPoint.svg new file mode 100644 index 0000000..0e3138b --- /dev/null +++ b/WorkFeature/Icons/WF_objectCenterMassPoint.svg @@ -0,0 +1,613 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_objectNAxes.svg b/WorkFeature/Icons/WF_objectNAxes.svg new file mode 100644 index 0000000..a047134 --- /dev/null +++ b/WorkFeature/Icons/WF_objectNAxes.svg @@ -0,0 +1,643 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_objectNPoints.svg b/WorkFeature/Icons/WF_objectNPoints.svg new file mode 100644 index 0000000..3111dca --- /dev/null +++ b/WorkFeature/Icons/WF_objectNPoints.svg @@ -0,0 +1,717 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_pointsSetLoad.svg b/WorkFeature/Icons/WF_pointsSetLoad.svg new file mode 100644 index 0000000..1f252e7 --- /dev/null +++ b/WorkFeature/Icons/WF_pointsSetLoad.svg @@ -0,0 +1,1548 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_pointsSetSave.svg b/WorkFeature/Icons/WF_pointsSetSave.svg new file mode 100644 index 0000000..a77817f --- /dev/null +++ b/WorkFeature/Icons/WF_pointsSetSave.svg @@ -0,0 +1,1603 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_twoPointsPlane.svg b/WorkFeature/Icons/WF_twoPointsPlane.svg new file mode 100644 index 0000000..f36fd90 --- /dev/null +++ b/WorkFeature/Icons/WF_twoPointsPlane.svg @@ -0,0 +1,892 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/WorkFeature/Icons/WF_wire.svg b/WorkFeature/Icons/WF_wire.svg new file mode 100644 index 0000000..8a41b0e --- /dev/null +++ b/WorkFeature/Icons/WF_wire.svg @@ -0,0 +1,585 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/WorkFeature/Ui/WFGui_2015.py b/WorkFeature/Ui/WFGui_2015.py index 075986e..06e5bb5 100644 --- a/WorkFeature/Ui/WFGui_2015.py +++ b/WorkFeature/Ui/WFGui_2015.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'WFGui_2015.ui' # -# Created: Sun Dec 13 18:49:39 2015 +# Created: Tue Mar 29 07:16:30 2016 # by: PySide UI code generator 4.11.3 # # WARNING! All changes made in this file will be lost! @@ -40,7 +40,7 @@ class Ui_Form(object): self.scrollArea.setWidgetResizable(True) self.scrollArea.setObjectName(_fromUtf8("scrollArea")) self.scrollAreaWidgetContents = QtGui.QWidget() - self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 362, 786)) + self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 365, 773)) self.scrollAreaWidgetContents.setObjectName(_fromUtf8("scrollAreaWidgetContents")) self.gridLayout_128 = QtGui.QGridLayout(self.scrollAreaWidgetContents) self.gridLayout_128.setObjectName(_fromUtf8("gridLayout_128")) @@ -96,44 +96,47 @@ class Ui_Form(object): spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.gridLayout_65.addItem(spacerItem, 2, 0, 1, 1) self.tabWidget_7.addTab(self.Origin_Tab_2, icon1, _fromUtf8("")) - self.Point_Tab1_2 = QtGui.QWidget() - self.Point_Tab1_2.setObjectName(_fromUtf8("Point_Tab1_2")) - self.gridLayout_68 = QtGui.QGridLayout(self.Point_Tab1_2) - self.gridLayout_68.setObjectName(_fromUtf8("gridLayout_68")) - spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_68.addItem(spacerItem1, 10, 0, 1, 1) - self.button_circle_center = QtGui.QPushButton(self.Point_Tab1_2) + self.Point_Tab = QtGui.QWidget() + self.Point_Tab.setObjectName(_fromUtf8("Point_Tab")) + self.gridLayout_10 = QtGui.QGridLayout(self.Point_Tab) + self.gridLayout_10.setObjectName(_fromUtf8("gridLayout_10")) + self.tabWidget = QtGui.QTabWidget(self.Point_Tab) + self.tabWidget.setObjectName(_fromUtf8("tabWidget")) + self.Point_Tab1_3 = QtGui.QWidget() + self.Point_Tab1_3.setObjectName(_fromUtf8("Point_Tab1_3")) + self.gridLayout_11 = QtGui.QGridLayout(self.Point_Tab1_3) + self.gridLayout_11.setObjectName(_fromUtf8("gridLayout_11")) + self.horizontalLayout_46 = QtGui.QHBoxLayout() + self.horizontalLayout_46.setObjectName(_fromUtf8("horizontalLayout_46")) + self.button_object_center = QtGui.QPushButton(self.Point_Tab1_3) icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerCirclePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_circle_center.setIcon(icon2) - self.button_circle_center.setIconSize(QtCore.QSize(32, 32)) - self.button_circle_center.setObjectName(_fromUtf8("button_circle_center")) - self.gridLayout_68.addWidget(self.button_circle_center, 4, 0, 1, 1) - self.button_point_line_point = QtGui.QPushButton(self.Point_Tab1_2) + 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_46.addWidget(self.button_object_center) + self.checkBox_object_center = QtGui.QCheckBox(self.Point_Tab1_3) + self.checkBox_object_center.setObjectName(_fromUtf8("checkBox_object_center")) + self.horizontalLayout_46.addWidget(self.checkBox_object_center) + self.gridLayout_11.addLayout(self.horizontalLayout_46, 0, 0, 1, 1) + self.button_Npoints_center = QtGui.QPushButton(self.Point_Tab1_3) icon3 = QtGui.QIcon() - icon3.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_line_point.setIcon(icon3) - self.button_point_line_point.setIconSize(QtCore.QSize(32, 32)) - self.button_point_line_point.setObjectName(_fromUtf8("button_point_line_point")) - self.gridLayout_68.addWidget(self.button_point_line_point, 9, 0, 1, 1) - self.button_face_center = QtGui.QPushButton(self.Point_Tab1_2) - icon4 = QtGui.QIcon() - icon4.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_face_center.setIcon(icon4) - self.button_face_center.setIconSize(QtCore.QSize(32, 32)) - self.button_face_center.setObjectName(_fromUtf8("button_face_center")) - self.gridLayout_68.addWidget(self.button_face_center, 5, 0, 1, 1) + icon3.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_Npoints_center.setIcon(icon3) + self.button_Npoints_center.setIconSize(QtCore.QSize(32, 32)) + self.button_Npoints_center.setObjectName(_fromUtf8("button_Npoints_center")) + self.gridLayout_11.addWidget(self.button_Npoints_center, 1, 0, 1, 1) self.horizontalLayout_45 = QtGui.QHBoxLayout() self.horizontalLayout_45.setObjectName(_fromUtf8("horizontalLayout_45")) - self.button_line_center = QtGui.QPushButton(self.Point_Tab1_2) + self.button_line_center = QtGui.QPushButton(self.Point_Tab1_3) self.button_line_center.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon5 = QtGui.QIcon() - icon5.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_center.setIcon(icon5) + icon4 = QtGui.QIcon() + icon4.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_center.setIcon(icon4) self.button_line_center.setIconSize(QtCore.QSize(32, 32)) self.button_line_center.setObjectName(_fromUtf8("button_line_center")) self.horizontalLayout_45.addWidget(self.button_line_center) - self.spin_line_center = QtGui.QSpinBox(self.Point_Tab1_2) + self.spin_line_center = QtGui.QSpinBox(self.Point_Tab1_3) self.spin_line_center.setMinimumSize(QtCore.QSize(40, 0)) self.spin_line_center.setMaximumSize(QtCore.QSize(50, 16777215)) self.spin_line_center.setMinimum(2) @@ -141,79 +144,80 @@ class Ui_Form(object): self.spin_line_center.setSingleStep(1) self.spin_line_center.setObjectName(_fromUtf8("spin_line_center")) self.horizontalLayout_45.addWidget(self.spin_line_center) - self.gridLayout_68.addLayout(self.horizontalLayout_45, 2, 0, 1, 1) - self.button_Npoints_center = QtGui.QPushButton(self.Point_Tab1_2) - icon6 = QtGui.QIcon() - icon6.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_Npoints_center.setIcon(icon6) - self.button_Npoints_center.setIconSize(QtCore.QSize(32, 32)) - self.button_Npoints_center.setObjectName(_fromUtf8("button_Npoints_center")) - self.gridLayout_68.addWidget(self.button_Npoints_center, 1, 0, 1, 1) - self.button_line_face_point = QtGui.QPushButton(self.Point_Tab1_2) - icon7 = QtGui.QIcon() - icon7.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_face_point.setIcon(icon7) - self.button_line_face_point.setIconSize(QtCore.QSize(32, 32)) - self.button_line_face_point.setObjectName(_fromUtf8("button_line_face_point")) - self.gridLayout_68.addWidget(self.button_line_face_point, 6, 0, 1, 1) - self.horizontalLayout_46 = QtGui.QHBoxLayout() - self.horizontalLayout_46.setObjectName(_fromUtf8("horizontalLayout_46")) - self.button_object_center = QtGui.QPushButton(self.Point_Tab1_2) - icon8 = QtGui.QIcon() - icon8.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_center.setIcon(icon8) - self.button_object_center.setIconSize(QtCore.QSize(32, 32)) - self.button_object_center.setObjectName(_fromUtf8("button_object_center")) - self.horizontalLayout_46.addWidget(self.button_object_center) - self.checkBox_object_center = QtGui.QCheckBox(self.Point_Tab1_2) - self.checkBox_object_center.setObjectName(_fromUtf8("checkBox_object_center")) - self.horizontalLayout_46.addWidget(self.checkBox_object_center) - self.gridLayout_68.addLayout(self.horizontalLayout_46, 0, 0, 1, 1) - self.button_line_extrema = QtGui.QPushButton(self.Point_Tab1_2) - icon9 = QtGui.QIcon() - icon9.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_extremaLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_extrema.setIcon(icon9) + self.gridLayout_11.addLayout(self.horizontalLayout_45, 2, 0, 1, 1) + self.button_line_extrema = QtGui.QPushButton(self.Point_Tab1_3) + icon5 = QtGui.QIcon() + icon5.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_extremaLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_extrema.setIcon(icon5) self.button_line_extrema.setIconSize(QtCore.QSize(32, 32)) self.button_line_extrema.setObjectName(_fromUtf8("button_line_extrema")) - self.gridLayout_68.addWidget(self.button_line_extrema, 3, 0, 1, 1) - self.button_point_face_point = QtGui.QPushButton(self.Point_Tab1_2) - 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) + self.gridLayout_11.addWidget(self.button_line_extrema, 3, 0, 1, 1) + self.button_circle_center = QtGui.QPushButton(self.Point_Tab1_3) + icon6 = QtGui.QIcon() + icon6.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerCirclePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_circle_center.setIcon(icon6) + self.button_circle_center.setIconSize(QtCore.QSize(32, 32)) + self.button_circle_center.setObjectName(_fromUtf8("button_circle_center")) + self.gridLayout_11.addWidget(self.button_circle_center, 4, 0, 1, 1) + self.button_face_center = QtGui.QPushButton(self.Point_Tab1_3) + 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_11.addWidget(self.button_face_center, 5, 0, 1, 1) + self.button_line_face_point = QtGui.QPushButton(self.Point_Tab1_3) + 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_11.addWidget(self.button_line_face_point, 6, 0, 1, 1) + self.button_point_face_point = QtGui.QPushButton(self.Point_Tab1_3) + icon9 = QtGui.QIcon() + icon9.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_face_point.setIcon(icon9) self.button_point_face_point.setIconSize(QtCore.QSize(32, 32)) self.button_point_face_point.setObjectName(_fromUtf8("button_point_face_point")) - self.gridLayout_68.addWidget(self.button_point_face_point, 8, 0, 1, 1) + self.gridLayout_11.addWidget(self.button_point_face_point, 7, 0, 1, 1) + self.button_point_line_point = QtGui.QPushButton(self.Point_Tab1_3) + icon10 = QtGui.QIcon() + icon10.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_line_point.setIcon(icon10) + self.button_point_line_point.setIconSize(QtCore.QSize(32, 32)) + self.button_point_line_point.setObjectName(_fromUtf8("button_point_line_point")) + self.gridLayout_11.addWidget(self.button_point_line_point, 8, 0, 1, 1) + spacerItem1 = QtGui.QSpacerItem(20, 252, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_11.addItem(spacerItem1, 9, 0, 1, 1) + self.tabWidget.addTab(self.Point_Tab1_3, _fromUtf8("")) + self.Point_Tab2_3 = QtGui.QWidget() + self.Point_Tab2_3.setObjectName(_fromUtf8("Point_Tab2_3")) + self.gridLayout_13 = QtGui.QGridLayout(self.Point_Tab2_3) + self.gridLayout_13.setObjectName(_fromUtf8("gridLayout_13")) + self.button_twolines_point = QtGui.QPushButton(self.Point_Tab2_3) icon11 = QtGui.QIcon() - icon11.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_point.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.Point_Tab1_2, icon11, _fromUtf8("")) - self.Point_Tab2_2 = QtGui.QWidget() - self.Point_Tab2_2.setObjectName(_fromUtf8("Point_Tab2_2")) - self.gridLayout_70 = QtGui.QGridLayout(self.Point_Tab2_2) - self.gridLayout_70.setObjectName(_fromUtf8("gridLayout_70")) - self.button_twolines_point = QtGui.QPushButton(self.Point_Tab2_2) - icon12 = QtGui.QIcon() - icon12.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twolines_point.setIcon(icon12) + 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_70.addWidget(self.button_twolines_point, 0, 0, 1, 1) + self.gridLayout_13.addWidget(self.button_twolines_point, 0, 0, 1, 1) self.horizontalLayout_47 = QtGui.QHBoxLayout() self.horizontalLayout_47.setSizeConstraint(QtGui.QLayout.SetFixedSize) self.horizontalLayout_47.setObjectName(_fromUtf8("horizontalLayout_47")) - self.button_point_on_line = QtGui.QPushButton(self.Point_Tab2_2) + self.button_point_on_line = QtGui.QPushButton(self.Point_Tab2_3) 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) self.button_point_on_line.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon13 = QtGui.QIcon() - icon13.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_alongLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_on_line.setIcon(icon13) + icon12 = QtGui.QIcon() + icon12.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_alongLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_on_line.setIcon(icon12) self.button_point_on_line.setIconSize(QtCore.QSize(32, 32)) self.button_point_on_line.setObjectName(_fromUtf8("button_point_on_line")) self.horizontalLayout_47.addWidget(self.button_point_on_line) - self.distance_point_on_line = QtGui.QLineEdit(self.Point_Tab2_2) + self.distance_point_on_line = QtGui.QLineEdit(self.Point_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -223,17 +227,17 @@ 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_47.addWidget(self.distance_point_on_line) - self.gridLayout_70.addLayout(self.horizontalLayout_47, 1, 0, 1, 1) + self.gridLayout_13.addLayout(self.horizontalLayout_47, 1, 0, 1, 1) self.horizontalLayout_48 = QtGui.QHBoxLayout() self.horizontalLayout_48.setObjectName(_fromUtf8("horizontalLayout_48")) - self.button_distPoint = QtGui.QPushButton(self.Point_Tab2_2) - icon14 = QtGui.QIcon() - icon14.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distPointPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_distPoint.setIcon(icon14) + self.button_distPoint = QtGui.QPushButton(self.Point_Tab2_3) + icon13 = QtGui.QIcon() + icon13.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distPointPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_distPoint.setIcon(icon13) self.button_distPoint.setIconSize(QtCore.QSize(32, 32)) self.button_distPoint.setObjectName(_fromUtf8("button_distPoint")) self.horizontalLayout_48.addWidget(self.button_distPoint) - self.dist_point = QtGui.QLineEdit(self.Point_Tab2_2) + self.dist_point = QtGui.QLineEdit(self.Point_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -243,7 +247,7 @@ class Ui_Form(object): self.dist_point.setMaximumSize(QtCore.QSize(40, 16777215)) self.dist_point.setObjectName(_fromUtf8("dist_point")) self.horizontalLayout_48.addWidget(self.dist_point) - self.spin_dist_point = QtGui.QSpinBox(self.Point_Tab2_2) + self.spin_dist_point = QtGui.QSpinBox(self.Point_Tab2_3) self.spin_dist_point.setMinimumSize(QtCore.QSize(30, 0)) self.spin_dist_point.setMaximumSize(QtCore.QSize(30, 16777215)) self.spin_dist_point.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) @@ -254,18 +258,18 @@ class Ui_Form(object): self.spin_dist_point.setProperty("value", 1) self.spin_dist_point.setObjectName(_fromUtf8("spin_dist_point")) self.horizontalLayout_48.addWidget(self.spin_dist_point) - self.gridLayout_70.addLayout(self.horizontalLayout_48, 2, 0, 1, 1) + self.gridLayout_13.addLayout(self.horizontalLayout_48, 2, 0, 1, 1) self.horizontalLayout_49 = QtGui.QHBoxLayout() self.horizontalLayout_49.setObjectName(_fromUtf8("horizontalLayout_49")) - self.button_cut_wire_point = QtGui.QPushButton(self.Point_Tab2_2) + self.button_cut_wire_point = QtGui.QPushButton(self.Point_Tab2_3) self.button_cut_wire_point.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon15 = QtGui.QIcon() - icon15.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutWirePoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cut_wire_point.setIcon(icon15) + icon14 = QtGui.QIcon() + icon14.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutWirePoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_wire_point.setIcon(icon14) self.button_cut_wire_point.setIconSize(QtCore.QSize(32, 32)) self.button_cut_wire_point.setObjectName(_fromUtf8("button_cut_wire_point")) self.horizontalLayout_49.addWidget(self.button_cut_wire_point) - self.spin_wire_cut_point = QtGui.QSpinBox(self.Point_Tab2_2) + self.spin_wire_cut_point = QtGui.QSpinBox(self.Point_Tab2_3) 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) @@ -273,105 +277,195 @@ class Ui_Form(object): self.spin_wire_cut_point.setSingleStep(1) self.spin_wire_cut_point.setObjectName(_fromUtf8("spin_wire_cut_point")) self.horizontalLayout_49.addWidget(self.spin_wire_cut_point) - self.gridLayout_70.addLayout(self.horizontalLayout_49, 3, 0, 1, 1) - self.button_click_for_point = QtGui.QRadioButton(self.Point_Tab2_2) - icon16 = QtGui.QIcon() - icon16.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_click_for_point.setIcon(icon16) + self.gridLayout_13.addLayout(self.horizontalLayout_49, 3, 0, 1, 1) + self.button_click_for_point = QtGui.QRadioButton(self.Point_Tab2_3) + icon15 = QtGui.QIcon() + icon15.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_click_for_point.setIcon(icon15) 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_70.addWidget(self.button_click_for_point, 4, 0, 1, 1) - self.button_object_base_point = QtGui.QPushButton(self.Point_Tab2_2) - icon17 = QtGui.QIcon() - icon17.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectBasePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_base_point.setIcon(icon17) + self.gridLayout_13.addWidget(self.button_click_for_point, 4, 0, 1, 1) + self.button_object_base_point = QtGui.QPushButton(self.Point_Tab2_3) + icon16 = QtGui.QIcon() + icon16.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectBasePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_base_point.setIcon(icon16) self.button_object_base_point.setIconSize(QtCore.QSize(32, 32)) self.button_object_base_point.setObjectName(_fromUtf8("button_object_base_point")) - self.gridLayout_70.addWidget(self.button_object_base_point, 5, 0, 1, 1) - self.button_point_to_sketch = QtGui.QPushButton(self.Point_Tab2_2) + self.gridLayout_13.addWidget(self.button_object_base_point, 5, 0, 1, 1) + self.button_object_center_mass_point = QtGui.QPushButton(self.Point_Tab2_3) + icon17 = QtGui.QIcon() + icon17.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectCenterMassPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_center_mass_point.setIcon(icon17) + self.button_object_center_mass_point.setIconSize(QtCore.QSize(32, 32)) + self.button_object_center_mass_point.setObjectName(_fromUtf8("button_object_center_mass_point")) + self.gridLayout_13.addWidget(self.button_object_center_mass_point, 6, 0, 1, 1) + self.button_object_Npoint = QtGui.QPushButton(self.Point_Tab2_3) icon18 = QtGui.QIcon() - icon18.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2Sketch.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_to_sketch.setIcon(icon18) + icon18.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectNPoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_Npoint.setIcon(icon18) + self.button_object_Npoint.setIconSize(QtCore.QSize(32, 32)) + self.button_object_Npoint.setObjectName(_fromUtf8("button_object_Npoint")) + self.gridLayout_13.addWidget(self.button_object_Npoint, 7, 0, 1, 1) + self.button_point_to_sketch = QtGui.QPushButton(self.Point_Tab2_3) + icon19 = QtGui.QIcon() + icon19.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2Sketch.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_to_sketch.setIcon(icon19) self.button_point_to_sketch.setIconSize(QtCore.QSize(32, 32)) self.button_point_to_sketch.setObjectName(_fromUtf8("button_point_to_sketch")) - self.gridLayout_70.addWidget(self.button_point_to_sketch, 6, 0, 1, 1) - spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_70.addItem(spacerItem2, 7, 0, 1, 1) - self.tabWidget_7.addTab(self.Point_Tab2_2, icon11, _fromUtf8("")) - self.Axis_Tab1_2 = QtGui.QWidget() - self.Axis_Tab1_2.setObjectName(_fromUtf8("Axis_Tab1_2")) - self.gridLayout_4 = QtGui.QGridLayout(self.Axis_Tab1_2) - self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) - self.button_object_axis = QtGui.QPushButton(self.Axis_Tab1_2) - 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_4.addWidget(self.button_object_axis, 0, 0, 1, 1) + self.gridLayout_13.addWidget(self.button_point_to_sketch, 8, 0, 1, 1) + spacerItem2 = QtGui.QSpacerItem(20, 255, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_13.addItem(spacerItem2, 9, 0, 1, 1) + self.tabWidget.addTab(self.Point_Tab2_3, _fromUtf8("")) + self.Point_Tab3_3 = QtGui.QWidget() + self.Point_Tab3_3.setObjectName(_fromUtf8("Point_Tab3_3")) + self.gridLayout_12 = QtGui.QGridLayout(self.Point_Tab3_3) + self.gridLayout_12.setObjectName(_fromUtf8("gridLayout_12")) + self.button_points_load = QtGui.QPushButton(self.Point_Tab3_3) + icon20 = QtGui.QIcon() + icon20.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointsSetLoad.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_points_load.setIcon(icon20) + self.button_points_load.setIconSize(QtCore.QSize(32, 32)) + self.button_points_load.setObjectName(_fromUtf8("button_points_load")) + self.gridLayout_12.addWidget(self.button_points_load, 0, 0, 1, 1) + self.button_points_save = QtGui.QPushButton(self.Point_Tab3_3) + icon21 = QtGui.QIcon() + icon21.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointsSetSave.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_points_save.setIcon(icon21) + self.button_points_save.setIconSize(QtCore.QSize(32, 32)) + self.button_points_save.setObjectName(_fromUtf8("button_points_save")) + self.gridLayout_12.addWidget(self.button_points_save, 1, 0, 1, 1) + spacerItem3 = QtGui.QSpacerItem(20, 579, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_12.addItem(spacerItem3, 2, 0, 1, 1) + self.tabWidget.addTab(self.Point_Tab3_3, _fromUtf8("")) + self.gridLayout_10.addWidget(self.tabWidget, 0, 0, 1, 1) + icon22 = QtGui.QIcon() + icon22.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_point.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.Point_Tab, icon22, _fromUtf8("")) + self.Axis_Tab = QtGui.QWidget() + self.Axis_Tab.setObjectName(_fromUtf8("Axis_Tab")) + self.gridLayout_14 = QtGui.QGridLayout(self.Axis_Tab) + self.gridLayout_14.setObjectName(_fromUtf8("gridLayout_14")) + self.tabWidget_2 = QtGui.QTabWidget(self.Axis_Tab) + self.tabWidget_2.setObjectName(_fromUtf8("tabWidget_2")) + self.Axis_Tab1_3 = QtGui.QWidget() + self.Axis_Tab1_3.setObjectName(_fromUtf8("Axis_Tab1_3")) + self.gridLayout_15 = QtGui.QGridLayout(self.Axis_Tab1_3) + self.gridLayout_15.setObjectName(_fromUtf8("gridLayout_15")) self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.button_twopoints_axis = QtGui.QPushButton(self.Axis_Tab1_2) + self.button_twopoints_axis = QtGui.QPushButton(self.Axis_Tab1_3) 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) self.button_twopoints_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon20 = QtGui.QIcon() - icon20.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2pointsLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twopoints_axis.setIcon(icon20) + icon23 = QtGui.QIcon() + icon23.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2pointsLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twopoints_axis.setIcon(icon23) self.button_twopoints_axis.setIconSize(QtCore.QSize(32, 32)) self.button_twopoints_axis.setObjectName(_fromUtf8("button_twopoints_axis")) self.horizontalLayout.addWidget(self.button_twopoints_axis) - self.extension_twopoints_axis = QtGui.QLineEdit(self.Axis_Tab1_2) + self.extension_twopoints_axis = QtGui.QLineEdit(self.Axis_Tab1_3) self.extension_twopoints_axis.setMaximumSize(QtCore.QSize(40, 16777215)) self.extension_twopoints_axis.setObjectName(_fromUtf8("extension_twopoints_axis")) self.horizontalLayout.addWidget(self.extension_twopoints_axis) - self.gridLayout_4.addLayout(self.horizontalLayout, 1, 0, 1, 1) - self.button_Npoints_axis = QtGui.QPushButton(self.Axis_Tab1_2) - icon21 = QtGui.QIcon() - icon21.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_Npoints_axis.setIcon(icon21) + self.gridLayout_15.addLayout(self.horizontalLayout, 1, 0, 1, 1) + spacerItem4 = QtGui.QSpacerItem(20, 233, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_15.addItem(spacerItem4, 7, 0, 1, 1) + self.button_object_axis = QtGui.QPushButton(self.Axis_Tab1_3) + icon24 = QtGui.QIcon() + icon24.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_axis.setIcon(icon24) + self.button_object_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_object_axis.setObjectName(_fromUtf8("button_object_axis")) + self.gridLayout_15.addWidget(self.button_object_axis, 0, 0, 1, 1) + self.horizontalLayout_53 = QtGui.QHBoxLayout() + self.horizontalLayout_53.setObjectName(_fromUtf8("horizontalLayout_53")) + self.button_line_point_axis = QtGui.QPushButton(self.Axis_Tab1_3) + 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) + self.button_line_point_axis.setMinimumSize(QtCore.QSize(0, 0)) + self.button_line_point_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon25 = QtGui.QIcon() + icon25.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_point_axis.setIcon(icon25) + self.button_line_point_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_line_point_axis.setObjectName(_fromUtf8("button_line_point_axis")) + self.horizontalLayout_53.addWidget(self.button_line_point_axis) + self.extension_line_point_axis = QtGui.QLineEdit(self.Axis_Tab1_3) + self.extension_line_point_axis.setMaximumSize(QtCore.QSize(40, 16777215)) + self.extension_line_point_axis.setObjectName(_fromUtf8("extension_line_point_axis")) + self.horizontalLayout_53.addWidget(self.extension_line_point_axis) + self.gridLayout_15.addLayout(self.horizontalLayout_53, 5, 0, 1, 1) + self.button_Npoints_axis = QtGui.QPushButton(self.Axis_Tab1_3) + icon26 = QtGui.QIcon() + icon26.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_Npoints_axis.setIcon(icon26) self.button_Npoints_axis.setIconSize(QtCore.QSize(32, 32)) self.button_Npoints_axis.setObjectName(_fromUtf8("button_Npoints_axis")) - self.gridLayout_4.addWidget(self.button_Npoints_axis, 2, 0, 1, 1) + self.gridLayout_15.addWidget(self.button_Npoints_axis, 2, 0, 1, 1) + self.horizontalLayout_52 = QtGui.QHBoxLayout() + self.horizontalLayout_52.setObjectName(_fromUtf8("horizontalLayout_52")) + self.button_point_line_axis = QtGui.QPushButton(self.Axis_Tab1_3) + self.button_point_line_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon27 = QtGui.QIcon() + icon27.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLineAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_line_axis.setIcon(icon27) + self.button_point_line_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_point_line_axis.setObjectName(_fromUtf8("button_point_line_axis")) + self.horizontalLayout_52.addWidget(self.button_point_line_axis) + self.extension_line = QtGui.QLineEdit(self.Axis_Tab1_3) + self.extension_line.setMaximumSize(QtCore.QSize(40, 16777215)) + self.extension_line.setObjectName(_fromUtf8("extension_line")) + self.horizontalLayout_52.addWidget(self.extension_line) + self.point_loc_comboBox = QtGui.QComboBox(self.Axis_Tab1_3) + 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_52.addWidget(self.point_loc_comboBox) + self.gridLayout_15.addLayout(self.horizontalLayout_52, 4, 0, 1, 1) self.horizontalLayout_51 = QtGui.QHBoxLayout() self.horizontalLayout_51.setObjectName(_fromUtf8("horizontalLayout_51")) self.verticalLayout_3 = QtGui.QVBoxLayout() self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3")) - self.button_cylinder_axis = QtGui.QPushButton(self.Axis_Tab1_2) + self.button_cylinder_axis = QtGui.QPushButton(self.Axis_Tab1_3) self.button_cylinder_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon22 = QtGui.QIcon() - icon22.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinderAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cylinder_axis.setIcon(icon22) + icon28 = QtGui.QIcon() + icon28.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinderAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cylinder_axis.setIcon(icon28) self.button_cylinder_axis.setIconSize(QtCore.QSize(32, 32)) self.button_cylinder_axis.setObjectName(_fromUtf8("button_cylinder_axis")) self.verticalLayout_3.addWidget(self.button_cylinder_axis) - self.button_plane_axis = QtGui.QPushButton(self.Axis_Tab1_2) + self.button_plane_axis = QtGui.QPushButton(self.Axis_Tab1_3) self.button_plane_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon23 = QtGui.QIcon() - icon23.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_plane_axis.setIcon(icon23) + icon29 = QtGui.QIcon() + icon29.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_plane_axis.setIcon(icon29) self.button_plane_axis.setIconSize(QtCore.QSize(32, 32)) self.button_plane_axis.setObjectName(_fromUtf8("button_plane_axis")) self.verticalLayout_3.addWidget(self.button_plane_axis) - self.button_face_normal = QtGui.QPushButton(self.Axis_Tab1_2) + self.button_face_normal = QtGui.QPushButton(self.Axis_Tab1_3) 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)) - icon24 = QtGui.QIcon() - icon24.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceNormal.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_face_normal.setIcon(icon24) + icon30 = QtGui.QIcon() + icon30.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceNormal.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_face_normal.setIcon(icon30) self.button_face_normal.setIconSize(QtCore.QSize(32, 32)) self.button_face_normal.setObjectName(_fromUtf8("button_face_normal")) self.verticalLayout_3.addWidget(self.button_face_normal) self.horizontalLayout_51.addLayout(self.verticalLayout_3) - self.frame_8 = QtGui.QFrame(self.Axis_Tab1_2) + self.frame_8 = QtGui.QFrame(self.Axis_Tab1_3) self.frame_8.setMinimumSize(QtCore.QSize(60, 0)) self.frame_8.setMaximumSize(QtCore.QSize(50, 16777215)) self.frame_8.setFrameShape(QtGui.QFrame.StyledPanel) @@ -385,97 +479,50 @@ class Ui_Form(object): self.extension_face_normal.setObjectName(_fromUtf8("extension_face_normal")) self.gridLayout_72.addWidget(self.extension_face_normal, 0, 0, 1, 1) self.horizontalLayout_51.addWidget(self.frame_8) - self.gridLayout_4.addLayout(self.horizontalLayout_51, 3, 0, 1, 1) - self.horizontalLayout_52 = QtGui.QHBoxLayout() - self.horizontalLayout_52.setObjectName(_fromUtf8("horizontalLayout_52")) - self.button_point_line_axis = QtGui.QPushButton(self.Axis_Tab1_2) - self.button_point_line_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon25 = QtGui.QIcon() - icon25.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLineAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_line_axis.setIcon(icon25) - self.button_point_line_axis.setIconSize(QtCore.QSize(32, 32)) - self.button_point_line_axis.setObjectName(_fromUtf8("button_point_line_axis")) - self.horizontalLayout_52.addWidget(self.button_point_line_axis) - self.extension_line = QtGui.QLineEdit(self.Axis_Tab1_2) - self.extension_line.setMaximumSize(QtCore.QSize(40, 16777215)) - self.extension_line.setObjectName(_fromUtf8("extension_line")) - self.horizontalLayout_52.addWidget(self.extension_line) - self.point_loc_comboBox = QtGui.QComboBox(self.Axis_Tab1_2) - 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_52.addWidget(self.point_loc_comboBox) - self.gridLayout_4.addLayout(self.horizontalLayout_52, 4, 0, 1, 1) - self.horizontalLayout_53 = QtGui.QHBoxLayout() - self.horizontalLayout_53.setObjectName(_fromUtf8("horizontalLayout_53")) - self.button_line_point_axis = QtGui.QPushButton(self.Axis_Tab1_2) - 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) - self.button_line_point_axis.setMinimumSize(QtCore.QSize(0, 0)) - self.button_line_point_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon26 = QtGui.QIcon() - icon26.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_point_axis.setIcon(icon26) - self.button_line_point_axis.setIconSize(QtCore.QSize(32, 32)) - self.button_line_point_axis.setObjectName(_fromUtf8("button_line_point_axis")) - self.horizontalLayout_53.addWidget(self.button_line_point_axis) - self.extension_line_point_axis = QtGui.QLineEdit(self.Axis_Tab1_2) - self.extension_line_point_axis.setMaximumSize(QtCore.QSize(40, 16777215)) - self.extension_line_point_axis.setObjectName(_fromUtf8("extension_line_point_axis")) - self.horizontalLayout_53.addWidget(self.extension_line_point_axis) - self.gridLayout_4.addLayout(self.horizontalLayout_53, 5, 0, 1, 1) - self.button_twolines_axis = QtGui.QPushButton(self.Axis_Tab1_2) - icon27 = QtGui.QIcon() - icon27.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_twoLinesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twolines_axis.setIcon(icon27) + self.gridLayout_15.addLayout(self.horizontalLayout_51, 3, 0, 1, 1) + self.button_twolines_axis = QtGui.QPushButton(self.Axis_Tab1_3) + icon31 = QtGui.QIcon() + icon31.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_twoLinesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twolines_axis.setIcon(icon31) self.button_twolines_axis.setIconSize(QtCore.QSize(32, 32)) self.button_twolines_axis.setObjectName(_fromUtf8("button_twolines_axis")) - self.gridLayout_4.addWidget(self.button_twolines_axis, 6, 0, 1, 1) - self.button_plane_point_line_axis = QtGui.QPushButton(self.Axis_Tab1_2) - icon28 = QtGui.QIcon() - icon28.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_plane_point_line_axis.setIcon(icon28) + self.gridLayout_15.addWidget(self.button_twolines_axis, 6, 0, 1, 1) + self.tabWidget_2.addTab(self.Axis_Tab1_3, _fromUtf8("")) + self.Axis_Tab2_3 = QtGui.QWidget() + self.Axis_Tab2_3.setObjectName(_fromUtf8("Axis_Tab2_3")) + self.gridLayout_4 = QtGui.QGridLayout(self.Axis_Tab2_3) + self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) + self.button_plane_point_line_axis = QtGui.QPushButton(self.Axis_Tab2_3) + icon32 = QtGui.QIcon() + icon32.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_plane_point_line_axis.setIcon(icon32) 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_4.addWidget(self.button_plane_point_line_axis, 7, 0, 1, 1) - spacerItem3 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_4.addItem(spacerItem3, 8, 0, 1, 1) - icon29 = QtGui.QIcon() - icon29.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_axis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.Axis_Tab1_2, icon29, _fromUtf8("")) - self.Axis_Tab2_2 = QtGui.QWidget() - self.Axis_Tab2_2.setObjectName(_fromUtf8("Axis_Tab2_2")) - self.gridLayout_73 = QtGui.QGridLayout(self.Axis_Tab2_2) - self.gridLayout_73.setObjectName(_fromUtf8("gridLayout_73")) - self.button_line_plane_axis = QtGui.QPushButton(self.Axis_Tab2_2) - icon30 = QtGui.QIcon() - icon30.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePlaneAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_plane_axis.setIcon(icon30) + self.gridLayout_4.addWidget(self.button_plane_point_line_axis, 0, 0, 1, 1) + self.button_line_plane_axis = QtGui.QPushButton(self.Axis_Tab2_3) + icon33 = QtGui.QIcon() + icon33.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePlaneAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_plane_axis.setIcon(icon33) self.button_line_plane_axis.setIconSize(QtCore.QSize(32, 32)) self.button_line_plane_axis.setObjectName(_fromUtf8("button_line_plane_axis")) - self.gridLayout_73.addWidget(self.button_line_plane_axis, 0, 0, 1, 1) - self.button_twoplanes_axis = QtGui.QPushButton(self.Axis_Tab2_2) - icon31 = QtGui.QIcon() - icon31.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2PlanesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twoplanes_axis.setIcon(icon31) + self.gridLayout_4.addWidget(self.button_line_plane_axis, 1, 0, 1, 1) + self.button_twoplanes_axis = QtGui.QPushButton(self.Axis_Tab2_3) + icon34 = QtGui.QIcon() + icon34.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2PlanesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twoplanes_axis.setIcon(icon34) self.button_twoplanes_axis.setIconSize(QtCore.QSize(32, 32)) self.button_twoplanes_axis.setObjectName(_fromUtf8("button_twoplanes_axis")) - self.gridLayout_73.addWidget(self.button_twoplanes_axis, 1, 0, 1, 1) + self.gridLayout_4.addWidget(self.button_twoplanes_axis, 2, 0, 1, 1) self.horizontalLayout_54 = QtGui.QHBoxLayout() self.horizontalLayout_54.setObjectName(_fromUtf8("horizontalLayout_54")) - self.button_distLine = QtGui.QPushButton(self.Axis_Tab2_2) - icon32 = QtGui.QIcon() - icon32.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distAxisAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_distLine.setIcon(icon32) + self.button_distLine = QtGui.QPushButton(self.Axis_Tab2_3) + icon35 = QtGui.QIcon() + icon35.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distAxisAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_distLine.setIcon(icon35) self.button_distLine.setIconSize(QtCore.QSize(32, 32)) self.button_distLine.setObjectName(_fromUtf8("button_distLine")) self.horizontalLayout_54.addWidget(self.button_distLine) - self.dist_line = QtGui.QLineEdit(self.Axis_Tab2_2) + self.dist_line = QtGui.QLineEdit(self.Axis_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -485,7 +532,7 @@ class Ui_Form(object): self.dist_line.setMaximumSize(QtCore.QSize(40, 16777215)) self.dist_line.setObjectName(_fromUtf8("dist_line")) self.horizontalLayout_54.addWidget(self.dist_line) - self.spin_dist_line = QtGui.QSpinBox(self.Axis_Tab2_2) + self.spin_dist_line = QtGui.QSpinBox(self.Axis_Tab2_3) self.spin_dist_line.setMinimumSize(QtCore.QSize(30, 0)) self.spin_dist_line.setMaximumSize(QtCore.QSize(30, 16777215)) self.spin_dist_line.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) @@ -496,17 +543,17 @@ class Ui_Form(object): self.spin_dist_line.setProperty("value", 1) self.spin_dist_line.setObjectName(_fromUtf8("spin_dist_line")) self.horizontalLayout_54.addWidget(self.spin_dist_line) - self.gridLayout_73.addLayout(self.horizontalLayout_54, 2, 0, 1, 1) + self.gridLayout_4.addLayout(self.horizontalLayout_54, 3, 0, 1, 1) self.horizontalLayout_55 = QtGui.QHBoxLayout() self.horizontalLayout_55.setObjectName(_fromUtf8("horizontalLayout_55")) - self.button_angleLine = QtGui.QPushButton(self.Axis_Tab2_2) - icon33 = QtGui.QIcon() - icon33.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_angleAxisAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_angleLine.setIcon(icon33) + self.button_angleLine = QtGui.QPushButton(self.Axis_Tab2_3) + icon36 = QtGui.QIcon() + icon36.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_angleAxisAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_angleLine.setIcon(icon36) self.button_angleLine.setIconSize(QtCore.QSize(32, 32)) self.button_angleLine.setObjectName(_fromUtf8("button_angleLine")) self.horizontalLayout_55.addWidget(self.button_angleLine) - self.angle_line = QtGui.QLineEdit(self.Axis_Tab2_2) + self.angle_line = QtGui.QLineEdit(self.Axis_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -516,7 +563,7 @@ class Ui_Form(object): self.angle_line.setMaximumSize(QtCore.QSize(40, 16777215)) self.angle_line.setObjectName(_fromUtf8("angle_line")) self.horizontalLayout_55.addWidget(self.angle_line) - self.spin_angle_line = QtGui.QSpinBox(self.Axis_Tab2_2) + self.spin_angle_line = QtGui.QSpinBox(self.Axis_Tab2_3) self.spin_angle_line.setMinimumSize(QtCore.QSize(30, 0)) self.spin_angle_line.setMaximumSize(QtCore.QSize(30, 16777215)) self.spin_angle_line.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) @@ -527,18 +574,18 @@ class Ui_Form(object): self.spin_angle_line.setProperty("value", 1) self.spin_angle_line.setObjectName(_fromUtf8("spin_angle_line")) self.horizontalLayout_55.addWidget(self.spin_angle_line) - self.gridLayout_73.addLayout(self.horizontalLayout_55, 3, 0, 1, 1) + self.gridLayout_4.addLayout(self.horizontalLayout_55, 4, 0, 1, 1) self.horizontalLayout_56 = QtGui.QHBoxLayout() self.horizontalLayout_56.setObjectName(_fromUtf8("horizontalLayout_56")) - self.button_cut_wire_axis = QtGui.QPushButton(self.Axis_Tab2_2) + self.button_cut_wire_axis = QtGui.QPushButton(self.Axis_Tab2_3) self.button_cut_wire_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon34 = QtGui.QIcon() - icon34.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutWireAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cut_wire_axis.setIcon(icon34) + icon37 = QtGui.QIcon() + icon37.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutWireAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_wire_axis.setIcon(icon37) self.button_cut_wire_axis.setIconSize(QtCore.QSize(32, 32)) self.button_cut_wire_axis.setObjectName(_fromUtf8("button_cut_wire_axis")) self.horizontalLayout_56.addWidget(self.button_cut_wire_axis) - self.spin_wire_cut_axis = QtGui.QSpinBox(self.Axis_Tab2_2) + self.spin_wire_cut_axis = QtGui.QSpinBox(self.Axis_Tab2_3) 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) @@ -546,18 +593,18 @@ class Ui_Form(object): self.spin_wire_cut_axis.setSingleStep(1) self.spin_wire_cut_axis.setObjectName(_fromUtf8("spin_wire_cut_axis")) self.horizontalLayout_56.addWidget(self.spin_wire_cut_axis) - self.gridLayout_73.addLayout(self.horizontalLayout_56, 4, 0, 1, 1) + self.gridLayout_4.addLayout(self.horizontalLayout_56, 5, 0, 1, 1) self.horizontalLayout_57 = QtGui.QHBoxLayout() self.horizontalLayout_57.setObjectName(_fromUtf8("horizontalLayout_57")) - self.button_cut_axis = QtGui.QPushButton(self.Axis_Tab2_2) + self.button_cut_axis = QtGui.QPushButton(self.Axis_Tab2_3) self.button_cut_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon35 = QtGui.QIcon() - icon35.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cut_axis.setIcon(icon35) + icon38 = QtGui.QIcon() + icon38.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_axis.setIcon(icon38) self.button_cut_axis.setIconSize(QtCore.QSize(32, 32)) self.button_cut_axis.setObjectName(_fromUtf8("button_cut_axis")) self.horizontalLayout_57.addWidget(self.button_cut_axis) - self.spin_axis_cut = QtGui.QSpinBox(self.Axis_Tab2_2) + self.spin_axis_cut = QtGui.QSpinBox(self.Axis_Tab2_3) self.spin_axis_cut.setMinimumSize(QtCore.QSize(40, 0)) self.spin_axis_cut.setMaximumSize(QtCore.QSize(50, 16777215)) self.spin_axis_cut.setMinimum(2) @@ -565,22 +612,22 @@ class Ui_Form(object): self.spin_axis_cut.setSingleStep(1) self.spin_axis_cut.setObjectName(_fromUtf8("spin_axis_cut")) self.horizontalLayout_57.addWidget(self.spin_axis_cut) - self.gridLayout_73.addLayout(self.horizontalLayout_57, 5, 0, 1, 1) + self.gridLayout_4.addLayout(self.horizontalLayout_57, 6, 0, 1, 1) self.horizontalLayout_58 = QtGui.QHBoxLayout() self.horizontalLayout_58.setObjectName(_fromUtf8("horizontalLayout_58")) - self.button_extension_axis = QtGui.QPushButton(self.Axis_Tab2_2) + self.button_extension_axis = QtGui.QPushButton(self.Axis_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_extension_axis.sizePolicy().hasHeightForWidth()) self.button_extension_axis.setSizePolicy(sizePolicy) - icon36 = QtGui.QIcon() - icon36.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_enlargeLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_extension_axis.setIcon(icon36) + icon39 = QtGui.QIcon() + icon39.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_enlargeLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_extension_axis.setIcon(icon39) self.button_extension_axis.setIconSize(QtCore.QSize(32, 32)) self.button_extension_axis.setObjectName(_fromUtf8("button_extension_axis")) self.horizontalLayout_58.addWidget(self.button_extension_axis) - self.extension_axis = QtGui.QLineEdit(self.Axis_Tab2_2) + self.extension_axis = QtGui.QLineEdit(self.Axis_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -590,29 +637,124 @@ class Ui_Form(object): self.extension_axis.setMaximumSize(QtCore.QSize(50, 16777215)) self.extension_axis.setObjectName(_fromUtf8("extension_axis")) self.horizontalLayout_58.addWidget(self.extension_axis) - self.gridLayout_73.addLayout(self.horizontalLayout_58, 6, 0, 1, 1) - self.button_click_for_axis = QtGui.QRadioButton(self.Axis_Tab2_2) - icon37 = QtGui.QIcon() - icon37.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_click_for_axis.setIcon(icon37) + self.gridLayout_4.addLayout(self.horizontalLayout_58, 7, 0, 1, 1) + self.button_click_for_axis = QtGui.QRadioButton(self.Axis_Tab2_3) + icon40 = QtGui.QIcon() + icon40.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_click_for_axis.setIcon(icon40) self.button_click_for_axis.setIconSize(QtCore.QSize(32, 32)) self.button_click_for_axis.setObjectName(_fromUtf8("button_click_for_axis")) - self.gridLayout_73.addWidget(self.button_click_for_axis, 7, 0, 1, 1) - self.button_object_base_axes = QtGui.QPushButton(self.Axis_Tab2_2) - icon38 = QtGui.QIcon() - icon38.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_baseObjectsAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_base_axes.setIcon(icon38) + self.gridLayout_4.addWidget(self.button_click_for_axis, 8, 0, 1, 1) + spacerItem5 = QtGui.QSpacerItem(20, 238, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_4.addItem(spacerItem5, 9, 0, 1, 1) + self.tabWidget_2.addTab(self.Axis_Tab2_3, _fromUtf8("")) + self.Axis_Tab31_3 = QtGui.QWidget() + self.Axis_Tab31_3.setObjectName(_fromUtf8("Axis_Tab31_3")) + self.gridLayout_16 = QtGui.QGridLayout(self.Axis_Tab31_3) + self.gridLayout_16.setObjectName(_fromUtf8("gridLayout_16")) + self.button_object_base_axes = QtGui.QPushButton(self.Axis_Tab31_3) + icon41 = QtGui.QIcon() + icon41.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_baseObjectsAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_base_axes.setIcon(icon41) self.button_object_base_axes.setIconSize(QtCore.QSize(32, 32)) self.button_object_base_axes.setObjectName(_fromUtf8("button_object_base_axes")) - self.gridLayout_73.addWidget(self.button_object_base_axes, 8, 0, 1, 1) - self.button_line_to_sketch = QtGui.QPushButton(self.Axis_Tab2_2) - self.button_line_to_sketch.setIcon(icon18) + self.gridLayout_16.addWidget(self.button_object_base_axes, 0, 0, 1, 1) + self.button_object_Naxes = QtGui.QPushButton(self.Axis_Tab31_3) + icon42 = QtGui.QIcon() + icon42.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectNAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_Naxes.setIcon(icon42) + self.button_object_Naxes.setIconSize(QtCore.QSize(32, 32)) + self.button_object_Naxes.setObjectName(_fromUtf8("button_object_Naxes")) + self.gridLayout_16.addWidget(self.button_object_Naxes, 1, 0, 1, 1) + self.button_object_3axes = QtGui.QPushButton(self.Axis_Tab31_3) + icon43 = QtGui.QIcon() + icon43.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_object3Axes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_3axes.setIcon(icon43) + self.button_object_3axes.setIconSize(QtCore.QSize(32, 32)) + self.button_object_3axes.setObjectName(_fromUtf8("button_object_3axes")) + self.gridLayout_16.addWidget(self.button_object_3axes, 2, 0, 1, 1) + self.button_line_to_sketch = QtGui.QPushButton(self.Axis_Tab31_3) + self.button_line_to_sketch.setIcon(icon19) self.button_line_to_sketch.setIconSize(QtCore.QSize(32, 32)) self.button_line_to_sketch.setObjectName(_fromUtf8("button_line_to_sketch")) - self.gridLayout_73.addWidget(self.button_line_to_sketch, 9, 0, 1, 1) - spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_73.addItem(spacerItem4, 10, 0, 1, 1) - self.tabWidget_7.addTab(self.Axis_Tab2_2, icon29, _fromUtf8("")) + self.gridLayout_16.addWidget(self.button_line_to_sketch, 3, 0, 1, 1) + spacerItem6 = QtGui.QSpacerItem(20, 483, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_16.addItem(spacerItem6, 4, 0, 1, 1) + self.tabWidget_2.addTab(self.Axis_Tab31_3, _fromUtf8("")) + self.gridLayout_14.addWidget(self.tabWidget_2, 0, 0, 1, 1) + icon44 = QtGui.QIcon() + icon44.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_axis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.Axis_Tab, icon44, _fromUtf8("")) + self.tab_16 = QtGui.QWidget() + self.tab_16.setObjectName(_fromUtf8("tab_16")) + self.gridLayout = QtGui.QGridLayout(self.tab_16) + self.gridLayout.setObjectName(_fromUtf8("gridLayout")) + self.horizontalLayout_66 = QtGui.QHBoxLayout() + self.horizontalLayout_66.setObjectName(_fromUtf8("horizontalLayout_66")) + self.button_linecenter_circle = QtGui.QPushButton(self.tab_16) + icon45 = QtGui.QIcon() + icon45.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineCenterCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_linecenter_circle.setIcon(icon45) + self.button_linecenter_circle.setIconSize(QtCore.QSize(32, 32)) + self.button_linecenter_circle.setObjectName(_fromUtf8("button_linecenter_circle")) + self.horizontalLayout_66.addWidget(self.button_linecenter_circle) + self.radius_circle = QtGui.QLineEdit(self.tab_16) + self.radius_circle.setMinimumSize(QtCore.QSize(40, 0)) + self.radius_circle.setMaximumSize(QtCore.QSize(60, 16777215)) + self.radius_circle.setObjectName(_fromUtf8("radius_circle")) + self.horizontalLayout_66.addWidget(self.radius_circle) + self.gridLayout.addLayout(self.horizontalLayout_66, 0, 0, 1, 1) + self.button_linepoint_circle = QtGui.QPushButton(self.tab_16) + icon46 = QtGui.QIcon() + icon46.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_linepoint_circle.setIcon(icon46) + self.button_linepoint_circle.setIconSize(QtCore.QSize(32, 32)) + self.button_linepoint_circle.setObjectName(_fromUtf8("button_linepoint_circle")) + self.gridLayout.addWidget(self.button_linepoint_circle, 1, 0, 1, 1) + self.button_3points_circle = QtGui.QPushButton(self.tab_16) + icon47 = QtGui.QIcon() + icon47.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_3points_circle.setIcon(icon47) + self.button_3points_circle.setIconSize(QtCore.QSize(32, 32)) + self.button_3points_circle.setObjectName(_fromUtf8("button_3points_circle")) + self.gridLayout.addWidget(self.button_3points_circle, 2, 0, 1, 1) + self.horizontalLayout_67 = QtGui.QHBoxLayout() + self.horizontalLayout_67.setObjectName(_fromUtf8("horizontalLayout_67")) + self.button_cut_circle = QtGui.QPushButton(self.tab_16) + icon48 = QtGui.QIcon() + icon48.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_circle.setIcon(icon48) + self.button_cut_circle.setIconSize(QtCore.QSize(32, 32)) + self.button_cut_circle.setObjectName(_fromUtf8("button_cut_circle")) + self.horizontalLayout_67.addWidget(self.button_cut_circle) + self.spin_circle_cut = QtGui.QSpinBox(self.tab_16) + 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(100) + self.spin_circle_cut.setSingleStep(1) + self.spin_circle_cut.setObjectName(_fromUtf8("spin_circle_cut")) + self.horizontalLayout_67.addWidget(self.spin_circle_cut) + self.gridLayout.addLayout(self.horizontalLayout_67, 3, 0, 1, 1) + self.button_3points_ellipse = QtGui.QPushButton(self.tab_16) + icon49 = QtGui.QIcon() + icon49.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsEllipse.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_3points_ellipse.setIcon(icon49) + self.button_3points_ellipse.setIconSize(QtCore.QSize(32, 32)) + self.button_3points_ellipse.setObjectName(_fromUtf8("button_3points_ellipse")) + self.gridLayout.addWidget(self.button_3points_ellipse, 4, 0, 1, 1) + spacerItem7 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout.addItem(spacerItem7, 5, 0, 1, 1) + self.button_circle_to_sketch = QtGui.QPushButton(self.tab_16) + self.button_circle_to_sketch.setIcon(icon19) + self.button_circle_to_sketch.setIconSize(QtCore.QSize(32, 32)) + self.button_circle_to_sketch.setObjectName(_fromUtf8("button_circle_to_sketch")) + self.gridLayout.addWidget(self.button_circle_to_sketch, 6, 0, 1, 1) + spacerItem8 = QtGui.QSpacerItem(20, 121, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout.addItem(spacerItem8, 7, 0, 1, 1) + icon50 = QtGui.QIcon() + icon50.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_circle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.tab_16, icon50, _fromUtf8("")) self.Wire_Tab_2 = QtGui.QWidget() self.Wire_Tab_2.setObjectName(_fromUtf8("Wire_Tab_2")) self.gridLayout_74 = QtGui.QGridLayout(self.Wire_Tab_2) @@ -636,12 +778,12 @@ class Ui_Form(object): self.scrollArea_2.setWidgetResizable(True) self.scrollArea_2.setObjectName(_fromUtf8("scrollArea_2")) self.scrollAreaWidgetContents_5 = QtGui.QWidget() - self.scrollAreaWidgetContents_5.setGeometry(QtCore.QRect(0, 0, 245, 648)) + self.scrollAreaWidgetContents_5.setGeometry(QtCore.QRect(0, 0, 249, 648)) self.scrollAreaWidgetContents_5.setObjectName(_fromUtf8("scrollAreaWidgetContents_5")) self.gridLayout_76 = QtGui.QGridLayout(self.scrollAreaWidgetContents_5) self.gridLayout_76.setObjectName(_fromUtf8("gridLayout_76")) - spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_76.addItem(spacerItem5, 7, 0, 1, 1) + spacerItem9 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_76.addItem(spacerItem9, 7, 0, 1, 1) self.groupBox_14 = QtGui.QGroupBox(self.scrollAreaWidgetContents_5) self.groupBox_14.setObjectName(_fromUtf8("groupBox_14")) self.gridLayout_77 = QtGui.QGridLayout(self.groupBox_14) @@ -820,18 +962,18 @@ class Ui_Form(object): self.checkBox_polyline_2.setAutoExclusive(True) self.checkBox_polyline_2.setObjectName(_fromUtf8("checkBox_polyline_2")) self.gridLayout_2.addWidget(self.checkBox_polyline_2, 0, 1, 1, 1) - self.checkBox_bspline_2 = QtGui.QCheckBox(self.groupBox_16) - self.checkBox_bspline_2.setEnabled(True) - self.checkBox_bspline_2.setChecked(False) - self.checkBox_bspline_2.setAutoExclusive(True) - self.checkBox_bspline_2.setObjectName(_fromUtf8("checkBox_bspline_2")) - self.gridLayout_2.addWidget(self.checkBox_bspline_2, 1, 0, 1, 1) self.checkBox_bezier_2 = QtGui.QCheckBox(self.groupBox_16) self.checkBox_bezier_2.setEnabled(True) self.checkBox_bezier_2.setChecked(False) self.checkBox_bezier_2.setAutoExclusive(True) self.checkBox_bezier_2.setObjectName(_fromUtf8("checkBox_bezier_2")) - self.gridLayout_2.addWidget(self.checkBox_bezier_2, 1, 1, 1, 1) + self.gridLayout_2.addWidget(self.checkBox_bezier_2, 1, 0, 1, 1) + self.checkBox_bspline_2 = QtGui.QCheckBox(self.groupBox_16) + self.checkBox_bspline_2.setEnabled(True) + self.checkBox_bspline_2.setChecked(False) + self.checkBox_bspline_2.setAutoExclusive(True) + self.checkBox_bspline_2.setObjectName(_fromUtf8("checkBox_bspline_2")) + self.gridLayout_2.addWidget(self.checkBox_bspline_2, 1, 1, 1, 1) self.gridLayout_76.addWidget(self.groupBox_16, 4, 0, 1, 1) self.horizontalLayout_62 = QtGui.QHBoxLayout() self.horizontalLayout_62.setObjectName(_fromUtf8("horizontalLayout_62")) @@ -840,8 +982,8 @@ class Ui_Form(object): self.ParCurve_button_store_2.setMaximumSize(QtCore.QSize(60, 16777215)) self.ParCurve_button_store_2.setObjectName(_fromUtf8("ParCurve_button_store_2")) self.horizontalLayout_62.addWidget(self.ParCurve_button_store_2) - spacerItem6 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_62.addItem(spacerItem6) + spacerItem10 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_62.addItem(spacerItem10) self.ParCurve_button_apply_2 = QtGui.QPushButton(self.scrollAreaWidgetContents_5) self.ParCurve_button_apply_2.setMinimumSize(QtCore.QSize(40, 0)) self.ParCurve_button_apply_2.setMaximumSize(QtCore.QSize(60, 16777215)) @@ -859,7 +1001,7 @@ class Ui_Form(object): self.scrollArea_5.setWidgetResizable(True) self.scrollArea_5.setObjectName(_fromUtf8("scrollArea_5")) self.scrollAreaWidgetContents_6 = QtGui.QWidget() - self.scrollAreaWidgetContents_6.setGeometry(QtCore.QRect(0, 0, 207, 692)) + self.scrollAreaWidgetContents_6.setGeometry(QtCore.QRect(0, 0, 202, 692)) self.scrollAreaWidgetContents_6.setObjectName(_fromUtf8("scrollAreaWidgetContents_6")) self.gridLayout_81 = QtGui.QGridLayout(self.scrollAreaWidgetContents_6) self.gridLayout_81.setObjectName(_fromUtf8("gridLayout_81")) @@ -1045,31 +1187,6 @@ class Ui_Form(object): self.ParCurve_tmin_3.setObjectName(_fromUtf8("ParCurve_tmin_3")) self.gridLayout_82.addWidget(self.ParCurve_tmin_3, 0, 1, 1, 1) self.gridLayout_81.addWidget(self.groupBox_18, 3, 0, 1, 1) - self.groupBox_19 = QtGui.QGroupBox(self.scrollAreaWidgetContents_6) - self.groupBox_19.setObjectName(_fromUtf8("groupBox_19")) - self.gridLayout_3 = QtGui.QGridLayout(self.groupBox_19) - self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) - self.checkBox_points_3 = QtGui.QCheckBox(self.groupBox_19) - self.checkBox_points_3.setAutoExclusive(True) - self.checkBox_points_3.setObjectName(_fromUtf8("checkBox_points_3")) - self.gridLayout_3.addWidget(self.checkBox_points_3, 0, 0, 1, 1) - self.checkBox_polyline_3 = QtGui.QCheckBox(self.groupBox_19) - self.checkBox_polyline_3.setChecked(True) - self.checkBox_polyline_3.setAutoExclusive(True) - self.checkBox_polyline_3.setObjectName(_fromUtf8("checkBox_polyline_3")) - self.gridLayout_3.addWidget(self.checkBox_polyline_3, 0, 1, 1, 1) - self.checkBox_bspline_3 = QtGui.QCheckBox(self.groupBox_19) - self.checkBox_bspline_3.setChecked(False) - self.checkBox_bspline_3.setAutoExclusive(True) - self.checkBox_bspline_3.setObjectName(_fromUtf8("checkBox_bspline_3")) - self.gridLayout_3.addWidget(self.checkBox_bspline_3, 1, 0, 1, 1) - self.checkBox_bezier_3 = QtGui.QCheckBox(self.groupBox_19) - self.checkBox_bezier_3.setEnabled(True) - self.checkBox_bezier_3.setChecked(False) - self.checkBox_bezier_3.setAutoExclusive(True) - self.checkBox_bezier_3.setObjectName(_fromUtf8("checkBox_bezier_3")) - self.gridLayout_3.addWidget(self.checkBox_bezier_3, 1, 1, 1, 1) - self.gridLayout_81.addWidget(self.groupBox_19, 4, 0, 1, 1) self.checkBox_close_3 = QtGui.QCheckBox(self.scrollAreaWidgetContents_6) self.checkBox_close_3.setObjectName(_fromUtf8("checkBox_close_3")) self.gridLayout_81.addWidget(self.checkBox_close_3, 5, 0, 1, 1) @@ -1080,93 +1197,280 @@ class Ui_Form(object): self.ParCurve_button_store_3.setMaximumSize(QtCore.QSize(60, 16777215)) self.ParCurve_button_store_3.setObjectName(_fromUtf8("ParCurve_button_store_3")) self.horizontalLayout_65.addWidget(self.ParCurve_button_store_3) - spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_65.addItem(spacerItem7) + spacerItem11 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_65.addItem(spacerItem11) self.ParCurve_button_apply_3 = QtGui.QPushButton(self.scrollAreaWidgetContents_6) self.ParCurve_button_apply_3.setMinimumSize(QtCore.QSize(40, 0)) self.ParCurve_button_apply_3.setMaximumSize(QtCore.QSize(60, 16777215)) self.ParCurve_button_apply_3.setObjectName(_fromUtf8("ParCurve_button_apply_3")) self.horizontalLayout_65.addWidget(self.ParCurve_button_apply_3) self.gridLayout_81.addLayout(self.horizontalLayout_65, 6, 0, 1, 1) - spacerItem8 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_81.addItem(spacerItem8, 7, 0, 1, 1) + spacerItem12 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_81.addItem(spacerItem12, 7, 0, 1, 1) + self.groupBox_19 = QtGui.QGroupBox(self.scrollAreaWidgetContents_6) + self.groupBox_19.setObjectName(_fromUtf8("groupBox_19")) + self.gridLayout_3 = QtGui.QGridLayout(self.groupBox_19) + self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) + self.checkBox_points_3 = QtGui.QCheckBox(self.groupBox_19) + self.checkBox_points_3.setAutoExclusive(True) + self.checkBox_points_3.setObjectName(_fromUtf8("checkBox_points_3")) + self.gridLayout_3.addWidget(self.checkBox_points_3, 0, 1, 1, 1) + self.checkBox_polyline_3 = QtGui.QCheckBox(self.groupBox_19) + self.checkBox_polyline_3.setChecked(True) + self.checkBox_polyline_3.setAutoExclusive(True) + self.checkBox_polyline_3.setObjectName(_fromUtf8("checkBox_polyline_3")) + self.gridLayout_3.addWidget(self.checkBox_polyline_3, 0, 2, 1, 1) + self.checkBox_bspline_3 = QtGui.QCheckBox(self.groupBox_19) + self.checkBox_bspline_3.setChecked(False) + self.checkBox_bspline_3.setAutoExclusive(True) + self.checkBox_bspline_3.setObjectName(_fromUtf8("checkBox_bspline_3")) + self.gridLayout_3.addWidget(self.checkBox_bspline_3, 1, 2, 1, 1) + self.checkBox_bezier_3 = QtGui.QCheckBox(self.groupBox_19) + self.checkBox_bezier_3.setEnabled(True) + self.checkBox_bezier_3.setChecked(False) + self.checkBox_bezier_3.setAutoExclusive(True) + self.checkBox_bezier_3.setObjectName(_fromUtf8("checkBox_bezier_3")) + self.gridLayout_3.addWidget(self.checkBox_bezier_3, 1, 1, 1, 1) + self.gridLayout_81.addWidget(self.groupBox_19, 4, 0, 1, 1) self.scrollArea_5.setWidget(self.scrollAreaWidgetContents_6) self.gridLayout_80.addWidget(self.scrollArea_5, 0, 0, 1, 1) self.tabWidget_8.addTab(self.tab_15, _fromUtf8("")) self.gridLayout_74.addWidget(self.tabWidget_8, 1, 0, 1, 1) - icon39 = QtGui.QIcon() - icon39.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_wire.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.Wire_Tab_2, icon39, _fromUtf8("")) - self.tab_16 = QtGui.QWidget() - self.tab_16.setObjectName(_fromUtf8("tab_16")) - self.gridLayout = QtGui.QGridLayout(self.tab_16) - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.horizontalLayout_66 = QtGui.QHBoxLayout() - self.horizontalLayout_66.setObjectName(_fromUtf8("horizontalLayout_66")) - self.button_linecenter_circle = QtGui.QPushButton(self.tab_16) - icon40 = QtGui.QIcon() - icon40.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineCenterCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_linecenter_circle.setIcon(icon40) - self.button_linecenter_circle.setIconSize(QtCore.QSize(32, 32)) - self.button_linecenter_circle.setObjectName(_fromUtf8("button_linecenter_circle")) - self.horizontalLayout_66.addWidget(self.button_linecenter_circle) - self.radius_circle = QtGui.QLineEdit(self.tab_16) - self.radius_circle.setMinimumSize(QtCore.QSize(40, 0)) - self.radius_circle.setMaximumSize(QtCore.QSize(60, 16777215)) - self.radius_circle.setObjectName(_fromUtf8("radius_circle")) - self.horizontalLayout_66.addWidget(self.radius_circle) - self.gridLayout.addLayout(self.horizontalLayout_66, 0, 0, 1, 1) - self.button_linepoint_circle = QtGui.QPushButton(self.tab_16) - icon41 = QtGui.QIcon() - icon41.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_linepoint_circle.setIcon(icon41) - self.button_linepoint_circle.setIconSize(QtCore.QSize(32, 32)) - self.button_linepoint_circle.setObjectName(_fromUtf8("button_linepoint_circle")) - self.gridLayout.addWidget(self.button_linepoint_circle, 1, 0, 1, 1) - self.button_3points_circle = QtGui.QPushButton(self.tab_16) - icon42 = QtGui.QIcon() - icon42.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_3points_circle.setIcon(icon42) - self.button_3points_circle.setIconSize(QtCore.QSize(32, 32)) - self.button_3points_circle.setObjectName(_fromUtf8("button_3points_circle")) - self.gridLayout.addWidget(self.button_3points_circle, 2, 0, 1, 1) - self.horizontalLayout_67 = QtGui.QHBoxLayout() - self.horizontalLayout_67.setObjectName(_fromUtf8("horizontalLayout_67")) - self.button_cut_circle = QtGui.QPushButton(self.tab_16) - icon43 = QtGui.QIcon() - icon43.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cut_circle.setIcon(icon43) - self.button_cut_circle.setIconSize(QtCore.QSize(32, 32)) - self.button_cut_circle.setObjectName(_fromUtf8("button_cut_circle")) - self.horizontalLayout_67.addWidget(self.button_cut_circle) - self.spin_circle_cut = QtGui.QSpinBox(self.tab_16) - 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(100) - self.spin_circle_cut.setSingleStep(1) - self.spin_circle_cut.setObjectName(_fromUtf8("spin_circle_cut")) - self.horizontalLayout_67.addWidget(self.spin_circle_cut) - self.gridLayout.addLayout(self.horizontalLayout_67, 3, 0, 1, 1) - self.button_3points_ellipse = QtGui.QPushButton(self.tab_16) - icon44 = QtGui.QIcon() - icon44.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsEllipse.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_3points_ellipse.setIcon(icon44) - self.button_3points_ellipse.setIconSize(QtCore.QSize(32, 32)) - self.button_3points_ellipse.setObjectName(_fromUtf8("button_3points_ellipse")) - self.gridLayout.addWidget(self.button_3points_ellipse, 4, 0, 1, 1) - spacerItem9 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout.addItem(spacerItem9, 5, 0, 1, 1) - self.button_circle_to_sketch = QtGui.QPushButton(self.tab_16) - self.button_circle_to_sketch.setIcon(icon18) - self.button_circle_to_sketch.setIconSize(QtCore.QSize(32, 32)) - self.button_circle_to_sketch.setObjectName(_fromUtf8("button_circle_to_sketch")) - self.gridLayout.addWidget(self.button_circle_to_sketch, 6, 0, 1, 1) - spacerItem10 = QtGui.QSpacerItem(20, 121, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout.addItem(spacerItem10, 7, 0, 1, 1) - icon45 = QtGui.QIcon() - icon45.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_circle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.tab_16, icon45, _fromUtf8("")) + icon51 = QtGui.QIcon() + icon51.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_wire.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.Wire_Tab_2, icon51, _fromUtf8("")) + self.Plane_Tab = QtGui.QWidget() + self.Plane_Tab.setObjectName(_fromUtf8("Plane_Tab")) + self.gridLayout_17 = QtGui.QGridLayout(self.Plane_Tab) + self.gridLayout_17.setObjectName(_fromUtf8("gridLayout_17")) + self.tabWidget_3 = QtGui.QTabWidget(self.Plane_Tab) + self.tabWidget_3.setObjectName(_fromUtf8("tabWidget_3")) + self.Plane_Tab1_2 = QtGui.QWidget() + self.Plane_Tab1_2.setObjectName(_fromUtf8("Plane_Tab1_2")) + self.gridLayout_18 = QtGui.QGridLayout(self.Plane_Tab1_2) + self.gridLayout_18.setObjectName(_fromUtf8("gridLayout_18")) + self.button_threepoints_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon52 = QtGui.QIcon() + icon52.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_threePointsPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_threepoints_plane.setIcon(icon52) + self.button_threepoints_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_threepoints_plane.setObjectName(_fromUtf8("button_threepoints_plane")) + self.gridLayout_18.addWidget(self.button_threepoints_plane, 0, 0, 1, 1) + self.button_twopoints_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon53 = QtGui.QIcon() + icon53.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_twoPointsPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twopoints_plane.setIcon(icon53) + self.button_twopoints_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_twopoints_plane.setObjectName(_fromUtf8("button_twopoints_plane")) + self.gridLayout_18.addWidget(self.button_twopoints_plane, 1, 0, 1, 1) + self.button_Npoints_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon54 = QtGui.QIcon() + icon54.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_Npoints_plane.setIcon(icon54) + self.button_Npoints_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_Npoints_plane.setObjectName(_fromUtf8("button_Npoints_plane")) + self.gridLayout_18.addWidget(self.button_Npoints_plane, 2, 0, 1, 1) + self.button_axisandpoint_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon55 = QtGui.QIcon() + icon55.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_axisandpoint_plane.setIcon(icon55) + self.button_axisandpoint_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_axisandpoint_plane.setObjectName(_fromUtf8("button_axisandpoint_plane")) + self.gridLayout_18.addWidget(self.button_axisandpoint_plane, 3, 0, 1, 1) + self.button_axis_point_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon56 = QtGui.QIcon() + icon56.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane2.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_axis_point_plane.setIcon(icon56) + self.button_axis_point_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_axis_point_plane.setObjectName(_fromUtf8("button_axis_point_plane")) + self.gridLayout_18.addWidget(self.button_axis_point_plane, 4, 0, 1, 1) + self.gridLayout_90 = QtGui.QGridLayout() + self.gridLayout_90.setObjectName(_fromUtf8("gridLayout_90")) + self.button_planeandpoint_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon57 = QtGui.QIcon() + icon57.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointPlanePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_planeandpoint_plane.setIcon(icon57) + self.button_planeandpoint_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_planeandpoint_plane.setObjectName(_fromUtf8("button_planeandpoint_plane")) + self.gridLayout_90.addWidget(self.button_planeandpoint_plane, 0, 0, 1, 1) + self.extension_planePointPlane = QtGui.QLineEdit(self.Plane_Tab1_2) + 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_90.addWidget(self.extension_planePointPlane, 0, 1, 1, 1) + self.gridLayout_18.addLayout(self.gridLayout_90, 5, 0, 1, 1) + self.gridLayout_89 = QtGui.QGridLayout() + self.gridLayout_89.setObjectName(_fromUtf8("gridLayout_89")) + self.button_planeandaxis_plane = QtGui.QPushButton(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.button_planeandaxis_plane.sizePolicy().hasHeightForWidth()) + self.button_planeandaxis_plane.setSizePolicy(sizePolicy) + icon58 = QtGui.QIcon() + icon58.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_planeandaxis_plane.setIcon(icon58) + self.button_planeandaxis_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_planeandaxis_plane.setObjectName(_fromUtf8("button_planeandaxis_plane")) + self.gridLayout_89.addWidget(self.button_planeandaxis_plane, 0, 0, 1, 1) + self.angle_planeandaxis_plane = QtGui.QLineEdit(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.angle_planeandaxis_plane.sizePolicy().hasHeightForWidth()) + self.angle_planeandaxis_plane.setSizePolicy(sizePolicy) + self.angle_planeandaxis_plane.setMinimumSize(QtCore.QSize(40, 0)) + self.angle_planeandaxis_plane.setMaximumSize(QtCore.QSize(60, 16777215)) + self.angle_planeandaxis_plane.setObjectName(_fromUtf8("angle_planeandaxis_plane")) + self.gridLayout_89.addWidget(self.angle_planeandaxis_plane, 0, 1, 1, 1) + self.gridLayout_18.addLayout(self.gridLayout_89, 6, 0, 1, 1) + self.horizontalLayout_70 = QtGui.QHBoxLayout() + self.horizontalLayout_70.setObjectName(_fromUtf8("horizontalLayout_70")) + self.button_distPlane = QtGui.QPushButton(self.Plane_Tab1_2) + icon59 = QtGui.QIcon() + icon59.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distPlanePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_distPlane.setIcon(icon59) + self.button_distPlane.setIconSize(QtCore.QSize(32, 32)) + self.button_distPlane.setObjectName(_fromUtf8("button_distPlane")) + self.horizontalLayout_70.addWidget(self.button_distPlane) + self.dist_plane = QtGui.QLineEdit(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.dist_plane.sizePolicy().hasHeightForWidth()) + self.dist_plane.setSizePolicy(sizePolicy) + self.dist_plane.setMinimumSize(QtCore.QSize(40, 0)) + self.dist_plane.setMaximumSize(QtCore.QSize(40, 16777215)) + self.dist_plane.setObjectName(_fromUtf8("dist_plane")) + self.horizontalLayout_70.addWidget(self.dist_plane) + self.spin_dist_plane = QtGui.QSpinBox(self.Plane_Tab1_2) + self.spin_dist_plane.setMinimumSize(QtCore.QSize(30, 0)) + self.spin_dist_plane.setMaximumSize(QtCore.QSize(30, 16777215)) + self.spin_dist_plane.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) + self.spin_dist_plane.setKeyboardTracking(False) + self.spin_dist_plane.setMinimum(1) + self.spin_dist_plane.setMaximum(100) + self.spin_dist_plane.setSingleStep(1) + self.spin_dist_plane.setProperty("value", 1) + self.spin_dist_plane.setObjectName(_fromUtf8("spin_dist_plane")) + self.horizontalLayout_70.addWidget(self.spin_dist_plane) + self.gridLayout_18.addLayout(self.horizontalLayout_70, 7, 0, 1, 1) + self.horizontalLayout_69 = QtGui.QHBoxLayout() + self.horizontalLayout_69.setObjectName(_fromUtf8("horizontalLayout_69")) + self.button_face_tangent = QtGui.QPushButton(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.button_face_tangent.sizePolicy().hasHeightForWidth()) + self.button_face_tangent.setSizePolicy(sizePolicy) + icon60 = QtGui.QIcon() + icon60.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceTangent.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_face_tangent.setIcon(icon60) + self.button_face_tangent.setIconSize(QtCore.QSize(32, 32)) + self.button_face_tangent.setObjectName(_fromUtf8("button_face_tangent")) + self.horizontalLayout_69.addWidget(self.button_face_tangent) + self.length_plane_2 = QtGui.QLineEdit(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.length_plane_2.sizePolicy().hasHeightForWidth()) + self.length_plane_2.setSizePolicy(sizePolicy) + self.length_plane_2.setMinimumSize(QtCore.QSize(40, 0)) + self.length_plane_2.setMaximumSize(QtCore.QSize(50, 16777215)) + self.length_plane_2.setObjectName(_fromUtf8("length_plane_2")) + self.horizontalLayout_69.addWidget(self.length_plane_2) + self.width_plane_2 = QtGui.QLineEdit(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.width_plane_2.sizePolicy().hasHeightForWidth()) + self.width_plane_2.setSizePolicy(sizePolicy) + self.width_plane_2.setMinimumSize(QtCore.QSize(40, 0)) + self.width_plane_2.setMaximumSize(QtCore.QSize(50, 16777215)) + self.width_plane_2.setObjectName(_fromUtf8("width_plane_2")) + self.horizontalLayout_69.addWidget(self.width_plane_2) + self.gridLayout_18.addLayout(self.horizontalLayout_69, 8, 0, 1, 1) + spacerItem13 = QtGui.QSpacerItem(20, 235, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_18.addItem(spacerItem13, 9, 0, 1, 1) + self.tabWidget_3.addTab(self.Plane_Tab1_2, _fromUtf8("")) + self.Plane_Tab2_2 = QtGui.QWidget() + self.Plane_Tab2_2.setObjectName(_fromUtf8("Plane_Tab2_2")) + self.gridLayout_36 = QtGui.QGridLayout(self.Plane_Tab2_2) + self.gridLayout_36.setObjectName(_fromUtf8("gridLayout_36")) + self.horizontalLayout_68 = QtGui.QHBoxLayout() + self.horizontalLayout_68.setObjectName(_fromUtf8("horizontalLayout_68")) + self.button_click_for_plane = QtGui.QPushButton(self.Plane_Tab2_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.button_click_for_plane.sizePolicy().hasHeightForWidth()) + self.button_click_for_plane.setSizePolicy(sizePolicy) + icon61 = QtGui.QIcon() + icon61.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_click_for_plane.setIcon(icon61) + self.button_click_for_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_click_for_plane.setObjectName(_fromUtf8("button_click_for_plane")) + self.horizontalLayout_68.addWidget(self.button_click_for_plane) + self.length_plane = QtGui.QLineEdit(self.Plane_Tab2_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.length_plane.sizePolicy().hasHeightForWidth()) + self.length_plane.setSizePolicy(sizePolicy) + self.length_plane.setMinimumSize(QtCore.QSize(40, 0)) + self.length_plane.setMaximumSize(QtCore.QSize(50, 16777215)) + self.length_plane.setObjectName(_fromUtf8("length_plane")) + self.horizontalLayout_68.addWidget(self.length_plane) + self.width_plane = QtGui.QLineEdit(self.Plane_Tab2_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.width_plane.sizePolicy().hasHeightForWidth()) + self.width_plane.setSizePolicy(sizePolicy) + self.width_plane.setMinimumSize(QtCore.QSize(40, 0)) + self.width_plane.setMaximumSize(QtCore.QSize(50, 16777215)) + self.width_plane.setObjectName(_fromUtf8("width_plane")) + self.horizontalLayout_68.addWidget(self.width_plane) + self.gridLayout_36.addLayout(self.horizontalLayout_68, 0, 0, 1, 1) + self.horizontalLayout_71 = QtGui.QHBoxLayout() + self.horizontalLayout_71.setObjectName(_fromUtf8("horizontalLayout_71")) + self.button_extension_plane = QtGui.QPushButton(self.Plane_Tab2_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.button_extension_plane.sizePolicy().hasHeightForWidth()) + self.button_extension_plane.setSizePolicy(sizePolicy) + icon62 = QtGui.QIcon() + icon62.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_enlargePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_extension_plane.setIcon(icon62) + self.button_extension_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_extension_plane.setObjectName(_fromUtf8("button_extension_plane")) + self.horizontalLayout_71.addWidget(self.button_extension_plane) + self.extension_plane = QtGui.QLineEdit(self.Plane_Tab2_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.extension_plane.sizePolicy().hasHeightForWidth()) + self.extension_plane.setSizePolicy(sizePolicy) + self.extension_plane.setMinimumSize(QtCore.QSize(40, 0)) + self.extension_plane.setMaximumSize(QtCore.QSize(50, 16777215)) + self.extension_plane.setObjectName(_fromUtf8("extension_plane")) + self.horizontalLayout_71.addWidget(self.extension_plane) + self.gridLayout_36.addLayout(self.horizontalLayout_71, 1, 0, 1, 1) + self.button_object_center_planes = QtGui.QPushButton(self.Plane_Tab2_2) + icon63 = QtGui.QIcon() + icon63.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsPlanes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_center_planes.setIcon(icon63) + self.button_object_center_planes.setIconSize(QtCore.QSize(32, 32)) + self.button_object_center_planes.setObjectName(_fromUtf8("button_object_center_planes")) + self.gridLayout_36.addWidget(self.button_object_center_planes, 2, 0, 1, 1) + spacerItem14 = QtGui.QSpacerItem(20, 527, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_36.addItem(spacerItem14, 3, 0, 1, 1) + self.tabWidget_3.addTab(self.Plane_Tab2_2, _fromUtf8("")) + self.gridLayout_17.addWidget(self.tabWidget_3, 0, 0, 1, 1) + icon64 = QtGui.QIcon() + icon64.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_plane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.Plane_Tab, icon64, _fromUtf8("")) self.tab_17 = QtGui.QWidget() self.tab_17.setObjectName(_fromUtf8("tab_17")) self.gridLayout_6 = QtGui.QGridLayout(self.tab_17) @@ -1203,233 +1507,23 @@ class Ui_Form(object): self.gridLayout_87.addWidget(self.radioButton_Frenet, 1, 1, 1, 1) self.gridLayout_86.addLayout(self.gridLayout_87, 0, 0, 1, 1) self.button_sweep = QtGui.QPushButton(self.frame_9) - icon46 = QtGui.QIcon() - icon46.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Sweep.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_sweep.setIcon(icon46) + icon65 = QtGui.QIcon() + icon65.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Sweep.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_sweep.setIcon(icon65) self.button_sweep.setIconSize(QtCore.QSize(32, 32)) self.button_sweep.setObjectName(_fromUtf8("button_sweep")) self.gridLayout_86.addWidget(self.button_sweep, 1, 0, 1, 1) self.gridLayout_6.addWidget(self.frame_9, 0, 0, 1, 1) - spacerItem11 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_6.addItem(spacerItem11, 2, 0, 1, 1) + spacerItem15 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_6.addItem(spacerItem15, 2, 0, 1, 1) self.button_beam = QtGui.QPushButton(self.tab_17) - icon47 = QtGui.QIcon() - icon47.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Beam.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_beam.setIcon(icon47) + icon66 = QtGui.QIcon() + icon66.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Beam.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_beam.setIcon(icon66) self.button_beam.setIconSize(QtCore.QSize(32, 32)) self.button_beam.setObjectName(_fromUtf8("button_beam")) self.gridLayout_6.addWidget(self.button_beam, 1, 0, 1, 1) - self.tabWidget_7.addTab(self.tab_17, icon47, _fromUtf8("")) - self.Plane_Tab1_3 = QtGui.QWidget() - self.Plane_Tab1_3.setObjectName(_fromUtf8("Plane_Tab1_3")) - self.gridLayout_88 = QtGui.QGridLayout(self.Plane_Tab1_3) - self.gridLayout_88.setObjectName(_fromUtf8("gridLayout_88")) - spacerItem12 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_88.addItem(spacerItem12, 9, 0, 1, 1) - self.horizontalLayout_68 = QtGui.QHBoxLayout() - self.horizontalLayout_68.setObjectName(_fromUtf8("horizontalLayout_68")) - self.button_click_for_plane = QtGui.QPushButton(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.button_click_for_plane.sizePolicy().hasHeightForWidth()) - self.button_click_for_plane.setSizePolicy(sizePolicy) - icon48 = QtGui.QIcon() - icon48.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_click_for_plane.setIcon(icon48) - self.button_click_for_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_click_for_plane.setObjectName(_fromUtf8("button_click_for_plane")) - self.horizontalLayout_68.addWidget(self.button_click_for_plane) - self.length_plane = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.length_plane.sizePolicy().hasHeightForWidth()) - self.length_plane.setSizePolicy(sizePolicy) - self.length_plane.setMinimumSize(QtCore.QSize(40, 0)) - self.length_plane.setMaximumSize(QtCore.QSize(50, 16777215)) - self.length_plane.setObjectName(_fromUtf8("length_plane")) - self.horizontalLayout_68.addWidget(self.length_plane) - self.width_plane = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.width_plane.sizePolicy().hasHeightForWidth()) - self.width_plane.setSizePolicy(sizePolicy) - self.width_plane.setMinimumSize(QtCore.QSize(40, 0)) - self.width_plane.setMaximumSize(QtCore.QSize(50, 16777215)) - self.width_plane.setObjectName(_fromUtf8("width_plane")) - self.horizontalLayout_68.addWidget(self.width_plane) - self.gridLayout_88.addLayout(self.horizontalLayout_68, 8, 0, 1, 1) - self.gridLayout_89 = QtGui.QGridLayout() - self.gridLayout_89.setObjectName(_fromUtf8("gridLayout_89")) - self.button_planeandaxis_plane = QtGui.QPushButton(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.button_planeandaxis_plane.sizePolicy().hasHeightForWidth()) - self.button_planeandaxis_plane.setSizePolicy(sizePolicy) - icon49 = QtGui.QIcon() - icon49.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_planeandaxis_plane.setIcon(icon49) - self.button_planeandaxis_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_planeandaxis_plane.setObjectName(_fromUtf8("button_planeandaxis_plane")) - self.gridLayout_89.addWidget(self.button_planeandaxis_plane, 0, 0, 1, 1) - self.angle_planeandaxis_plane = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.angle_planeandaxis_plane.sizePolicy().hasHeightForWidth()) - self.angle_planeandaxis_plane.setSizePolicy(sizePolicy) - self.angle_planeandaxis_plane.setMinimumSize(QtCore.QSize(40, 0)) - self.angle_planeandaxis_plane.setMaximumSize(QtCore.QSize(60, 16777215)) - self.angle_planeandaxis_plane.setObjectName(_fromUtf8("angle_planeandaxis_plane")) - self.gridLayout_89.addWidget(self.angle_planeandaxis_plane, 0, 1, 1, 1) - self.gridLayout_88.addLayout(self.gridLayout_89, 4, 0, 1, 1) - self.button_axisandpoint_plane = QtGui.QPushButton(self.Plane_Tab1_3) - icon50 = QtGui.QIcon() - icon50.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_axisandpoint_plane.setIcon(icon50) - self.button_axisandpoint_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_axisandpoint_plane.setObjectName(_fromUtf8("button_axisandpoint_plane")) - self.gridLayout_88.addWidget(self.button_axisandpoint_plane, 1, 0, 1, 1) - self.button_axis_point_plane = QtGui.QPushButton(self.Plane_Tab1_3) - icon51 = QtGui.QIcon() - icon51.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane2.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_axis_point_plane.setIcon(icon51) - self.button_axis_point_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_axis_point_plane.setObjectName(_fromUtf8("button_axis_point_plane")) - self.gridLayout_88.addWidget(self.button_axis_point_plane, 2, 0, 1, 1) - self.horizontalLayout_69 = QtGui.QHBoxLayout() - self.horizontalLayout_69.setObjectName(_fromUtf8("horizontalLayout_69")) - self.button_face_tangent = QtGui.QPushButton(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.button_face_tangent.sizePolicy().hasHeightForWidth()) - self.button_face_tangent.setSizePolicy(sizePolicy) - icon52 = QtGui.QIcon() - icon52.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceTangent.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_face_tangent.setIcon(icon52) - self.button_face_tangent.setIconSize(QtCore.QSize(32, 32)) - self.button_face_tangent.setObjectName(_fromUtf8("button_face_tangent")) - self.horizontalLayout_69.addWidget(self.button_face_tangent) - self.length_plane_2 = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.length_plane_2.sizePolicy().hasHeightForWidth()) - self.length_plane_2.setSizePolicy(sizePolicy) - self.length_plane_2.setMinimumSize(QtCore.QSize(40, 0)) - self.length_plane_2.setMaximumSize(QtCore.QSize(50, 16777215)) - self.length_plane_2.setObjectName(_fromUtf8("length_plane_2")) - self.horizontalLayout_69.addWidget(self.length_plane_2) - self.width_plane_2 = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.width_plane_2.sizePolicy().hasHeightForWidth()) - self.width_plane_2.setSizePolicy(sizePolicy) - self.width_plane_2.setMinimumSize(QtCore.QSize(40, 0)) - self.width_plane_2.setMaximumSize(QtCore.QSize(50, 16777215)) - self.width_plane_2.setObjectName(_fromUtf8("width_plane_2")) - self.horizontalLayout_69.addWidget(self.width_plane_2) - self.gridLayout_88.addLayout(self.horizontalLayout_69, 6, 0, 1, 1) - self.button_threepoints_plane = QtGui.QPushButton(self.Plane_Tab1_3) - icon53 = QtGui.QIcon() - icon53.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_threePointsPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_threepoints_plane.setIcon(icon53) - self.button_threepoints_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_threepoints_plane.setObjectName(_fromUtf8("button_threepoints_plane")) - self.gridLayout_88.addWidget(self.button_threepoints_plane, 0, 0, 1, 1) - self.horizontalLayout_70 = QtGui.QHBoxLayout() - self.horizontalLayout_70.setObjectName(_fromUtf8("horizontalLayout_70")) - self.button_distPlane = QtGui.QPushButton(self.Plane_Tab1_3) - icon54 = QtGui.QIcon() - icon54.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distPlanePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_distPlane.setIcon(icon54) - self.button_distPlane.setIconSize(QtCore.QSize(32, 32)) - self.button_distPlane.setObjectName(_fromUtf8("button_distPlane")) - self.horizontalLayout_70.addWidget(self.button_distPlane) - self.dist_plane = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.dist_plane.sizePolicy().hasHeightForWidth()) - self.dist_plane.setSizePolicy(sizePolicy) - self.dist_plane.setMinimumSize(QtCore.QSize(40, 0)) - self.dist_plane.setMaximumSize(QtCore.QSize(40, 16777215)) - self.dist_plane.setObjectName(_fromUtf8("dist_plane")) - self.horizontalLayout_70.addWidget(self.dist_plane) - self.spin_dist_plane = QtGui.QSpinBox(self.Plane_Tab1_3) - self.spin_dist_plane.setMinimumSize(QtCore.QSize(30, 0)) - self.spin_dist_plane.setMaximumSize(QtCore.QSize(30, 16777215)) - self.spin_dist_plane.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) - self.spin_dist_plane.setKeyboardTracking(False) - self.spin_dist_plane.setMinimum(1) - self.spin_dist_plane.setMaximum(100) - self.spin_dist_plane.setSingleStep(1) - self.spin_dist_plane.setProperty("value", 1) - self.spin_dist_plane.setObjectName(_fromUtf8("spin_dist_plane")) - self.horizontalLayout_70.addWidget(self.spin_dist_plane) - self.gridLayout_88.addLayout(self.horizontalLayout_70, 5, 0, 1, 1) - self.gridLayout_90 = QtGui.QGridLayout() - self.gridLayout_90.setObjectName(_fromUtf8("gridLayout_90")) - self.button_planeandpoint_plane = QtGui.QPushButton(self.Plane_Tab1_3) - icon55 = QtGui.QIcon() - icon55.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointPlanePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_planeandpoint_plane.setIcon(icon55) - self.button_planeandpoint_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_planeandpoint_plane.setObjectName(_fromUtf8("button_planeandpoint_plane")) - self.gridLayout_90.addWidget(self.button_planeandpoint_plane, 0, 0, 1, 1) - self.extension_planePointPlane = QtGui.QLineEdit(self.Plane_Tab1_3) - 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_90.addWidget(self.extension_planePointPlane, 0, 1, 1, 1) - self.gridLayout_88.addLayout(self.gridLayout_90, 3, 0, 1, 1) - icon56 = QtGui.QIcon() - icon56.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_plane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.Plane_Tab1_3, icon56, _fromUtf8("")) - self.Plane_Tab1_4 = QtGui.QWidget() - self.Plane_Tab1_4.setObjectName(_fromUtf8("Plane_Tab1_4")) - self.gridLayout_91 = QtGui.QGridLayout(self.Plane_Tab1_4) - self.gridLayout_91.setObjectName(_fromUtf8("gridLayout_91")) - spacerItem13 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_91.addItem(spacerItem13, 2, 0, 1, 1) - self.button_object_center_planes = QtGui.QPushButton(self.Plane_Tab1_4) - icon57 = QtGui.QIcon() - icon57.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsPlanes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_center_planes.setIcon(icon57) - self.button_object_center_planes.setIconSize(QtCore.QSize(32, 32)) - self.button_object_center_planes.setObjectName(_fromUtf8("button_object_center_planes")) - self.gridLayout_91.addWidget(self.button_object_center_planes, 1, 0, 1, 1) - self.horizontalLayout_71 = QtGui.QHBoxLayout() - self.horizontalLayout_71.setObjectName(_fromUtf8("horizontalLayout_71")) - self.button_extension_plane = QtGui.QPushButton(self.Plane_Tab1_4) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.button_extension_plane.sizePolicy().hasHeightForWidth()) - self.button_extension_plane.setSizePolicy(sizePolicy) - icon58 = QtGui.QIcon() - icon58.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_enlargePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_extension_plane.setIcon(icon58) - self.button_extension_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_extension_plane.setObjectName(_fromUtf8("button_extension_plane")) - self.horizontalLayout_71.addWidget(self.button_extension_plane) - self.extension_plane = QtGui.QLineEdit(self.Plane_Tab1_4) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.extension_plane.sizePolicy().hasHeightForWidth()) - self.extension_plane.setSizePolicy(sizePolicy) - self.extension_plane.setMinimumSize(QtCore.QSize(40, 0)) - self.extension_plane.setMaximumSize(QtCore.QSize(50, 16777215)) - self.extension_plane.setObjectName(_fromUtf8("extension_plane")) - self.horizontalLayout_71.addWidget(self.extension_plane) - self.gridLayout_91.addLayout(self.horizontalLayout_71, 0, 0, 1, 1) - self.tabWidget_7.addTab(self.Plane_Tab1_4, icon56, _fromUtf8("")) + self.tabWidget_7.addTab(self.tab_17, icon66, _fromUtf8("")) self.Objects_Tab2_2 = QtGui.QWidget() self.Objects_Tab2_2.setEnabled(True) self.Objects_Tab2_2.setMinimumSize(QtCore.QSize(0, 0)) @@ -1442,17 +1536,17 @@ class Ui_Form(object): self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4")) self.button_boundingboxes = QtGui.QPushButton(self.Objects_Tab2_2) self.button_boundingboxes.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon59 = QtGui.QIcon() - icon59.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBoxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_boundingboxes.setIcon(icon59) + icon67 = QtGui.QIcon() + icon67.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBoxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_boundingboxes.setIcon(icon67) self.button_boundingboxes.setIconSize(QtCore.QSize(32, 32)) self.button_boundingboxes.setObjectName(_fromUtf8("button_boundingboxes")) self.verticalLayout_4.addWidget(self.button_boundingboxes) self.button_boundingbox = QtGui.QPushButton(self.Objects_Tab2_2) self.button_boundingbox.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon60 = QtGui.QIcon() - icon60.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBox.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_boundingbox.setIcon(icon60) + icon68 = QtGui.QIcon() + icon68.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBox.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_boundingbox.setIcon(icon68) self.button_boundingbox.setIconSize(QtCore.QSize(32, 32)) self.button_boundingbox.setObjectName(_fromUtf8("button_boundingbox")) self.verticalLayout_4.addWidget(self.button_boundingbox) @@ -1473,9 +1567,9 @@ class Ui_Form(object): self.gridLayout_93 = QtGui.QGridLayout() self.gridLayout_93.setObjectName(_fromUtf8("gridLayout_93")) self.button_cylinder_create = QtGui.QPushButton(self.Objects_Tab2_2) - icon61 = QtGui.QIcon() - icon61.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinder.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cylinder_create.setIcon(icon61) + icon69 = QtGui.QIcon() + icon69.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinder.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cylinder_create.setIcon(icon69) self.button_cylinder_create.setIconSize(QtCore.QSize(32, 32)) self.button_cylinder_create.setObjectName(_fromUtf8("button_cylinder_create")) self.gridLayout_93.addWidget(self.button_cylinder_create, 0, 0, 1, 1) @@ -1503,9 +1597,9 @@ class Ui_Form(object): self.horizontalLayout_73 = QtGui.QHBoxLayout() self.horizontalLayout_73.setObjectName(_fromUtf8("horizontalLayout_73")) self.button_cube_create = QtGui.QPushButton(self.Objects_Tab2_2) - icon62 = QtGui.QIcon() - icon62.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cube.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cube_create.setIcon(icon62) + icon70 = QtGui.QIcon() + icon70.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cube.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cube_create.setIcon(icon70) self.button_cube_create.setIconSize(QtCore.QSize(32, 32)) self.button_cube_create.setObjectName(_fromUtf8("button_cube_create")) self.horizontalLayout_73.addWidget(self.button_cube_create) @@ -1533,9 +1627,9 @@ class Ui_Form(object): self.horizontalLayout_74 = QtGui.QHBoxLayout() self.horizontalLayout_74.setObjectName(_fromUtf8("horizontalLayout_74")) self.button_sphere_create = QtGui.QPushButton(self.Objects_Tab2_2) - icon63 = QtGui.QIcon() - icon63.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_sphere.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_sphere_create.setIcon(icon63) + icon71 = QtGui.QIcon() + icon71.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_sphere.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_sphere_create.setIcon(icon71) self.button_sphere_create.setIconSize(QtCore.QSize(32, 32)) self.button_sphere_create.setObjectName(_fromUtf8("button_sphere_create")) self.horizontalLayout_74.addWidget(self.button_sphere_create) @@ -1553,9 +1647,9 @@ class Ui_Form(object): self.horizontalLayout_77 = QtGui.QHBoxLayout() self.horizontalLayout_77.setObjectName(_fromUtf8("horizontalLayout_77")) self.button_dome_create = QtGui.QPushButton(self.Objects_Tab2_2) - icon64 = QtGui.QIcon() - icon64.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_dome.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_dome_create.setIcon(icon64) + icon72 = QtGui.QIcon() + icon72.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_dome.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_dome_create.setIcon(icon72) self.button_dome_create.setIconSize(QtCore.QSize(32, 32)) self.button_dome_create.setObjectName(_fromUtf8("button_dome_create")) self.horizontalLayout_77.addWidget(self.button_dome_create) @@ -1582,9 +1676,9 @@ class Ui_Form(object): self.horizontalLayout_75 = QtGui.QHBoxLayout() self.horizontalLayout_75.setObjectName(_fromUtf8("horizontalLayout_75")) self.button_letter = QtGui.QPushButton(self.Objects_Tab2_2) - icon65 = QtGui.QIcon() - icon65.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointText.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_letter.setIcon(icon65) + icon73 = QtGui.QIcon() + icon73.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointText.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_letter.setIcon(icon73) self.button_letter.setIconSize(QtCore.QSize(32, 32)) self.button_letter.setObjectName(_fromUtf8("button_letter")) self.horizontalLayout_75.addWidget(self.button_letter) @@ -1606,9 +1700,9 @@ class Ui_Form(object): self.horizontalLayout_76 = QtGui.QHBoxLayout() self.horizontalLayout_76.setObjectName(_fromUtf8("horizontalLayout_76")) self.button_revolve = QtGui.QPushButton(self.Objects_Tab2_2) - icon66 = QtGui.QIcon() - icon66.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Revolve.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_revolve.setIcon(icon66) + icon74 = QtGui.QIcon() + icon74.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Revolve.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_revolve.setIcon(icon74) self.button_revolve.setIconSize(QtCore.QSize(32, 32)) self.button_revolve.setObjectName(_fromUtf8("button_revolve")) self.horizontalLayout_76.addWidget(self.button_revolve) @@ -1624,31 +1718,31 @@ class Ui_Form(object): self.horizontalLayout_76.addWidget(self.angle_revolve) self.gridLayout_5.addLayout(self.horizontalLayout_76, 7, 0, 1, 1) self.button_copy_objects = QtGui.QPushButton(self.Objects_Tab2_2) - icon67 = QtGui.QIcon() - icon67.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectCopy.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_copy_objects.setIcon(icon67) + icon75 = QtGui.QIcon() + icon75.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectCopy.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_copy_objects.setIcon(icon75) self.button_copy_objects.setIconSize(QtCore.QSize(32, 32)) self.button_copy_objects.setObjectName(_fromUtf8("button_copy_objects")) self.gridLayout_5.addWidget(self.button_copy_objects, 8, 0, 1, 1) self.button_common = QtGui.QPushButton(self.Objects_Tab2_2) - icon68 = QtGui.QIcon() - icon68.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Common.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_common.setIcon(icon68) + icon76 = QtGui.QIcon() + icon76.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Common.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_common.setIcon(icon76) self.button_common.setIconSize(QtCore.QSize(32, 32)) self.button_common.setObjectName(_fromUtf8("button_common")) self.gridLayout_5.addWidget(self.button_common, 9, 0, 1, 1) self.button_difference = QtGui.QPushButton(self.Objects_Tab2_2) - icon69 = QtGui.QIcon() - icon69.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Difference.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_difference.setIcon(icon69) + icon77 = QtGui.QIcon() + icon77.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Difference.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_difference.setIcon(icon77) self.button_difference.setIconSize(QtCore.QSize(32, 32)) self.button_difference.setObjectName(_fromUtf8("button_difference")) self.gridLayout_5.addWidget(self.button_difference, 10, 0, 1, 1) - spacerItem14 = QtGui.QSpacerItem(17, 8, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_5.addItem(spacerItem14, 11, 0, 1, 1) - icon70 = QtGui.QIcon() - icon70.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_box.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.Objects_Tab2_2, icon70, _fromUtf8("")) + spacerItem16 = QtGui.QSpacerItem(17, 8, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_5.addItem(spacerItem16, 11, 0, 1, 1) + icon78 = QtGui.QIcon() + icon78.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_box.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.Objects_Tab2_2, icon78, _fromUtf8("")) self.Modif_Tab_2 = QtGui.QWidget() self.Modif_Tab_2.setObjectName(_fromUtf8("Modif_Tab_2")) self.gridLayout_94 = QtGui.QGridLayout(self.Modif_Tab_2) @@ -1657,8 +1751,8 @@ class Ui_Form(object): self.tabWidget_9.setObjectName(_fromUtf8("tabWidget_9")) self.align_tab_2 = QtGui.QWidget() self.align_tab_2.setObjectName(_fromUtf8("align_tab_2")) - self.gridLayout_95 = QtGui.QGridLayout(self.align_tab_2) - self.gridLayout_95.setObjectName(_fromUtf8("gridLayout_95")) + self.gridLayout_9 = QtGui.QGridLayout(self.align_tab_2) + self.gridLayout_9.setObjectName(_fromUtf8("gridLayout_9")) self.button_alignface2view = QtGui.QPushButton(self.align_tab_2) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -1666,19 +1760,19 @@ class Ui_Form(object): sizePolicy.setHeightForWidth(self.button_alignface2view.sizePolicy().hasHeightForWidth()) self.button_alignface2view.setSizePolicy(sizePolicy) self.button_alignface2view.setMaximumSize(QtCore.QSize(220, 16777215)) - icon71 = QtGui.QIcon() - icon71.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_viewAlignFace.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_alignface2view.setIcon(icon71) + icon79 = QtGui.QIcon() + icon79.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_viewAlignFace.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_alignface2view.setIcon(icon79) self.button_alignface2view.setIconSize(QtCore.QSize(32, 32)) self.button_alignface2view.setObjectName(_fromUtf8("button_alignface2view")) - self.gridLayout_95.addWidget(self.button_alignface2view, 0, 0, 1, 1) + self.gridLayout_9.addWidget(self.button_alignface2view, 0, 0, 1, 1) self.horizontalLayout_78 = QtGui.QHBoxLayout() self.horizontalLayout_78.setObjectName(_fromUtf8("horizontalLayout_78")) self.button_align_faces = QtGui.QPushButton(self.align_tab_2) self.button_align_faces.setMaximumSize(QtCore.QSize(220, 16777215)) - icon72 = QtGui.QIcon() - icon72.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectAlignFaces.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_align_faces.setIcon(icon72) + icon80 = QtGui.QIcon() + icon80.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectAlignFaces.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_align_faces.setIcon(icon80) self.button_align_faces.setIconSize(QtCore.QSize(32, 32)) self.button_align_faces.setObjectName(_fromUtf8("button_align_faces")) self.horizontalLayout_78.addWidget(self.button_align_faces) @@ -1692,14 +1786,14 @@ class Ui_Form(object): self.angle_align_faces.setMaximumSize(QtCore.QSize(50, 16777215)) self.angle_align_faces.setObjectName(_fromUtf8("angle_align_faces")) self.horizontalLayout_78.addWidget(self.angle_align_faces) - self.gridLayout_95.addLayout(self.horizontalLayout_78, 1, 0, 1, 1) + self.gridLayout_9.addLayout(self.horizontalLayout_78, 1, 0, 1, 1) self.horizontalLayout_79 = QtGui.QHBoxLayout() self.horizontalLayout_79.setObjectName(_fromUtf8("horizontalLayout_79")) self.button_align_edges = QtGui.QPushButton(self.align_tab_2) self.button_align_edges.setMaximumSize(QtCore.QSize(220, 16777215)) - icon73 = QtGui.QIcon() - icon73.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectAlignAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_align_edges.setIcon(icon73) + icon81 = QtGui.QIcon() + icon81.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectAlignAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_align_edges.setIcon(icon81) self.button_align_edges.setIconSize(QtCore.QSize(32, 32)) self.button_align_edges.setObjectName(_fromUtf8("button_align_edges")) self.horizontalLayout_79.addWidget(self.button_align_edges) @@ -1713,23 +1807,43 @@ class Ui_Form(object): self.angle_align_edges.setMaximumSize(QtCore.QSize(50, 16777215)) self.angle_align_edges.setObjectName(_fromUtf8("angle_align_edges")) self.horizontalLayout_79.addWidget(self.angle_align_edges) - self.gridLayout_95.addLayout(self.horizontalLayout_79, 2, 0, 1, 1) - spacerItem15 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_95.addItem(spacerItem15, 5, 0, 1, 1) + self.gridLayout_9.addLayout(self.horizontalLayout_79, 2, 0, 1, 1) + self.horizontalLayout_2 = QtGui.QHBoxLayout() + self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) + self.button_align_main_axis = QtGui.QPushButton(self.align_tab_2) + icon82 = QtGui.QIcon() + icon82.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectAlignMainAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_align_main_axis.setIcon(icon82) + self.button_align_main_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_align_main_axis.setObjectName(_fromUtf8("button_align_main_axis")) + self.horizontalLayout_2.addWidget(self.button_align_main_axis) + self.angle_align_main_axis = QtGui.QLineEdit(self.align_tab_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.angle_align_main_axis.sizePolicy().hasHeightForWidth()) + self.angle_align_main_axis.setSizePolicy(sizePolicy) + self.angle_align_main_axis.setMinimumSize(QtCore.QSize(40, 0)) + self.angle_align_main_axis.setMaximumSize(QtCore.QSize(50, 16777215)) + self.angle_align_main_axis.setObjectName(_fromUtf8("angle_align_main_axis")) + self.horizontalLayout_2.addWidget(self.angle_align_main_axis) + self.gridLayout_9.addLayout(self.horizontalLayout_2, 3, 0, 1, 1) self.button_joint_points = QtGui.QPushButton(self.align_tab_2) - icon74 = QtGui.QIcon() - icon74.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectJointPoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_joint_points.setIcon(icon74) + icon83 = QtGui.QIcon() + icon83.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectJointPoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_joint_points.setIcon(icon83) self.button_joint_points.setIconSize(QtCore.QSize(32, 32)) self.button_joint_points.setObjectName(_fromUtf8("button_joint_points")) - self.gridLayout_95.addWidget(self.button_joint_points, 3, 0, 1, 1) + self.gridLayout_9.addWidget(self.button_joint_points, 4, 0, 1, 1) self.button_joint_faces = QtGui.QPushButton(self.align_tab_2) - icon75 = QtGui.QIcon() - icon75.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectJointFaces.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_joint_faces.setIcon(icon75) + icon84 = QtGui.QIcon() + icon84.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectJointFaces.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_joint_faces.setIcon(icon84) self.button_joint_faces.setIconSize(QtCore.QSize(32, 32)) self.button_joint_faces.setObjectName(_fromUtf8("button_joint_faces")) - self.gridLayout_95.addWidget(self.button_joint_faces, 4, 0, 1, 1) + self.gridLayout_9.addWidget(self.button_joint_faces, 5, 0, 1, 1) + spacerItem17 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_9.addItem(spacerItem17, 6, 0, 1, 1) self.tabWidget_9.addTab(self.align_tab_2, _fromUtf8("")) self.cut_tab_2 = QtGui.QWidget() self.cut_tab_2.setObjectName(_fromUtf8("cut_tab_2")) @@ -1839,8 +1953,8 @@ class Ui_Form(object): self.button_cut_reset.setMaximumSize(QtCore.QSize(60, 16777215)) self.button_cut_reset.setObjectName(_fromUtf8("button_cut_reset")) self.horizontalLayout_80.addWidget(self.button_cut_reset) - spacerItem16 = QtGui.QSpacerItem(18, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_80.addItem(spacerItem16) + spacerItem18 = QtGui.QSpacerItem(18, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_80.addItem(spacerItem18) self.button_cut_apply = QtGui.QPushButton(self.groupBox_20) self.button_cut_apply.setEnabled(False) self.button_cut_apply.setMaximumSize(QtCore.QSize(50, 16777215)) @@ -1851,8 +1965,8 @@ class Ui_Form(object): self.gridLayout_98.addLayout(self.gridLayout_100, 1, 0, 1, 1) self.gridLayout_97.addWidget(self.groupBox_20, 0, 0, 1, 1) self.gridLayout_96.addWidget(self.frame_10, 0, 0, 1, 1) - spacerItem17 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_96.addItem(spacerItem17, 1, 0, 1, 1) + spacerItem19 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_96.addItem(spacerItem19, 1, 0, 1, 1) self.tabWidget_9.addTab(self.cut_tab_2, _fromUtf8("")) self.rotate_tab_2 = QtGui.QWidget() self.rotate_tab_2.setObjectName(_fromUtf8("rotate_tab_2")) @@ -1896,9 +2010,9 @@ class Ui_Form(object): self.ObjRot_button_select_axis.setMaximumSize(QtCore.QSize(80, 16777215)) self.ObjRot_button_select_axis.setObjectName(_fromUtf8("ObjRot_button_select_axis")) self.gridLayout_105.addWidget(self.ObjRot_button_select_axis, 1, 0, 1, 1) - icon76 = QtGui.QIcon() - icon76.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_rotationAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_10.addTab(self.tab_18, icon76, _fromUtf8("")) + icon85 = QtGui.QIcon() + icon85.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_rotationAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_10.addTab(self.tab_18, icon85, _fromUtf8("")) self.tab_19 = QtGui.QWidget() self.tab_19.setObjectName(_fromUtf8("tab_19")) self.gridLayout_106 = QtGui.QGridLayout(self.tab_19) @@ -1925,9 +2039,9 @@ class Ui_Form(object): self.ObjRot_button_select_center.setMaximumSize(QtCore.QSize(80, 16777215)) self.ObjRot_button_select_center.setObjectName(_fromUtf8("ObjRot_button_select_center")) self.gridLayout_106.addWidget(self.ObjRot_button_select_center, 1, 0, 1, 1) - icon77 = QtGui.QIcon() - icon77.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_rotationPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_10.addTab(self.tab_19, icon77, _fromUtf8("")) + icon86 = QtGui.QIcon() + icon86.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_rotationPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_10.addTab(self.tab_19, icon86, _fromUtf8("")) self.gridLayout_104.addWidget(self.tabWidget_10, 1, 0, 1, 1) self.groupBox_21 = QtGui.QGroupBox(self.frame_11) self.groupBox_21.setMinimumSize(QtCore.QSize(150, 67)) @@ -1963,9 +2077,9 @@ class Ui_Form(object): self.ObjRot_button_select_angle.setMaximumSize(QtCore.QSize(80, 16777215)) self.ObjRot_button_select_angle.setObjectName(_fromUtf8("ObjRot_button_select_angle")) self.gridLayout_109.addWidget(self.ObjRot_button_select_angle, 0, 0, 1, 1) - icon78 = QtGui.QIcon() - icon78.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_click.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_11.addTab(self.tab_21, icon78, _fromUtf8("")) + icon87 = QtGui.QIcon() + icon87.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_click.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_11.addTab(self.tab_21, icon87, _fromUtf8("")) self.gridLayout_107.addWidget(self.tabWidget_11, 0, 0, 1, 1) self.horizontalLayout_81 = QtGui.QHBoxLayout() self.horizontalLayout_81.setObjectName(_fromUtf8("horizontalLayout_81")) @@ -1993,8 +2107,8 @@ class Ui_Form(object): self.ObjRot_button_reset.setMaximumSize(QtCore.QSize(60, 16777215)) self.ObjRot_button_reset.setObjectName(_fromUtf8("ObjRot_button_reset")) self.horizontalLayout_82.addWidget(self.ObjRot_button_reset) - spacerItem18 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_82.addItem(spacerItem18) + spacerItem20 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_82.addItem(spacerItem20) self.ObjRot_button_apply = QtGui.QPushButton(self.frame_11) self.ObjRot_button_apply.setMinimumSize(QtCore.QSize(40, 0)) self.ObjRot_button_apply.setMaximumSize(QtCore.QSize(60, 16777215)) @@ -2002,8 +2116,8 @@ class Ui_Form(object): self.horizontalLayout_82.addWidget(self.ObjRot_button_apply) self.gridLayout_104.addLayout(self.horizontalLayout_82, 3, 0, 1, 1) self.gridLayout_103.addWidget(self.frame_11, 0, 0, 1, 1) - spacerItem19 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_103.addItem(spacerItem19, 1, 0, 1, 1) + spacerItem21 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_103.addItem(spacerItem21, 1, 0, 1, 1) self.tabWidget_9.addTab(self.rotate_tab_2, _fromUtf8("")) self.translate_tab_2 = QtGui.QWidget() self.translate_tab_2.setObjectName(_fromUtf8("translate_tab_2")) @@ -2114,9 +2228,9 @@ class Ui_Form(object): self.gridLayout_114.addLayout(self.gridLayout_117, 2, 0, 1, 1) self.gridLayout_113.addLayout(self.gridLayout_114, 2, 0, 1, 1) self.gridLayout_112.addWidget(self.groupBox_22, 0, 0, 1, 1) - icon79 = QtGui.QIcon() - icon79.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_startPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_12.addTab(self.tab_22, icon79, _fromUtf8("")) + icon88 = QtGui.QIcon() + icon88.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_startPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_12.addTab(self.tab_22, icon88, _fromUtf8("")) self.tab_23 = QtGui.QWidget() self.tab_23.setObjectName(_fromUtf8("tab_23")) self.gridLayout_118 = QtGui.QGridLayout(self.tab_23) @@ -2191,9 +2305,9 @@ class Ui_Form(object): self.gridLayout_120.addLayout(self.gridLayout_123, 0, 0, 1, 1) self.gridLayout_119.addLayout(self.gridLayout_120, 2, 0, 1, 1) self.gridLayout_118.addWidget(self.groupBox_23, 0, 0, 1, 1) - icon80 = QtGui.QIcon() - icon80.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_endPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_12.addTab(self.tab_23, icon80, _fromUtf8("")) + icon89 = QtGui.QIcon() + icon89.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_endPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_12.addTab(self.tab_23, icon89, _fromUtf8("")) self.gridLayout_111.addWidget(self.tabWidget_12, 2, 0, 1, 1) self.horizontalLayout_84 = QtGui.QHBoxLayout() self.horizontalLayout_84.setObjectName(_fromUtf8("horizontalLayout_84")) @@ -2202,8 +2316,8 @@ class Ui_Form(object): self.ObjTrans_button_reset.setMaximumSize(QtCore.QSize(60, 16777215)) self.ObjTrans_button_reset.setObjectName(_fromUtf8("ObjTrans_button_reset")) self.horizontalLayout_84.addWidget(self.ObjTrans_button_reset) - spacerItem20 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_84.addItem(spacerItem20) + spacerItem22 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_84.addItem(spacerItem22) self.ObjTrans_button_apply = QtGui.QPushButton(self.frame_12) self.ObjTrans_button_apply.setMinimumSize(QtCore.QSize(40, 0)) self.ObjTrans_button_apply.setMaximumSize(QtCore.QSize(60, 16777215)) @@ -2211,8 +2325,8 @@ class Ui_Form(object): self.horizontalLayout_84.addWidget(self.ObjTrans_button_apply) self.gridLayout_111.addLayout(self.horizontalLayout_84, 3, 0, 1, 1) self.gridLayout_110.addWidget(self.frame_12, 0, 0, 1, 1) - spacerItem21 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_110.addItem(spacerItem21, 1, 0, 1, 1) + spacerItem23 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_110.addItem(spacerItem23, 1, 0, 1, 1) self.tabWidget_9.addTab(self.translate_tab_2, _fromUtf8("")) self.gridLayout_94.addWidget(self.tabWidget_9, 0, 0, 1, 1) self.tabWidget_7.addTab(self.Modif_Tab_2, _fromUtf8("")) @@ -2227,103 +2341,103 @@ class Ui_Form(object): sizePolicy.setHeightForWidth(self.button_alignview.sizePolicy().hasHeightForWidth()) self.button_alignview.setSizePolicy(sizePolicy) self.button_alignview.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon81 = QtGui.QIcon() - icon81.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_viewAlign.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_alignview.setIcon(icon81) + icon90 = QtGui.QIcon() + icon90.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_viewAlign.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_alignview.setIcon(icon90) self.button_alignview.setIconSize(QtCore.QSize(32, 32)) self.button_alignview.setObjectName(_fromUtf8("button_alignview")) self.gridLayout_124.addWidget(self.button_alignview, 0, 0, 1, 1) - spacerItem22 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_124.addItem(spacerItem22, 2, 0, 1, 1) + spacerItem24 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_124.addItem(spacerItem24, 2, 0, 1, 1) self.button_trackcamera = QtGui.QPushButton(self.View_Tab_2) - icon82 = QtGui.QIcon() - icon82.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_trackCamera.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_trackcamera.setIcon(icon82) + icon91 = QtGui.QIcon() + icon91.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_trackCamera.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_trackcamera.setIcon(icon91) self.button_trackcamera.setIconSize(QtCore.QSize(32, 32)) self.button_trackcamera.setObjectName(_fromUtf8("button_trackcamera")) self.gridLayout_124.addWidget(self.button_trackcamera, 1, 0, 1, 1) - icon83 = QtGui.QIcon() - icon83.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_view.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.View_Tab_2, icon83, _fromUtf8("")) + icon92 = QtGui.QIcon() + icon92.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_view.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.View_Tab_2, icon92, _fromUtf8("")) self.tab_24 = QtGui.QWidget() self.tab_24.setObjectName(_fromUtf8("tab_24")) self.gridLayout_125 = QtGui.QGridLayout(self.tab_24) self.gridLayout_125.setObjectName(_fromUtf8("gridLayout_125")) self.button_isView = QtGui.QPushButton(self.tab_24) - icon84 = QtGui.QIcon() - icon84.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FCCamera_02.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isView.setIcon(icon84) + icon93 = QtGui.QIcon() + icon93.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FCCamera_02.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isView.setIcon(icon93) self.button_isView.setIconSize(QtCore.QSize(32, 32)) self.button_isView.setObjectName(_fromUtf8("button_isView")) self.gridLayout_125.addWidget(self.button_isView, 9, 0, 1, 1) - spacerItem23 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_125.addItem(spacerItem23, 10, 0, 1, 1) + spacerItem25 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_125.addItem(spacerItem25, 10, 0, 1, 1) self.button_isParallel = QtGui.QPushButton(self.tab_24) - icon85 = QtGui.QIcon() - icon85.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isParallel.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isParallel.setIcon(icon85) + icon94 = QtGui.QIcon() + icon94.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isParallel.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isParallel.setIcon(icon94) self.button_isParallel.setIconSize(QtCore.QSize(32, 32)) self.button_isParallel.setObjectName(_fromUtf8("button_isParallel")) self.gridLayout_125.addWidget(self.button_isParallel, 0, 0, 1, 1) self.button_isAngle = QtGui.QPushButton(self.tab_24) - icon86 = QtGui.QIcon() - icon86.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_angleBetween.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isAngle.setIcon(icon86) + icon95 = QtGui.QIcon() + icon95.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_angleBetween.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isAngle.setIcon(icon95) self.button_isAngle.setIconSize(QtCore.QSize(32, 32)) self.button_isAngle.setObjectName(_fromUtf8("button_isAngle")) self.gridLayout_125.addWidget(self.button_isAngle, 4, 0, 1, 1) self.button_isLength = QtGui.QPushButton(self.tab_24) - icon87 = QtGui.QIcon() - icon87.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isLength.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isLength.setIcon(icon87) + icon96 = QtGui.QIcon() + icon96.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isLength.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isLength.setIcon(icon96) self.button_isLength.setIconSize(QtCore.QSize(32, 32)) self.button_isLength.setObjectName(_fromUtf8("button_isLength")) self.gridLayout_125.addWidget(self.button_isLength, 6, 0, 1, 1) self.button_isDistance = QtGui.QPushButton(self.tab_24) - icon88 = QtGui.QIcon() - icon88.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distanceBetween.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isDistance.setIcon(icon88) + icon97 = QtGui.QIcon() + icon97.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distanceBetween.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isDistance.setIcon(icon97) self.button_isDistance.setIconSize(QtCore.QSize(32, 32)) self.button_isDistance.setObjectName(_fromUtf8("button_isDistance")) self.gridLayout_125.addWidget(self.button_isDistance, 5, 0, 1, 1) self.button_isCoplanar = QtGui.QPushButton(self.tab_24) - icon89 = QtGui.QIcon() - icon89.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isCoplanar.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isCoplanar.setIcon(icon89) + icon98 = QtGui.QIcon() + icon98.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isCoplanar.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isCoplanar.setIcon(icon98) self.button_isCoplanar.setIconSize(QtCore.QSize(32, 32)) self.button_isCoplanar.setObjectName(_fromUtf8("button_isCoplanar")) self.gridLayout_125.addWidget(self.button_isCoplanar, 2, 0, 1, 1) self.button_isArea = QtGui.QPushButton(self.tab_24) - icon90 = QtGui.QIcon() - icon90.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isArea.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isArea.setIcon(icon90) + icon99 = QtGui.QIcon() + icon99.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isArea.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isArea.setIcon(icon99) self.button_isArea.setIconSize(QtCore.QSize(32, 32)) self.button_isArea.setObjectName(_fromUtf8("button_isArea")) self.gridLayout_125.addWidget(self.button_isArea, 7, 0, 1, 1) self.button_isPerpendicular = QtGui.QPushButton(self.tab_24) - icon91 = QtGui.QIcon() - icon91.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isPerpendicular.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isPerpendicular.setIcon(icon91) + icon100 = QtGui.QIcon() + icon100.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isPerpendicular.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isPerpendicular.setIcon(icon100) self.button_isPerpendicular.setIconSize(QtCore.QSize(32, 32)) self.button_isPerpendicular.setObjectName(_fromUtf8("button_isPerpendicular")) self.gridLayout_125.addWidget(self.button_isPerpendicular, 1, 0, 1, 1) self.button_isClearance = QtGui.QPushButton(self.tab_24) - icon92 = QtGui.QIcon() - icon92.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isClearance.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isClearance.setIcon(icon92) + icon101 = QtGui.QIcon() + icon101.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isClearance.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isClearance.setIcon(icon101) self.button_isClearance.setIconSize(QtCore.QSize(32, 32)) self.button_isClearance.setObjectName(_fromUtf8("button_isClearance")) self.gridLayout_125.addWidget(self.button_isClearance, 3, 0, 1, 1) self.button_isRadius = QtGui.QPushButton(self.tab_24) - icon93 = QtGui.QIcon() - icon93.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isRadius.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isRadius.setIcon(icon93) + icon102 = QtGui.QIcon() + icon102.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isRadius.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isRadius.setIcon(icon102) self.button_isRadius.setIconSize(QtCore.QSize(32, 32)) self.button_isRadius.setObjectName(_fromUtf8("button_isRadius")) self.gridLayout_125.addWidget(self.button_isRadius, 8, 0, 1, 1) - icon94 = QtGui.QIcon() - icon94.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_check.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.tab_24, icon94, _fromUtf8("")) + icon103 = QtGui.QIcon() + icon103.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_check.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.tab_24, icon103, _fromUtf8("")) self.gridLayout_128.addWidget(self.tabWidget_7, 0, 0, 1, 1) self.scrollArea.setWidget(self.scrollAreaWidgetContents) self.gridLayout_34.addWidget(self.scrollArea, 0, 0, 1, 1) @@ -2332,17 +2446,20 @@ class Ui_Form(object): self.button_WF_quit = QtGui.QPushButton(Form) self.button_WF_quit.setObjectName(_fromUtf8("button_WF_quit")) self.horizontalLayout_43.addWidget(self.button_WF_quit) - spacerItem24 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_43.addItem(spacerItem24) + spacerItem26 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_43.addItem(spacerItem26) self.label_release = QtGui.QLabel(Form) self.label_release.setObjectName(_fromUtf8("label_release")) self.horizontalLayout_43.addWidget(self.label_release) self.gridLayout_34.addLayout(self.horizontalLayout_43, 1, 0, 1, 1) self.retranslateUi(Form) - self.tabWidget_7.setCurrentIndex(7) + self.tabWidget_7.setCurrentIndex(0) + self.tabWidget.setCurrentIndex(2) + self.tabWidget_2.setCurrentIndex(2) self.point_loc_comboBox.setCurrentIndex(1) self.tabWidget_8.setCurrentIndex(0) + self.tabWidget_3.setCurrentIndex(1) self.transition_comboBox.setCurrentIndex(2) self.tabWidget_9.setCurrentIndex(0) self.tabWidget_10.setCurrentIndex(0) @@ -2390,29 +2507,6 @@ class Ui_Form(object): " are Coplanar?", None)) self.tolerance_edit.setText(_translate("Form", "1e-10", None)) self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Origin_Tab_2), _translate("Form", "Ori. Pref.", None)) - self.button_circle_center.setToolTip(_translate("Form", "Create a Point at center location of each selected Circle(s) or Arc(s).", None)) - self.button_circle_center.setText(_translate("Form", "Circle(s) Center", None)) - self.button_point_line_point.setToolTip(_translate("Form", "Point(s)=(Point(s),Line(s)):\n" -"Create projection(s) of Point(s) onto Line(s).\n" -"- First select one (or several) Point(s)\n" -"- Second select one or several) Line(s)\n" -"- Then push this button\n" -"\n" -"Plot the intersection point T on a Line given one Line and One Point C.\n" -"The Vector TC is perpendicular to the Line.\n" -"The symetric point Cprime is also created as TC=TCprime.", None)) - self.button_point_line_point.setText(_translate("Form", "Point(s)=(Pt(s),Line(s)) ", None)) - self.button_face_center.setToolTip(_translate("Form", "Create a Point at center location of each selected Face(s).", None)) - self.button_face_center.setText(_translate("Form", "Face(s) Center", None)) - self.button_line_center.setToolTip(_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)) - self.button_line_center.setText(_translate("Form", "Line(s) Center", None)) - self.spin_line_center.setToolTip(_translate("Form", "The number indicates in how many parts each selected Lines(s) will be cut (Max 100).", None)) - self.button_Npoints_center.setToolTip(_translate("Form", "Create a Point at mean location of all selected points.", None)) - self.button_Npoints_center.setText(_translate("Form", "Points Center", None)) - self.button_line_face_point.setToolTip(_translate("Form", "Create a point at the intersection of the Line and Plane selected.", None)) - self.button_line_face_point.setText(_translate("Form", "Point=(Line,Face) ", None)) self.button_object_center.setToolTip(_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" @@ -2428,8 +2522,24 @@ class Ui_Form(object): " This bounding box alway exists (especially for draft objects).\n" " Be aware this point is not necessary the center of Mass of all Objects!", None)) self.checkBox_object_center.setText(_translate("Form", "BBox", None)) + self.button_Npoints_center.setToolTip(_translate("Form", "Point=(N Points):\n" +"Create a Point at mean location of all selected points.\n" +"- First select several Points\n" +"- Then push this button", None)) + self.button_Npoints_center.setText(_translate("Form", "Points Center", None)) + self.button_line_center.setToolTip(_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)) + self.button_line_center.setText(_translate("Form", "Line(s) Center", None)) + self.spin_line_center.setToolTip(_translate("Form", "The number indicates in how many parts each selected Lines(s) will be cut (Max 100).", None)) self.button_line_extrema.setToolTip(_translate("Form", "Create Points at start and end location of each selected Line(s).", None)) self.button_line_extrema.setText(_translate("Form", "Line(s) Extrema", None)) + self.button_circle_center.setToolTip(_translate("Form", "Create a Point at center location of each selected Circle(s) or Arc(s).", None)) + self.button_circle_center.setText(_translate("Form", "Circle(s) Center", None)) + self.button_face_center.setToolTip(_translate("Form", "Create a Point at center location of each selected Face(s).", None)) + self.button_face_center.setText(_translate("Form", "Face(s) Center", None)) + self.button_line_face_point.setToolTip(_translate("Form", "Create a point at the intersection of the Line and Plane selected.", None)) + self.button_line_face_point.setText(_translate("Form", "Point=(Line,Face) ", None)) self.button_point_face_point.setToolTip(_translate("Form", "Point(s)=(Point(s),Face(s)):\n" "Create projection(s) of Point(s) onto Face(s).\n" "- First select one (or several) Point(s)\n" @@ -2439,8 +2549,18 @@ class Ui_Form(object): "Plot the intersection point T on a Plane given one Plane and One Point C.\n" "The Vector TC is perpendicular to the plane.", None)) self.button_point_face_point.setText(_translate("Form", "Point(s)=(Pt(s),Face(s))", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Point_Tab1_2), _translate("Form", "Point 1/2", None)) - self.tabWidget_7.setTabToolTip(self.tabWidget_7.indexOf(self.Point_Tab1_2), _translate("Form", "Point", None)) + self.button_point_line_point.setToolTip(_translate("Form", "Point(s)=(Point(s),Line(s)):\n" +"Create projection(s) of Point(s) onto Line(s).\n" +"- First select one (or several) Point(s)\n" +"- Second select one or several) Line(s)\n" +"- Then push this button\n" +"\n" +"Plot the intersection point T on a Line given one Line and One Point C.\n" +"The Vector TC is perpendicular to the Line.\n" +"The symetric point Cprime is also created as TC=TCprime.", None)) + self.button_point_line_point.setText(_translate("Form", "Point(s)=(Pt(s),Line(s)) ", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.Point_Tab1_3), _translate("Form", "Point 1/3", None)) + self.tabWidget.setTabToolTip(self.tabWidget.indexOf(self.Point_Tab1_3), _translate("Form", "Create Point(s)", None)) self.button_twolines_point.setToolTip(_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)) self.button_twolines_point.setText(_translate("Form", "Point=(Line,Line) ", None)) @@ -2480,33 +2600,90 @@ class Ui_Form(object): self.button_click_for_point.setToolTip(_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" +"\n" +"Use left mouse button (MB1) to generate Points. \n" +"MB2 and MB3 can still be used for view zoom and view rotation.\n" "", None)) self.button_click_for_point.setText(_translate("Form", "Click", None)) self.button_object_base_point.setToolTip(_translate("Form", "Create Base Point of all selected Object(s).", None)) self.button_object_base_point.setText(_translate("Form", "Object(s) Base Point", None)) + self.button_object_center_mass_point.setToolTip(_translate("Form", "Create Center of Mass Point of all selected Object(s).", None)) + self.button_object_center_mass_point.setText(_translate("Form", "Object(s) Mass Center Point", None)) + self.button_object_Npoint.setToolTip(_translate("Form", "Create a set of points from selected Objetcs:\n" +"- Select object(s)\n" +" to create points from these object(s) !\n" +" If you select an Edge : 2 points will be created;\n" +" if you select a Plane : 4 points will be created;\n" +" if you select an Object : many points will be created.\n" +"- Then click on this button.", None)) + self.button_object_Npoint.setText(_translate("Form", "Object(s) N Point(s)", None)) self.button_point_to_sketch.setToolTip(_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)) self.button_point_to_sketch.setText(_translate("Form", "Point(s) to Sketch", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Point_Tab2_2), _translate("Form", "Point 2/2", None)) - self.button_object_axis.setToolTip(_translate("Form", "Create 3 Axes at center location of all selected Object(s).", None)) - self.button_object_axis.setText(_translate("Form", "Object(s) X, Y, Z Axes", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.Point_Tab2_3), _translate("Form", "Point 2/3", None)) + self.tabWidget.setTabToolTip(self.tabWidget.indexOf(self.Point_Tab2_3), _translate("Form", "Create Point(s)", None)) + self.button_points_load.setToolTip(_translate("Form", "Load a set of points from an ASCII file:\n" +" ASCII format is 3 values by line seperated by blank as : \n" +" 15.3f 15.3f 15.3f\n" +" Values are read as float.\n" +" \n" +" Lines starting with characeter : # or / are considered as comment lines\n" +" ", None)) + self.button_points_load.setText(_translate("Form", "Load Points", None)) + self.button_points_save.setToolTip(_translate("Form", "Save a point or a set of points into an ASCII file:\n" +"One (x, y, z) triplet per line seperated by blank.\n" +"\n" +"- Select as much as Points as needed and/or select object(s)\n" +" to save points from these object(s) !\n" +" If you select an Edge : 2 points will be saved;\n" +" if you select a Plane : 4 points will be saved;\n" +" if you select an Object : many points will be saved.\n" +"- Then click on this button.", None)) + self.button_points_save.setText(_translate("Form", "Save Points", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.Point_Tab3_3), _translate("Form", "Point 3/3", None)) + self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Point_Tab), _translate("Form", "Point", None)) + self.tabWidget_7.setTabToolTip(self.tabWidget_7.indexOf(self.Point_Tab), _translate("Form", "Create Point(s)", None)) self.button_twopoints_axis.setToolTip(_translate("Form", "Create an Axis crossing 2 Points.", None)) self.button_twopoints_axis.setText(_translate("Form", "Two Points Axis", None)) self.extension_twopoints_axis.setToolTip(_translate("Form", "Distance for the extensions on extrema.\n" "Positive values will enlarge the Axis.\n" "Negative values will start to shrink it (then reverse when middle reached). ", None)) self.extension_twopoints_axis.setText(_translate("Form", "0.0", None)) - self.button_Npoints_axis.setToolTip(_translate("Form", "Axis=(Points):\n" -"Create a \"best fit\" line from a set of points using Singular Value Decomposition..\n" -"- First select several Points\n" + self.button_object_axis.setToolTip(_translate("Form", "Create 3 Axes at center location of all selected Object(s).", None)) + self.button_object_axis.setText(_translate("Form", "Object(s) X, Y, Z Axes", None)) + self.button_line_point_axis.setToolTip(_translate("Form", "Create an Axis Perpendicular to an Axis and crossing a Point\n" +"-Select one Axis and one (or several) Point(s) NOT on the previous Axis.", None)) + self.button_line_point_axis.setText(_translate("Form", "Axis=(Axis,Point)", None)) + self.extension_line_point_axis.setToolTip(_translate("Form", "Distance for the extensions on extrema.\n" +"Positive values will enlarge the Axis.\n" +"Negative values will start to shrink it (then reverse when middle reached). ", None)) + self.extension_line_point_axis.setText(_translate("Form", "0.0", None)) + self.button_Npoints_axis.setToolTip(_translate("Form", "Axis=(N Points):\n" +"Create a \"best fit\" Line from a set of points using Singular Value Decomposition.\n" +"- First select several Points (at least 2);\n" "- Then push this button\n" "\n" "The 3 eigenvectors are generated.\n" "Orange one is the best fit line.\n" "", None)) self.button_Npoints_axis.setText(_translate("Form", "Axis from Point(s)", None)) + self.button_point_line_axis.setToolTip(_translate("Form", "Create an Axis Parallel to an Axis (as Direction) and crossing a Point.\n" +"- Select one Axis and one (or several) Point(s) NOT on the previous Axis.\n" +"Define the length and the attach point if needed.\n" +"A Length of Zero means the length of already selected Axis will be used.", None)) + self.button_point_line_axis.setText(_translate("Form", "Axis=(Pt,Dir)", None)) + self.extension_line.setToolTip(_translate("Form", "Define the length of the Axis to create.\n" +"A Length of Zero means the length of already selected Axis will be used.", None)) + self.extension_line.setText(_translate("Form", "0.0", None)) + self.point_loc_comboBox.setToolTip(_translate("Form", "The Attach Point will be at :\n" +"Start of the Axis;\n" +"Mid of the Axis;\n" +"End of the Axis.", None)) + self.point_loc_comboBox.setItemText(0, _translate("Form", "Start", None)) + self.point_loc_comboBox.setItemText(1, _translate("Form", "Mid", None)) + self.point_loc_comboBox.setItemText(2, _translate("Form", "End", None)) self.button_cylinder_axis.setToolTip(_translate("Form", "Create the Axis of a Cylinder.", None)) self.button_cylinder_axis.setText(_translate("Form", "Cylinder(s) Axis", None)) self.button_plane_axis.setToolTip(_translate("Form", "Plane(s) Axes:\n" @@ -2543,35 +2720,13 @@ class Ui_Form(object): " Positive values will enlarge the Axis toward OUTSIDE of the Face Object;\n" " Negative values will enlarge the Axis toward INSIDE of the Face Object.", None)) self.extension_face_normal.setText(_translate("Form", "0.0", None)) - self.button_point_line_axis.setToolTip(_translate("Form", "Create an Axis Parallel to an Axis (as Direction) and crossing a Point.\n" -"- Select one Axis and one (or several) Point(s) NOT on the previous Axis.\n" -"Define the length and the attach point if needed.\n" -"A Length of Zero means the length of already selected Axis will be used.", None)) - self.button_point_line_axis.setText(_translate("Form", "Axis=(Pt,Dir)", None)) - self.extension_line.setToolTip(_translate("Form", "Define the length of the Axis to create.\n" -"A Length of Zero means the length of already selected Axis will be used.", None)) - self.extension_line.setText(_translate("Form", "0.0", None)) - self.point_loc_comboBox.setToolTip(_translate("Form", "The Attach Point will be at :\n" -"Start of the Axis;\n" -"Mid of the Axis;\n" -"End of the Axis.", None)) - self.point_loc_comboBox.setItemText(0, _translate("Form", "Start", None)) - self.point_loc_comboBox.setItemText(1, _translate("Form", "Mid", None)) - self.point_loc_comboBox.setItemText(2, _translate("Form", "End", None)) - self.button_line_point_axis.setToolTip(_translate("Form", "Create an Axis Perpendicular to an Axis and crossing a Point\n" -"-Select one Axis and one (or several) Point(s) NOT on the previous Axis.", None)) - self.button_line_point_axis.setText(_translate("Form", "Axis=(Axis,Point)", None)) - self.extension_line_point_axis.setToolTip(_translate("Form", "Distance for the extensions on extrema.\n" -"Positive values will enlarge the Axis.\n" -"Negative values will start to shrink it (then reverse when middle reached). ", None)) - self.extension_line_point_axis.setText(_translate("Form", "0.0", None)) self.button_twolines_axis.setToolTip(_translate("Form", "Create an Axis between two Axes.\n" "-Select two Axes.", None)) self.button_twolines_axis.setText(_translate("Form", "Axis=(Line,Line)", None)) + self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.Axis_Tab1_3), _translate("Form", "Axis 1/3", None)) self.button_plane_point_line_axis.setToolTip(_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)) self.button_plane_point_line_axis.setText(_translate("Form", "Axis=(Plane,Point,Axis)", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Axis_Tab1_2), _translate("Form", "Axis 1/2", None)) self.button_line_plane_axis.setToolTip(_translate("Form", "Axes=(Pl(s),Axes):\n" "Create projection(s) of Axes onto Plane(s).\n" "- First select one (or several) Line(s)\n" @@ -2667,95 +2822,38 @@ class Ui_Form(object): self.extension_axis.setText(_translate("Form", "50.0", None)) self.button_click_for_axis.setToolTip(_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)) +"- 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.\n" +"\n" +"\n" +"Use left mouse button (MB1) to generate Lines. \n" +"MB2 and MB3 can still be used for view zoom and view rotation.", None)) self.button_click_for_axis.setText(_translate("Form", "Click", None)) + self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.Axis_Tab2_3), _translate("Form", "Axis 2/3", None)) self.button_object_base_axes.setToolTip(_translate("Form", "Create 3 Axes at Base location of all selected Object(s).", None)) self.button_object_base_axes.setText(_translate("Form", "Object(s) Base Axes", None)) + self.button_object_Naxes.setToolTip(_translate("Form", "Create a set of axes from selected Objetcs:\n" +"- Select object(s)\n" +" to create axes from these object(s) !\n" +" if you select a Plane : 4 axes will be created;\n" +" if you select an Object : many axes will be created.\n" +"- Then click on this button.", None)) + self.button_object_Naxes.setText(_translate("Form", "Object(s) N Axes(s)", None)) + self.button_object_3axes.setToolTip(_translate("Form", "Create a set of 2 or 3 main axes from selected Objetcs:\n" +"The most representative axes will be selected from all axis.\n" +"The length of main axes will be the cumulative length of all axes with the same direction.\n" +"- Select object(s)\n" +" to create axes from these object(s) !\n" +" if you select a Plane : 2 axes will be created;\n" +" if you select an Object : 3 axes will be created.\n" +"- Then click on this button.", None)) + self.button_object_3axes.setText(_translate("Form", "Object(s) 3 Axes(s)", None)) self.button_line_to_sketch.setToolTip(_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)) self.button_line_to_sketch.setText(_translate("Form", "Axis(es) to Sketch", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Axis_Tab2_2), _translate("Form", "Axis 2/2", None)) - self.lineEdit.setText(_translate("Form", "Examples from http://www.mathcurve.com/", None)) - self.groupBox_14.setTitle(_translate("Form", "Equation :", None)) - self.label_y_3.setText(_translate("Form", "Y (a,b,t) ", None)) - self.ParCurve_a_2.setText(_translate("Form", "10 # Radius", None)) - self.label_b_3.setText(_translate("Form", "b (a, t) ", None)) - self.ParCurve_y_2.setText(_translate("Form", "b*sin(t)", None)) - self.checkBox_polar_2.setToolTip(_translate("Form", "Toggle for Polar coordinates:\n" -"then x is interpreted as radius\n" -" and y is interpreted as angle teta.", None)) - self.checkBox_polar_2.setText(_translate("Form", " Polar coord.", None)) - self.label_x_3.setText(_translate("Form", "X (a,b,t) ", None)) - self.ParCurve_x_2.setText(_translate("Form", "a*cos(t)", None)) - self.label_a_3.setText(_translate("Form", "a (t) ", None)) - self.ParCurve_b_2.setText(_translate("Form", "a", None)) - self.ParCurve_comboBox_2.setToolTip(_translate("Form", "Choose another curve from the list.", None)) - self.ParCurve_button_edit_2.setToolTip(_translate("Form", "Click to access to a table where you can edit all parameters of all curves and \n" -"save your custom curves.", None)) - self.ParCurve_button_edit_2.setText(_translate("Form", "Edit", None)) - self.checkBox_close_2.setText(_translate("Form", "Closed curve", None)) - self.checkBox_face_2.setText(_translate("Form", "Create Face", None)) - self.label_name_2.setText(_translate("Form", "Name", None)) - self.ParCurve_name_2.setText(_translate("Form", "Circle", None)) - self.groupBox_15.setTitle(_translate("Form", "Parameters", None)) - self.label_tmin_3.setText(_translate("Form", "t min", None)) - self.ParCurve_tmin_2.setText(_translate("Form", "0", None)) - self.label_tmax_3.setText(_translate("Form", "t max", None)) - self.ParCurve_tmax_2.setText(_translate("Form", "2*pi", None)) - self.label_tstep_3.setText(_translate("Form", "step", None)) - self.ParCurve_tstep_2.setText(_translate("Form", "0.01", None)) - self.groupBox_16.setTitle(_translate("Form", "Type of 2D Curve", None)) - self.checkBox_points_2.setText(_translate("Form", "Points", None)) - self.checkBox_polyline_2.setText(_translate("Form", "Polyline", None)) - self.checkBox_bspline_2.setText(_translate("Form", "Bspline", None)) - self.checkBox_bezier_2.setText(_translate("Form", "Bezier", None)) - self.ParCurve_button_store_2.setToolTip(_translate("Form", "Click to store the current edited curve into the table.\n" -"To save your curve you need to go to \"Edit\".", None)) - self.ParCurve_button_store_2.setText(_translate("Form", "Store", None)) - self.ParCurve_button_apply_2.setToolTip(_translate("Form", "Click to visualize the curve.", None)) - self.ParCurve_button_apply_2.setText(_translate("Form", "Apply", None)) - self.tabWidget_8.setTabText(self.tabWidget_8.indexOf(self.tab_14), _translate("Form", "Parametric 2D", None)) - self.ParCurve_comboBox_3.setToolTip(_translate("Form", "Choose another curve from the list.", None)) - self.ParCurve_button_edit_3.setToolTip(_translate("Form", "Click to access to a table where you can edit all parameters of all curves and \n" -"save your custom curves.", None)) - self.ParCurve_button_edit_3.setText(_translate("Form", "Edit", None)) - self.label_name_3.setText(_translate("Form", "Name", None)) - self.ParCurve_name_3.setText(_translate("Form", "Cylindrical helix", None)) - self.groupBox_17.setTitle(_translate("Form", "Equation :", None)) - self.label_a_4.setText(_translate("Form", "a (t) ", None)) - self.ParCurve_a_3.setText(_translate("Form", "10*0.05 #Vert. step", None)) - self.label_b_4.setText(_translate("Form", "b (a, t) ", None)) - self.ParCurve_b_3.setText(_translate("Form", "1", None)) - self.label_c_2.setText(_translate("Form", "c (a, b, t) ", None)) - self.ParCurve_c_3.setText(_translate("Form", "10 # Radius", None)) - self.label_x_4.setText(_translate("Form", "X (a,b,c,t) ", None)) - self.ParCurve_x_3.setText(_translate("Form", "c*sin(t)", None)) - self.label_y_4.setText(_translate("Form", "Y (a,b,c,t) ", None)) - self.label_z_2.setText(_translate("Form", "Z (a,b,c,t) ", None)) - self.ParCurve_z_3.setText(_translate("Form", "a*t", None)) - self.ParCurve_y_3.setText(_translate("Form", "c*cos(t)", None)) - self.groupBox_18.setTitle(_translate("Form", "Parameters", None)) - self.label_tmin_4.setText(_translate("Form", "t min", None)) - self.label_tmax_4.setText(_translate("Form", "t max", None)) - self.ParCurve_tmax_3.setText(_translate("Form", "5*2*pi #5 circles", None)) - self.label_tstep_4.setText(_translate("Form", "step", None)) - self.ParCurve_tstep_3.setText(_translate("Form", "0.01", None)) - self.ParCurve_tmin_3.setText(_translate("Form", "0", None)) - self.groupBox_19.setTitle(_translate("Form", "Type of 3D Curve", None)) - self.checkBox_points_3.setText(_translate("Form", "Points", None)) - self.checkBox_polyline_3.setText(_translate("Form", "Polyline", None)) - self.checkBox_bspline_3.setText(_translate("Form", "Bspline", None)) - self.checkBox_bezier_3.setText(_translate("Form", "Bezier", None)) - self.checkBox_close_3.setText(_translate("Form", "Closed curve", None)) - self.ParCurve_button_store_3.setToolTip(_translate("Form", "Click to store the current edited curve into the table.\n" -"To save your curve you need to go to \"Edit\".", None)) - self.ParCurve_button_store_3.setText(_translate("Form", "Store", None)) - self.ParCurve_button_apply_3.setToolTip(_translate("Form", "Click to visualize the curve.", None)) - self.ParCurve_button_apply_3.setText(_translate("Form", "Apply", None)) - self.tabWidget_8.setTabText(self.tabWidget_8.indexOf(self.tab_15), _translate("Form", "Parametric 3D", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Wire_Tab_2), _translate("Form", "Wire", None)) + self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.Axis_Tab31_3), _translate("Form", "Axis 3/3", None)) + self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Axis_Tab), _translate("Form", "Axis", None)) self.button_linecenter_circle.setToolTip(_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)) @@ -2786,6 +2884,196 @@ class Ui_Form(object): "Then click on this button.", None)) self.button_circle_to_sketch.setText(_translate("Form", "Circle(s) to Sketch", None)) self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.tab_16), _translate("Form", "Circle", None)) + self.lineEdit.setText(_translate("Form", "Examples from http://www.mathcurve.com/", None)) + self.groupBox_14.setTitle(_translate("Form", "Equation :", None)) + self.label_y_3.setText(_translate("Form", "Y (a,b,t) ", None)) + self.ParCurve_a_2.setText(_translate("Form", "10 # Radius", None)) + self.label_b_3.setText(_translate("Form", "b (a, t) ", None)) + self.ParCurve_y_2.setText(_translate("Form", "b*sin(t)", None)) + self.checkBox_polar_2.setToolTip(_translate("Form", "Toggle for Polar coordinates:\n" +"then x is interpreted as radius\n" +" and y is interpreted as angle teta.", None)) + self.checkBox_polar_2.setText(_translate("Form", " Polar coord.", None)) + self.label_x_3.setText(_translate("Form", "X (a,b,t) ", None)) + self.ParCurve_x_2.setText(_translate("Form", "a*cos(t)", None)) + self.label_a_3.setText(_translate("Form", "a (t) ", None)) + self.ParCurve_b_2.setText(_translate("Form", "a", None)) + self.ParCurve_comboBox_2.setToolTip(_translate("Form", "Choose another curve from the list.", None)) + self.ParCurve_button_edit_2.setToolTip(_translate("Form", "Click to access to a table where you can edit all parameters of all curves and \n" +"save your custom curves.", None)) + self.ParCurve_button_edit_2.setText(_translate("Form", "Edit", None)) + self.checkBox_close_2.setText(_translate("Form", "Closed curve", None)) + self.checkBox_face_2.setText(_translate("Form", "Create Face", None)) + self.label_name_2.setText(_translate("Form", "Name", None)) + self.ParCurve_name_2.setText(_translate("Form", "Circle", None)) + self.groupBox_15.setTitle(_translate("Form", "Parameter :", None)) + self.label_tmin_3.setText(_translate("Form", "t min", None)) + self.ParCurve_tmin_2.setText(_translate("Form", "0", None)) + self.label_tmax_3.setText(_translate("Form", "t max", None)) + self.ParCurve_tmax_2.setText(_translate("Form", "2*pi", None)) + self.label_tstep_3.setText(_translate("Form", "step", None)) + self.ParCurve_tstep_2.setText(_translate("Form", "0.01", None)) + self.groupBox_16.setTitle(_translate("Form", "Type of 2D Curve :", None)) + self.checkBox_points_2.setText(_translate("Form", "Points", None)) + self.checkBox_polyline_2.setText(_translate("Form", "Polyline", None)) + self.checkBox_bezier_2.setText(_translate("Form", "Bezier", None)) + self.checkBox_bspline_2.setText(_translate("Form", "Bspline", None)) + self.ParCurve_button_store_2.setToolTip(_translate("Form", "Click to store the current edited curve into the table.\n" +"To save your curve you need to go to \"Edit\".", None)) + self.ParCurve_button_store_2.setText(_translate("Form", "Store", None)) + self.ParCurve_button_apply_2.setToolTip(_translate("Form", "Click to visualize the curve.", None)) + self.ParCurve_button_apply_2.setText(_translate("Form", "Apply", None)) + self.tabWidget_8.setTabText(self.tabWidget_8.indexOf(self.tab_14), _translate("Form", "Parametric 2D", None)) + self.ParCurve_comboBox_3.setToolTip(_translate("Form", "Choose another curve from the list.", None)) + self.ParCurve_button_edit_3.setToolTip(_translate("Form", "Click to access to a table where you can edit all parameters of all curves and \n" +"save your custom curves.", None)) + self.ParCurve_button_edit_3.setText(_translate("Form", "Edit", None)) + self.label_name_3.setText(_translate("Form", "Name", None)) + self.ParCurve_name_3.setText(_translate("Form", "Cylindrical helix", None)) + self.groupBox_17.setTitle(_translate("Form", "Equation :", None)) + self.label_a_4.setText(_translate("Form", "a (t) ", None)) + self.ParCurve_a_3.setText(_translate("Form", "10*0.05 #Vert. step", None)) + self.label_b_4.setText(_translate("Form", "b (a, t) ", None)) + self.ParCurve_b_3.setText(_translate("Form", "1", None)) + self.label_c_2.setText(_translate("Form", "c (a, b, t) ", None)) + self.ParCurve_c_3.setText(_translate("Form", "10 # Radius", None)) + self.label_x_4.setText(_translate("Form", "X (a,b,c,t) ", None)) + self.ParCurve_x_3.setText(_translate("Form", "c*sin(t)", None)) + self.label_y_4.setText(_translate("Form", "Y (a,b,c,t) ", None)) + self.label_z_2.setText(_translate("Form", "Z (a,b,c,t) ", None)) + self.ParCurve_z_3.setText(_translate("Form", "a*t", None)) + self.ParCurve_y_3.setText(_translate("Form", "c*cos(t)", None)) + self.groupBox_18.setTitle(_translate("Form", "Parameter :", None)) + self.label_tmin_4.setText(_translate("Form", "t min", None)) + self.label_tmax_4.setText(_translate("Form", "t max", None)) + self.ParCurve_tmax_3.setText(_translate("Form", "5*2*pi #5 circles", None)) + self.label_tstep_4.setText(_translate("Form", "step", None)) + self.ParCurve_tstep_3.setText(_translate("Form", "0.01", None)) + self.ParCurve_tmin_3.setText(_translate("Form", "0", None)) + self.checkBox_close_3.setText(_translate("Form", "Closed curve", None)) + self.ParCurve_button_store_3.setToolTip(_translate("Form", "Click to store the current edited curve into the table.\n" +"To save your curve you need to go to \"Edit\".", None)) + self.ParCurve_button_store_3.setText(_translate("Form", "Store", None)) + self.ParCurve_button_apply_3.setToolTip(_translate("Form", "Click to visualize the curve.", None)) + self.ParCurve_button_apply_3.setText(_translate("Form", "Apply", None)) + self.groupBox_19.setTitle(_translate("Form", "Type of 3D Curve :", None)) + self.checkBox_points_3.setText(_translate("Form", "Points", None)) + self.checkBox_polyline_3.setText(_translate("Form", "Polyline", None)) + self.checkBox_bspline_3.setText(_translate("Form", "Bspline", None)) + self.checkBox_bezier_3.setText(_translate("Form", "Bezier", None)) + self.tabWidget_8.setTabText(self.tabWidget_8.indexOf(self.tab_15), _translate("Form", "Parametric 3D", None)) + self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Wire_Tab_2), _translate("Form", "Wire", None)) + self.button_threepoints_plane.setToolTip(_translate("Form", "Plane=(3 Points):\n" +"Create a Plane crossing 3 Points.\n" +"- First select 3 different points\n" +"- Second push this button", None)) + self.button_threepoints_plane.setText(_translate("Form", "Plane=(3 Points)", None)) + self.button_twopoints_plane.setToolTip(_translate("Form", "Plane=(2 Points):\n" +"Create a Plane in the middle of 2 points.\n" +"PLANE is perpendicular to line (P1 P2) and contains the midpoint of P1 and P2.\n" +"The direction of the normal of PLANE is the same as the vector from P1 to P2.\n" +"- First select 2 different points\n" +"- Second push this button", None)) + self.button_twopoints_plane.setText(_translate("Form", "Plane=(2 Points)", None)) + self.button_Npoints_plane.setToolTip(_translate("Form", "Plane=(N Points):\n" +"Create a \"best fit\" Plane from a set of points using Singular Value Decomposition.\n" +"- First select several Points (at least 3);\n" +"- Then push this button", None)) + self.button_Npoints_plane.setText(_translate("Form", "Plane=(N Points)", None)) + self.button_axisandpoint_plane.setToolTip(_translate("Form", "Plane=(Point, Axis):\n" +"Create a plane crossing a Line and a Point.\n" +"- First select a line and a point NOT on the previous line\n" +"- Second push this button", None)) + self.button_axisandpoint_plane.setText(_translate("Form", "Plane=(Point, Axis)", None)) + self.button_axis_point_plane.setToolTip(_translate("Form", "Plane=(Point, _|Axis):\n" +"Create a plane perpendicular to a Line and crossing a Point.\n" +"- First select a line and a point NOT on the previous line\n" +"- Second push this button", None)) + self.button_axis_point_plane.setText(_translate("Form", "Plane=(Point, _|Axis)", None)) + self.button_planeandpoint_plane.setToolTip(_translate("Form", "Plane=(Point, Plane):\n" +"Create a plane crossing a Point and parallel to a Plane.\n" +"- First select a plane and a point NOT on the previous plane\n" +"- Second push this button\n" +"\n" +"NB: you can enlarge the created new plane by setting first an extension length.", None)) + self.button_planeandpoint_plane.setText(_translate("Form", "Plane=(Point, Plane)", None)) + self.extension_planePointPlane.setToolTip(_translate("Form", "Length for the extensions of the new Plane compared to initial one.", None)) + self.extension_planePointPlane.setText(_translate("Form", "0.0", None)) + self.button_planeandaxis_plane.setToolTip(_translate("Form", "Plane=(Plane, Axis):\n" +"Create a Plane crossing a Line and perpendicular to a Plane.\n" +"- First select a plane and a line NOT on the previous plane\n" +"- Second push this button\n" +"\n" +"NB: The plane created can be rotated if a none null angle is defined first.", None)) + self.button_planeandaxis_plane.setText(_translate("Form", "Plane=(Plane, Axis)", None)) + self.angle_planeandaxis_plane.setToolTip(_translate("Form", "Angle of rotation of the created Plane (in degrees).", None)) + self.angle_planeandaxis_plane.setText(_translate("Form", "0.0", None)) + self.button_distPlane.setToolTip(_translate("Form", "Plane=(Plane,dist):\n" +"Create a Plane parallel to a Plane at a given distance.\n" +"- First select a plane or several Planes\n" +"- Second push this button\n" +"\n" +"NB: \n" +" - The distance to the plane created can be defined first.\n" +"Positive number in one direction and negative in the other one.\n" +"The second number indicates the number of planes to create.\n" +"With option \"Object copy\" in \"Ori. Pref.\" TAB\n" +" - If a Face of a Cube is selected the Cube is duplicate with the \n" +"corresponding Face at the defined distance from the original.\n" +"Several Faces of the cube can be selected.", None)) + self.button_distPlane.setText(_translate("Form", "Plane=(Plane,dist)", None)) + self.dist_plane.setToolTip(_translate("Form", "Distance to the new plane.\n" +"Can be negative for the reverse direction!", None)) + self.dist_plane.setText(_translate("Form", "10.0", None)) + self.spin_dist_plane.setToolTip(_translate("Form", "The number of copies (Max 100).", None)) + self.button_face_tangent.setToolTip(_translate("Form", "Face Tangent:\n" +"Create a tanget Plane at click location of a Face.\n" +"- First click in the view to select and object,\n" +"- Second push this button\n" +"-Third click on a location on the selected object.\n" +"\n" +"NB: The plane width and length can be defined first.", None)) + self.button_face_tangent.setText(_translate("Form", "Face Tangent", None)) + self.length_plane_2.setToolTip(_translate("Form", "Length of the Plane.", None)) + self.length_plane_2.setText(_translate("Form", "10.0", None)) + self.width_plane_2.setToolTip(_translate("Form", "Width of the Plane.", None)) + self.width_plane_2.setText(_translate("Form", "10.0", None)) + self.tabWidget_3.setTabText(self.tabWidget_3.indexOf(self.Plane_Tab1_2), _translate("Form", "Plane 1/2", None)) + self.button_click_for_plane.setToolTip(_translate("Form", "Click:\n" +"Create a rectangular Plane perpendicular to the view at location of one mouse click.\n" +"Define the width and the length of the Plane if needed.\n" +"- Click first on the Button then click once on the View.\n" +"- Click first on the Button then click once on top of one object of the View\n" +" to attach the plane at this object.\n" +"- You can also select an already existing point first and click the button to attach the plane.\n" +"\n" +"NB: The plane width and length can be defined first.\n" +"\n" +"Use left mouse button (MB1) to generate Planes. \n" +"MB2 and MB3 can still be used for view zoom and view rotation.\n" +"", None)) + self.button_click_for_plane.setText(_translate("Form", "Click", None)) + self.length_plane.setToolTip(_translate("Form", "Length of the Plane.", None)) + self.length_plane.setText(_translate("Form", "10.0", None)) + self.width_plane.setToolTip(_translate("Form", "Width of the Plane.", None)) + self.width_plane.setText(_translate("Form", "10.0", None)) + self.button_extension_plane.setToolTip(_translate("Form", "Enlarge(Plane):\n" +"Extend a Plane in each dimension.\n" +"- First select a Plane (or several Planes) \n" +"- Second push this button\n" +"\n" +"NB: \n" +" - The percentage of the extension can be defined first.", None)) + self.button_extension_plane.setText(_translate("Form", "Enlarge(Plane)", None)) + self.extension_plane.setToolTip(_translate("Form", "Extension of the Plane in each dimension in percentage.", None)) + self.extension_plane.setText(_translate("Form", "50.0", None)) + self.button_object_center_planes.setToolTip(_translate("Form", "Object(s) Center Planes:\n" +"Create 3 Planes (XY, XZ and YZ) at center location of all selected Object(s).\n" +"- First select one or severl objects\n" +"- Second push this button", None)) + self.button_object_center_planes.setText(_translate("Form", "Object(s) Center Planes", None)) + self.tabWidget_3.setTabText(self.tabWidget_3.indexOf(self.Plane_Tab2_2), _translate("Form", "Plane 1/2", None)) + self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Plane_Tab), _translate("Form", "Plane", None)) self.checkBox_allsubselect.setToolTip(_translate("Form", "if \"All\" is toggled:\n" " All the wires of the Trajectory selected will be considered.\n" "\n" @@ -2835,102 +3123,7 @@ class Ui_Form(object): "- Then push this button\n" "", None)) self.button_beam.setText(_translate("Form", "Beam", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.tab_17), _translate("Form", "Sweeping", None)) - self.button_click_for_plane.setToolTip(_translate("Form", "Click:\n" -"Create a rectangular Plane perpendicular to the view at location of one mouse click.\n" -"Define the width and the length of the Plane if needed.\n" -"- Click first on the Button then click once on the View.\n" -"- Click first on the Button then click once on top of one object of the View\n" -" to attach the plane at this object.\n" -"- You can also select an already existing point first and click the button to attach the plane.\n" -"\n" -"NB: The plane width and length can be defined first.\n" -"", None)) - self.button_click_for_plane.setText(_translate("Form", "Click", None)) - self.length_plane.setToolTip(_translate("Form", "Length of the Plane.", None)) - self.length_plane.setText(_translate("Form", "10.0", None)) - self.width_plane.setToolTip(_translate("Form", "Width of the Plane.", None)) - self.width_plane.setText(_translate("Form", "10.0", None)) - self.button_planeandaxis_plane.setToolTip(_translate("Form", "Plane=(Plane, Axis):\n" -"Create a Plane crossing a Line and perpendicular to a Plane.\n" -"- First select a plane and a line NOT on the previous plane\n" -"- Second push this button\n" -"\n" -"NB: The plane created can be rotated if a none null angle is defined first.", None)) - self.button_planeandaxis_plane.setText(_translate("Form", "Plane=(Plane, Axis)", None)) - self.angle_planeandaxis_plane.setToolTip(_translate("Form", "Angle of rotation of the created Plane (in degrees).", None)) - self.angle_planeandaxis_plane.setText(_translate("Form", "0.0", None)) - self.button_axisandpoint_plane.setToolTip(_translate("Form", "Plane=(Point, Axis):\n" -"Create a plane crossing a Line and a Point.\n" -"- First select a line and a point NOT on the previous line\n" -"- Second push this button", None)) - self.button_axisandpoint_plane.setText(_translate("Form", "Plane=(Point, Axis)", None)) - self.button_axis_point_plane.setToolTip(_translate("Form", "Plane=(Point, _|Axis):\n" -"Create a plane perpendicular to a Line and crossing a Point.\n" -"- First select a line and a point NOT on the previous line\n" -"- Second push this button", None)) - self.button_axis_point_plane.setText(_translate("Form", "Plane=(Point, _|Axis)", None)) - self.button_face_tangent.setToolTip(_translate("Form", "Face Tangent:\n" -"Create a tanget Plane at click location of a Face.\n" -"- First click in the view to select and object,\n" -"- Second push this button\n" -"-Third click on a location on the selected object.\n" -"\n" -"NB: The plane width and length can be defined first.", None)) - self.button_face_tangent.setText(_translate("Form", "Face Tangent", None)) - self.length_plane_2.setToolTip(_translate("Form", "Length of the Plane.", None)) - self.length_plane_2.setText(_translate("Form", "10.0", None)) - self.width_plane_2.setToolTip(_translate("Form", "Width of the Plane.", None)) - self.width_plane_2.setText(_translate("Form", "10.0", None)) - self.button_threepoints_plane.setToolTip(_translate("Form", "Plane=(3 Points):\n" -"Create a Plane crossing 3 Points.\n" -"- First select 3 different points\n" -"- Second push this button", None)) - self.button_threepoints_plane.setText(_translate("Form", "Plane=(3 Points)", None)) - self.button_distPlane.setToolTip(_translate("Form", "Plane=(Plane,dist):\n" -"Create a Plane parallel to a Plane at a given distance.\n" -"- First select a plane or several Planes\n" -"- Second push this button\n" -"\n" -"NB: \n" -" - The distance to the plane created can be defined first.\n" -"Positive number in one direction and negative in the other one.\n" -"The second number indicates the number of planes to create.\n" -"With option \"Object copy\" in \"Ori. Pref.\" TAB\n" -" - If a Face of a Cube is selected the Cube is duplicate with the \n" -"corresponding Face at the defined distance from the original.\n" -"Several Faces of the cube can be selected.", None)) - self.button_distPlane.setText(_translate("Form", "Plane=(Plane,dist)", None)) - self.dist_plane.setToolTip(_translate("Form", "Distance to the new plane.\n" -"Can be negative for the reverse direction!", None)) - self.dist_plane.setText(_translate("Form", "10.0", None)) - self.spin_dist_plane.setToolTip(_translate("Form", "The number of copies (Max 100).", None)) - self.button_planeandpoint_plane.setToolTip(_translate("Form", "Plane=(Point, Plane):\n" -"Create a plane crossing a Point and parallel to a Plane.\n" -"- First select a plane and a point NOT on the previous plane\n" -"- Second push this button\n" -"\n" -"NB: you can enlarge the created new plane by setting first an extension length.", None)) - self.button_planeandpoint_plane.setText(_translate("Form", "Plane=(Point, Plane)", None)) - self.extension_planePointPlane.setToolTip(_translate("Form", "Length for the extensions of the new Plane compared to initial one.", None)) - self.extension_planePointPlane.setText(_translate("Form", "0.0", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Plane_Tab1_3), _translate("Form", "Plane 1/2", None)) - self.button_object_center_planes.setToolTip(_translate("Form", "Object(s) Center Planes:\n" -"Create 3 Planes (XY, XZ and YZ) at center location of all selected Object(s).\n" -"- First select one or severl objects\n" -"- Second push this button", None)) - self.button_object_center_planes.setText(_translate("Form", "Object(s) Center Planes", None)) - self.button_extension_plane.setToolTip(_translate("Form", "Enlarge(Plane):\n" -"Extend a Plane in each dimension.\n" -"- First select a Plane (or several Planes) \n" -"- Second push this button\n" -"\n" -"NB: \n" -" - The percentage of the extension can be defined first.", None)) - self.button_extension_plane.setText(_translate("Form", "Enlarge(Plane)", None)) - self.extension_plane.setToolTip(_translate("Form", "Extension of the Plane in each dimension in percentage.", None)) - self.extension_plane.setText(_translate("Form", "50.0", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Plane_Tab1_4), _translate("Form", "Plane 2/2", None)) + self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.tab_17), _translate("Form", "Sweep", None)) self.button_boundingboxes.setToolTip(_translate("Form", "Create bounding boxes around each of selected object(s).\n" "6 rectangles at the limits of each bounding boxes will be created.", None)) self.button_boundingboxes.setText(_translate("Form", "Bounding Box(es)", None)) @@ -3100,6 +3293,28 @@ class Ui_Form(object): self.button_align_edges.setText(_translate("Form", "Align Edges", None)) self.angle_align_edges.setToolTip(_translate("Form", "This Angle (in degrees) will be added to the angle needed to align Edges.", None)) self.angle_align_edges.setText(_translate("Form", "0.0", None)) + self.button_align_main_axis.setToolTip(_translate("Form", "Align the main Axis (first of the 2 axis set) from selected object(s) to the last Edge (or 2 main Axis from an object) selected.\n" +" - Click first to select at least one object! \n" +"This or These first object(s) will be rotated.\n" +" - Click last to select an Edge (or an Object) to align to (this last object is fixed and will never move).\n" +"Then Click the button.\n" +"\n" +"NB:\n" +" The 2 main first axis are calculated using scan and sort from all axis of the object.\n" +" The center of rotation is at center mass location of each selected object.\n" +"\n" +" In case of several objects selection : \n" +" The 2 main Axis of the first object(s) will be aligned on the 2 main Axis of the last one.\n" +" In case of several objects selection plus one Edge :\n" +" The first main Axis of the object(s) will be aligned on the Edge.\n" +" \n" +" - One click will align first main Axes.\n" +" - Second click will also align the second main Axes if exists on last object or\n" +" will rotate by 180 deg the moving objects on first main axes.\n" +" - Third and following clicks will rotate by 180 deg the moving objects on first main axes.", None)) + self.button_align_main_axis.setText(_translate("Form", "Align Main Axis", None)) + self.angle_align_main_axis.setToolTip(_translate("Form", "This Angle (in degrees) will be added to the angle needed to align Edges.", None)) + self.angle_align_main_axis.setText(_translate("Form", "0.0", None)) self.button_joint_points.setToolTip(_translate("Form", "Joint Point(s) from selected object(s) to the last Point selected.\n" " - Click first to select a Point of an object or several Points from several objects.\n" "These objects will be moved. \n" @@ -3258,10 +3473,13 @@ class Ui_Form(object): self.ObjTrans_comboBox_start.setItemText(4, _translate("Form", "To define", None)) self.ObjTrans_button_select_start.setText(_translate("Form", "Select", None)) self.label_11.setText(_translate("Form", "X :", None)) + self.ObjTrans_start_x.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_start_x.setText(_translate("Form", "0.0", None)) self.label_12.setText(_translate("Form", "Y :", None)) + self.ObjTrans_start_y.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_start_y.setText(_translate("Form", "0.0", None)) self.label_13.setText(_translate("Form", "Z :", None)) + self.ObjTrans_start_z.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_start_z.setText(_translate("Form", "0.0", None)) self.tabWidget_12.setTabText(self.tabWidget_12.indexOf(self.tab_22), _translate("Form", "Start", None)) self.groupBox_23.setTitle(_translate("Form", "Ending Point :", None)) @@ -3273,10 +3491,13 @@ class Ui_Form(object): self.ObjTrans_comboBox_end.setItemText(5, _translate("Form", "Relative", None)) self.ObjTrans_button_select_end.setText(_translate("Form", "Select", None)) self.label_14.setText(_translate("Form", "Z :", None)) + self.ObjTrans_end_z.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_end_z.setText(_translate("Form", "0.0", None)) self.label_15.setText(_translate("Form", "Y :", None)) + self.ObjTrans_end_y.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_end_y.setText(_translate("Form", "0.0", None)) self.label_16.setText(_translate("Form", "X :", None)) + self.ObjTrans_end_x.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_end_x.setText(_translate("Form", "0.0", None)) self.tabWidget_12.setTabText(self.tabWidget_12.indexOf(self.tab_23), _translate("Form", "End", None)) self.ObjTrans_button_reset.setText(_translate("Form", "Reset", None)) diff --git a/WorkFeature/Ui/WFGui_2015.ui b/WorkFeature/Ui/WFGui_2015.ui index 80abcad..2f3bd4c 100644 --- a/WorkFeature/Ui/WFGui_2015.ui +++ b/WorkFeature/Ui/WFGui_2015.ui @@ -40,8 +40,8 @@ 0 0 - 362 - 786 + 365 + 773 @@ -213,205 +213,37 @@ - + ../Icons/WF_point.svg../Icons/WF_point.svg - Point 1/2 - - Point - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Create a Point at center location of each selected Circle(s) or Arc(s). - - - Circle(s) Center - - - - ../Icons/WF_centerCirclePoint.svg../Icons/WF_centerCirclePoint.svg - - - - 32 - 32 - - - - - - - - Point(s)=(Point(s),Line(s)): -Create projection(s) of Point(s) onto Line(s). -- First select one (or several) Point(s) -- Second select one or several) Line(s) -- Then push this button - -Plot the intersection point T on a Line given one Line and One Point C. -The Vector TC is perpendicular to the Line. -The symetric point Cprime is also created as TC=TCprime. - - - Point(s)=(Pt(s),Line(s)) - - - - ../Icons/WF_pointLinePoint.svg../Icons/WF_pointLinePoint.svg - - - - 32 - 32 - - - - - - - - Create a Point at center location of each selected Face(s). - - - Face(s) Center - - - - ../Icons/WF_centerFacePoint.svg../Icons/WF_centerFacePoint.svg - - - - 32 - 32 - - - - - - - - - - - 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.svg../Icons/WF_centerLinePoint.svg - - - - 32 - 32 - - - - - - - - - 40 - 0 - - - - - 50 - 16777215 - - - - The number indicates in how many parts each selected Lines(s) will be cut (Max 100). - - - 2 - - - 100 - - - 1 - - - - - - - - - Create a Point at mean location of all selected points. - - - Points Center - - - - ../Icons/WF_NpointsPoint.svg../Icons/WF_NpointsPoint.svg - - - - 32 - 32 - - - - - - - - Create a point at the intersection of the Line and Plane selected. - - - Point=(Line,Face) - - - - ../Icons/WF_lineFacePoint.svg../Icons/WF_lineFacePoint.svg - - - - 32 - 32 - - - - + + Create Point(s) + + - - - - - Create a Point at center location of all selected Object(s). + + + 2 + + + + Point 1/3 + + + Create Point(s) + + + + + + + + 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. @@ -420,61 +252,204 @@ if BBox check box 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.svg../Icons/WF_centerObjectsPoint.svg - - - - 32 - 32 - - - - - - - - if BBox check box is toggled + + + Object(s) Center + + + + ../Icons/WF_centerObjectsPoint.svg../Icons/WF_centerObjectsPoint.svg + + + + 32 + 32 + + + + + + + + if BBox check box 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! - - - BBox - - - - - - - - - Create Points at start and end location of each selected Line(s). - - - Line(s) Extrema - - - - ../Icons/WF_extremaLinePoint.svg../Icons/WF_extremaLinePoint.svg - - - - 32 - 32 - - - - - - - - Point(s)=(Point(s),Face(s)): + + + BBox + + + + + + + + + Point=(N Points): +Create a Point at mean location of all selected points. +- First select several Points +- Then push this button + + + Points Center + + + + ../Icons/WF_NpointsPoint.svg../Icons/WF_NpointsPoint.svg + + + + 32 + 32 + + + + + + + + + + + 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.svg../Icons/WF_centerLinePoint.svg + + + + 32 + 32 + + + + + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + The number indicates in how many parts each selected Lines(s) will be cut (Max 100). + + + 2 + + + 100 + + + 1 + + + + + + + + + Create Points at start and end location of each selected Line(s). + + + Line(s) Extrema + + + + ../Icons/WF_extremaLinePoint.svg../Icons/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.svg../Icons/WF_centerCirclePoint.svg + + + + 32 + 32 + + + + + + + + Create a Point at center location of each selected Face(s). + + + Face(s) Center + + + + ../Icons/WF_centerFacePoint.svg../Icons/WF_centerFacePoint.svg + + + + 32 + 32 + + + + + + + + Create a point at the intersection of the Line and Plane selected. + + + Point=(Line,Face) + + + + ../Icons/WF_lineFacePoint.svg../Icons/WF_lineFacePoint.svg + + + + 32 + 32 + + + + + + + + Point(s)=(Point(s),Face(s)): Create projection(s) of Point(s) onto Face(s). - First select one (or several) Point(s) - Second select one or several) Plane(s) @@ -482,128 +457,168 @@ Create projection(s) of Point(s) onto Face(s). Plot the intersection point T on a Plane given one Plane and One Point C. The Vector TC is perpendicular to the plane. - - - Point(s)=(Pt(s),Face(s)) - - - - ../Icons/WF_pointFacePoint.svg../Icons/WF_pointFacePoint.svg - - - - 32 - 32 - - - - - - - - - - ../Icons/WF_point.svg../Icons/WF_point.svg - - - Point 2/2 - - - - - - Plot one or two Point(s) at minimum distance of two Lines + + + Point(s)=(Pt(s),Face(s)) + + + + ../Icons/WF_pointFacePoint.svg../Icons/WF_pointFacePoint.svg + + + + 32 + 32 + + + + + + + + Point(s)=(Point(s),Line(s)): +Create projection(s) of Point(s) onto Line(s). +- First select one (or several) Point(s) +- Second select one or several) Line(s) +- Then push this button + +Plot the intersection point T on a Line given one Line and One Point C. +The Vector TC is perpendicular to the Line. +The symetric point Cprime is also created as TC=TCprime. + + + Point(s)=(Pt(s),Line(s)) + + + + ../Icons/WF_pointLinePoint.svg../Icons/WF_pointLinePoint.svg + + + + 32 + 32 + + + + + + + + Qt::Vertical + + + + 20 + 252 + + + + + + + + + Point 2/3 + + + Create Point(s) + + + + + + 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.svg../Icons/WF_lineLinePoint.svg - - - - 32 - 32 - - - - - - - - QLayout::SetFixedSize - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Create a Point at a certain distance along the line + + + Point=(Line,Line) + + + + ../Icons/WF_lineLinePoint.svg../Icons/WF_lineLinePoint.svg + + + + 32 + 32 + + + + + + + + QLayout::SetFixedSize + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Create a Point at a certain distance along the line respecting to the choosen reference starting point. - - - Point along Line - - - - ../Icons/WF_alongLinePoint.svg../Icons/WF_alongLinePoint.svg - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 60 - 16777215 - - - - Distance from the extremity - - - 0.0 - - - - - - - - - - - Point=(Point,Ax,dist): + + + Point along Line + + + + ../Icons/WF_alongLinePoint.svg../Icons/WF_alongLinePoint.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 60 + 16777215 + + + + Distance from the extremity + + + 0.0 + + + + + + + + + + + Point=(Point,Ax,dist): Create a Point along the given Axis, at a given distance of the selected Point. The Axis indicate the direction along where the Point is duplicate. (you can also select several axes to define different directions) @@ -615,102 +630,102 @@ NB: Positive number in one direction and negative in the other one. The second number indicates the number of Points to create. - - - Point=(Pt,Ax,dist) - - - - ../Icons/WF_distPointPoint.svg../Icons/WF_distPointPoint.svg - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - - 40 - 16777215 - - - - Distance to the new Axis. + + + Point=(Pt,Ax,dist) + + + + ../Icons/WF_distPointPoint.svg../Icons/WF_distPointPoint.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 40 + 16777215 + + + + Distance to the new Axis. Can be negative for the reverse direction! - - - 10.0 - - - - - - - - 30 - 0 - - - - - 30 - 16777215 - - - - The number of copies (Max 100). - - - QAbstractSpinBox::NoButtons - - - false - - - 1 - - - 100 - - - 1 - - - 1 - - - - - - - - - - - - 16777215 - 16777215 - - - - Create Points by Partition: + + + 10.0 + + + + + + + + 30 + 0 + + + + + 30 + 16777215 + + + + The number of copies (Max 100). + + + QAbstractSpinBox::NoButtons + + + false + + + 1 + + + 100 + + + 1 + + + 1 + + + + + + + + + + + + 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: @@ -719,267 +734,92 @@ Wires can be: Arc Ellipse An object must also be seleted but before any Wire to cut all his edges! - - - 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 (Max 100). - - - 2 - - - 100 - - - 1 - - - - - - - - - Create a set of Points on a Plane perpendicular to the view at location of mouse clicks. + + + 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 (Max 100). + + + 2 + + + 100 + + + 1 + + + + + + + + + Create a set of Points on a Plane perpendicular to the view at location of mouse clicks. - Click first on the Button then click on the View (with no object in background). - 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. - - - - Click - - - - ../Icons/WF_clickPoint.svg../Icons/WF_clickPoint.svg - - - - 32 - 32 - - - - true - - - - - - - Create Base Point of all selected Object(s). - - - Object(s) Base Point - - - - ../Icons/WF_objectBasePoint.svg../Icons/WF_objectBasePoint.svg - - - - 32 - 32 - - - - - - - - Transform Point(s) in Sketch's Point(s) by projection onto the Sketch's Plane: -- First select an existing Skecth; -- Select as much as Points needed; -Then click on this button. - - - Point(s) to Sketch - - - - ../Icons/WF_2Sketch.svg../Icons/WF_2Sketch.svg - - - - 32 - 32 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - ../Icons/WF_axis.svg../Icons/WF_axis.svg - - - Axis 1/2 - - - - - - Create 3 Axes at center location of all selected Object(s). - - - Object(s) X, Y, Z Axes - - - - ../Icons/WF_centerObjectsAxes.svg../Icons/WF_centerObjectsAxes.svg - - - - 32 - 32 - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Create an Axis crossing 2 Points. - - - Two Points Axis - - - - ../Icons/WF_2pointsLine.svg../Icons/WF_2pointsLine.svg - - - - 32 - 32 - - - - - - - - - 40 - 16777215 - - - - Distance for the extensions on extrema. -Positive values will enlarge the Axis. -Negative values will start to shrink it (then reverse when middle reached). - - - 0.0 - - - - - - - - - Axis=(Points): -Create a "best fit" line from a set of points using Singular Value Decomposition.. -- First select several Points -- Then push this button -The 3 eigenvectors are generated. -Orange one is the best fit line. +Use left mouse button (MB1) to generate Points. +MB2 and MB3 can still be used for view zoom and view rotation. - - - Axis from Point(s) - - - - ../Icons/WF_NpointsLine.svg../Icons/WF_NpointsLine.svg - - - - 32 - 32 - - - - - - - - - - - - - 16777215 - 16777215 - - - - Create the Axis of a Cylinder. - Cylinder(s) Axis + Click - ../Icons/WF_cylinderAxis.svg../Icons/WF_cylinderAxis.svg + ../Icons/WF_clickPoint.svg../Icons/WF_clickPoint.svg + + + + 32 + 32 + + + + true + + + + + + + Create Base Point of all selected Object(s). + + + Object(s) Base Point + + + + ../Icons/WF_objectBasePoint.svg../Icons/WF_objectBasePoint.svg @@ -989,16 +829,486 @@ Orange one is the best fit line. - - - + + + + Create Center of Mass Point of all selected Object(s). + + + Object(s) Mass Center Point + + + + ../Icons/WF_objectCenterMassPoint.svg../Icons/WF_objectCenterMassPoint.svg + + - 16777215 - 16777215 + 32 + 32 + + + + - Plane(s) Axes: + Create a set of points from selected Objetcs: +- Select object(s) + to create points from these object(s) ! + If you select an Edge : 2 points will be created; + if you select a Plane : 4 points will be created; + if you select an Object : many points will be created. +- Then click on this button. + + + Object(s) N Point(s) + + + + ../Icons/WF_objectNPoints.svg../Icons/WF_objectNPoints.svg + + + + 32 + 32 + + + + + + + + Transform Point(s) in Sketch's Point(s) by projection onto the Sketch's Plane: +- First select an existing Skecth; +- Select as much as Points needed; +Then click on this button. + + + Point(s) to Sketch + + + + ../Icons/WF_2Sketch.svg../Icons/WF_2Sketch.svg + + + + 32 + 32 + + + + + + + + Qt::Vertical + + + + 20 + 255 + + + + + + + + + Point 3/3 + + + + + + Load a set of points from an ASCII file: + ASCII format is 3 values by line seperated by blank as : + 15.3f 15.3f 15.3f + Values are read as float. + + Lines starting with characeter : # or / are considered as comment lines + + + + Load Points + + + + ../Icons/WF_pointsSetLoad.svg../Icons/WF_pointsSetLoad.svg + + + + 32 + 32 + + + + + + + + Save a point or a set of points into an ASCII file: +One (x, y, z) triplet per line seperated by blank. + +- Select as much as Points as needed and/or select object(s) + to save points from these object(s) ! + If you select an Edge : 2 points will be saved; + if you select a Plane : 4 points will be saved; + if you select an Object : many points will be saved. +- Then click on this button. + + + Save Points + + + + ../Icons/WF_pointsSetSave.svg../Icons/WF_pointsSetSave.svg + + + + 32 + 32 + + + + + + + + Qt::Vertical + + + + 20 + 579 + + + + + + + + + + + + + + ../Icons/WF_axis.svg../Icons/WF_axis.svg + + + Axis + + + + + + 2 + + + + Axis 1/3 + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Create an Axis crossing 2 Points. + + + Two Points Axis + + + + ../Icons/WF_2pointsLine.svg../Icons/WF_2pointsLine.svg + + + + 32 + 32 + + + + + + + + + 40 + 16777215 + + + + Distance for the extensions on extrema. +Positive values will enlarge the Axis. +Negative values will start to shrink it (then reverse when middle reached). + + + 0.0 + + + + + + + + + Qt::Vertical + + + + 20 + 233 + + + + + + + + Create 3 Axes at center location of all selected Object(s). + + + Object(s) X, Y, Z Axes + + + + ../Icons/WF_centerObjectsAxes.svg../Icons/WF_centerObjectsAxes.svg + + + + 32 + 32 + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Create an Axis Perpendicular to an Axis and crossing a Point +-Select one Axis and one (or several) Point(s) NOT on the previous Axis. + + + Axis=(Axis,Point) + + + + ../Icons/WF_linePointAxis.svg../Icons/WF_linePointAxis.svg + + + + 32 + 32 + + + + + + + + + 40 + 16777215 + + + + Distance for the extensions on extrema. +Positive values will enlarge the Axis. +Negative values will start to shrink it (then reverse when middle reached). + + + 0.0 + + + + + + + + + Axis=(N Points): +Create a "best fit" Line from a set of points using Singular Value Decomposition. +- First select several Points (at least 2); +- Then push this button + +The 3 eigenvectors are generated. +Orange one is the best fit line. + + + + Axis from Point(s) + + + + ../Icons/WF_NpointsLine.svg../Icons/WF_NpointsLine.svg + + + + 32 + 32 + + + + + + + + + + + 16777215 + 16777215 + + + + Create an Axis Parallel to an Axis (as Direction) and crossing a Point. +- Select one Axis and one (or several) Point(s) NOT on the previous Axis. +Define the length and the attach point if needed. +A Length of Zero means the length of already selected Axis will be used. + + + Axis=(Pt,Dir) + + + + ../Icons/WF_pointLineAxis.svg../Icons/WF_pointLineAxis.svg + + + + 32 + 32 + + + + + + + + + 40 + 16777215 + + + + Define the length of the Axis to create. +A Length of Zero means the length of already selected Axis will be used. + + + 0.0 + + + + + + + + 60 + 16777215 + + + + The Attach Point will be at : +Start of the Axis; +Mid of the Axis; +End of the Axis. + + + 1 + + + + Start + + + + + Mid + + + + + End + + + + + + + + + + + + + + + 16777215 + 16777215 + + + + Create the Axis of a Cylinder. + + + Cylinder(s) Axis + + + + ../Icons/WF_cylinderAxis.svg../Icons/WF_cylinderAxis.svg + + + + 32 + 32 + + + + + + + + + 16777215 + 16777215 + + + + Plane(s) Axes: Create Perpendicular Axes at the center location of a Plane. - First select one (or several) Plane(s); - Then press the button @@ -1011,38 +1321,38 @@ Create Perpendicular Axes of a Plane at selected locations. NB: Axes are created on both sides of the Plane The extension is 10 units by defaut but must be changed if needed. - - - Plane(s) Axes - - - - ../Icons/WF_FaceAxis.svg../Icons/WF_FaceAxis.svg - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Create a normal Axis of a Face. + + + Plane(s) Axes + + + + ../Icons/WF_FaceAxis.svg../Icons/WF_FaceAxis.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Create a normal Axis of a Face. To create a Normal at click location on a Face: - Click first in the view to select and object, - then push the button, @@ -1053,13 +1363,90 @@ To create several Normal of the face: - then select one or several points of the face - then push the button. (These selections can also be done into the Combined View) + + + Face Normal + + + + ../Icons/WF_FaceNormal.svg../Icons/WF_FaceNormal.svg + + + + 32 + 32 + + + + + + + + + + + 60 + 0 + + + + + 50 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + 40 + 0 + + + + + 40 + 16777215 + + + + Length of external part of the (Normal) Axis. + If zero In case of cylinder axis the extension will be a percentage (10%) of the object length. + If zero and plane of face Normal, the extension will be 10 units. + +For "Cylinder Axis", "Planes Axes" and "Face Normal" + Positive values will enlarge the Axis toward OUTSIDE of the Face Object; + Negative values will enlarge the Axis toward INSIDE of the Face Object. + + + 0.0 + + + + + + + + + + + + Create an Axis between two Axes. +-Select two Axes. - Face Normal + Axis=(Line,Line) - ../Icons/WF_FaceNormal.svg../Icons/WF_FaceNormal.svg + ../Icons/WF_twoLinesAxis.svg../Icons/WF_twoLinesAxis.svg @@ -1070,322 +1457,83 @@ To create several Normal of the face: - - - - - - 60 - 0 - - - - - 50 - 16777215 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - 40 - 0 - - - - - 40 - 16777215 - - - - Length of external part of the (Normal) Axis. - If zero In case of cylinder axis the extension will be a percentage (10%) of the object length. - If zero and plane of face Normal, the extension will be 10 units. - -For "Cylinder Axis", "Planes Axes" and "Face Normal" - Positive values will enlarge the Axis toward OUTSIDE of the Face Object; - Negative values will enlarge the Axis toward INSIDE of the Face Object. - - - 0.0 - - - - - - - - - - - - - - - 16777215 - 16777215 - - - - Create an Axis Parallel to an Axis (as Direction) and crossing a Point. -- Select one Axis and one (or several) Point(s) NOT on the previous Axis. -Define the length and the attach point if needed. -A Length of Zero means the length of already selected Axis will be used. - - - Axis=(Pt,Dir) - - - - ../Icons/WF_pointLineAxis.svg../Icons/WF_pointLineAxis.svg - - - - 32 - 32 - - - - - - - - - 40 - 16777215 - - - - Define the length of the Axis to create. -A Length of Zero means the length of already selected Axis will be used. - - - 0.0 - - - - - - - - 60 - 16777215 - - - - The Attach Point will be at : -Start of the Axis; -Mid of the Axis; -End of the Axis. - - - 1 - - - - Start - - - - - Mid - - - - - End - - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Create an Axis Perpendicular to an Axis and crossing a Point --Select one Axis and one (or several) Point(s) NOT on the previous Axis. - - - Axis=(Axis,Point) - - - - ../Icons/WF_linePointAxis.svg../Icons/WF_linePointAxis.svg - - - - 32 - 32 - - - - - - - - - 40 - 16777215 - - - - Distance for the extensions on extrema. -Positive values will enlarge the Axis. -Negative values will start to shrink it (then reverse when middle reached). - - - 0.0 - - - - - - - - - Create an Axis between two Axes. --Select two Axes. - - - Axis=(Line,Line) - - - - ../Icons/WF_twoLinesAxis.svg../Icons/WF_twoLinesAxis.svg - - - - 32 - 32 - - - - - - - - Create an Axis Perpendicular to an Axis, crossing a Point and Parallel to a Plane. + + + + Axis 2/3 + + + + + + Create an Axis Perpendicular to an Axis, crossing a Point and Parallel to a Plane. -Select one Plane, one Axis and one Point ON the previous Axis. - - - Axis=(Plane,Point,Axis) - - - - ../Icons/WF_planeLinePointAxis.svg../Icons/WF_planeLinePointAxis.svg - - - - 32 - 32 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - ../Icons/WF_axis.svg../Icons/WF_axis.svg - - - Axis 2/2 - - - - - - Axes=(Pl(s),Axes): + + + Axis=(Plane,Point,Axis) + + + + ../Icons/WF_planeLinePointAxis.svg../Icons/WF_planeLinePointAxis.svg + + + + 32 + 32 + + + + + + + + Axes=(Pl(s),Axes): Create projection(s) of Axes onto Plane(s). - First select one (or several) Line(s) - Second select one or several) Plane(s) - Then push this button - - - Axes=(Pl(s),Axes) - - - - ../Icons/WF_linePlaneAxis.svg../Icons/WF_linePlaneAxis.svg - - - - 32 - 32 - - - - - - - - Create an Axis by intersect of 2 Planes. - - - Axis=(Plane,Plane) - - - - ../Icons/WF_2PlanesAxis.svg../Icons/WF_2PlanesAxis.svg - - - - 32 - 32 - - - - - - - - - - Axes=(Axis,Pt,dist): + + + Axes=(Pl(s),Axes) + + + + ../Icons/WF_linePlaneAxis.svg../Icons/WF_linePlaneAxis.svg + + + + 32 + 32 + + + + + + + + Create an Axis by intersect of 2 Planes. + + + Axis=(Plane,Plane) + + + + ../Icons/WF_2PlanesAxis.svg../Icons/WF_2PlanesAxis.svg + + + + 32 + 32 + + + + + + + + + + Axes=(Axis,Pt,dist): Create an Axis parallel to a given Axis, Point at a given distance. The Axis is created along the Plane defined by the given Axis and Point. - First select an Axis (or several Axes) and a Point @@ -1401,96 +1549,96 @@ With option "Object copy" in "Ori. Pref." TAB Edge at the defined distance from the original. Several Edges of the cube can be selected. - - - Axes=(Axis,Pt,dist) - - - - ../Icons/WF_distAxisAxis.svg../Icons/WF_distAxisAxis.svg - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - - 40 - 16777215 - - - - Distance to the new Axis. + + + Axes=(Axis,Pt,dist) + + + + ../Icons/WF_distAxisAxis.svg../Icons/WF_distAxisAxis.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 40 + 16777215 + + + + Distance to the new Axis. Can be negative for the reverse direction! - - - 10.0 - - - - - - - - 30 - 0 - - - - - 30 - 16777215 - - - - The number of copies (Max 100). - - - QAbstractSpinBox::NoButtons - - - false - - - 1 - - - 100 - - - 1 - - - 1 - - - - - - - - - - - Axes=(Axis,Pt,Pl,a): + + + 10.0 + + + + + + + + 30 + 0 + + + + + 30 + 16777215 + + + + The number of copies (Max 100). + + + QAbstractSpinBox::NoButtons + + + false + + + 1 + + + 100 + + + 1 + + + 1 + + + + + + + + + + + Axes=(Axis,Pt,Pl,a): Create an Axis with an Angle to a origin Axis. - First select an Axis to rotate, then a Plane and a rotation Point - Second push this button @@ -1511,103 +1659,103 @@ Positive number in one direction and negative in the other one. - The second number indicates the number of Axes to create. - - - Axes=(Axis,Pt,Pl,a) - - - - ../Icons/WF_angleAxisAxis.svg../Icons/WF_angleAxisAxis.svg - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - - 40 - 16777215 - - - - Angle to the new Axis. + + + Axes=(Axis,Pt,Pl,a) + + + + ../Icons/WF_angleAxisAxis.svg../Icons/WF_angleAxisAxis.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 40 + 16777215 + + + + Angle to the new Axis. Can be negative for the reverse direction! (in degrees) - - - 45.0 - - - - - - - - 30 - 0 - - - - - 30 - 16777215 - - - - The number of copies (Max 100). - - - QAbstractSpinBox::NoButtons - - - false - - - 1 - - - 100 - - - 1 - - - 1 - - - - - - - - - - - - 16777215 - 16777215 - - - - Create Axes by Partition: + + + 45.0 + + + + + + + + 30 + 0 + + + + + 30 + 16777215 + + + + The number of copies (Max 100). + + + QAbstractSpinBox::NoButtons + + + false + + + 1 + + + 100 + + + 1 + + + 1 + + + + + + + + + + + + 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: @@ -1619,127 +1767,127 @@ 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 - - - 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 (Max 100). - - - 2 - - - 100 - - - 1 - - - - - - - - - - - - 16777215 - 16777215 - - - - Create Axes: + + + 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 (Max 100). + + + 2 + + + 100 + + + 1 + + + + + + + + + + + + 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. NB: You can change the successive lines to be bicolor (red and white) in "Ori. Pref." TAB - - - Axes=Cut(Axis) - - - - ../Icons/WF_cutAxis.svg../Icons/WF_cutAxis.svg - - - - 32 - 32 - - - - - - - - - 40 - 0 - - - - - 50 - 16777215 - - - - The number indicates in how many parts the selected Line will be cut (Max 100). - - - 2 - - - 100 - - - 1 - - - - - - - - - - - - 0 - 0 - - - - Enlarge(Axis): + + + Axes=Cut(Axis) + + + + ../Icons/WF_cutAxis.svg../Icons/WF_cutAxis.svg + + + + 32 + 32 + + + + + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + The number indicates in how many parts the selected Line will be cut (Max 100). + + + 2 + + + 100 + + + 1 + + + + + + + + + + + + 0 + 0 + + + + Enlarge(Axis): Extend an Axis at two extrema. - First select an Axis (or several Axes) - Second push this button @@ -1747,13 +1895,240 @@ Extend an Axis at two extrema. NB: - The percentage of the extension can be defined first. - Negative percentage will shrink the Axis + + + Enlarge(Axis) + + + + ../Icons/WF_enlargeLine.svg../Icons/WF_enlargeLine.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + Extension of the Line in percentage of original length of the Line. +If the extension is 50% it means that each side is extended with 25% length. + +Positive values will enlarge the Axis. +Negative values will start to shrink it. + + + 50.0 + + + + + + + + + Create a set of Lines on a Plane perpendicular to the view at location of 2 mouse clicks. +- Click first on the Button then at least twice click on the View (with no object in background). +- 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. + + +Use left mouse button (MB1) to generate Lines. +MB2 and MB3 can still be used for view zoom and view rotation. + + + Click + + + + ../Icons/WF_clickLine.svg../Icons/WF_clickLine.svg + + + + 32 + 32 + + + + + + + + Qt::Vertical + + + + 20 + 238 + + + + + + + + + Axis 3/3 + + + + + + Create 3 Axes at Base location of all selected Object(s). + + + Object(s) Base Axes + + + + ../Icons/WF_baseObjectsAxes.svg../Icons/WF_baseObjectsAxes.svg + + + + 32 + 32 + + + + + + + + Create a set of axes from selected Objetcs: +- Select object(s) + to create axes from these object(s) ! + if you select a Plane : 4 axes will be created; + if you select an Object : many axes will be created. +- Then click on this button. + + + Object(s) N Axes(s) + + + + ../Icons/WF_objectNAxes.svg../Icons/WF_objectNAxes.svg + + + + 32 + 32 + + + + + + + + Create a set of 2 or 3 main axes from selected Objetcs: +The most representative axes will be selected from all axis. +The length of main axes will be the cumulative length of all axes with the same direction. +- Select object(s) + to create axes from these object(s) ! + if you select a Plane : 2 axes will be created; + if you select an Object : 3 axes will be created. +- Then click on this button. + + + Object(s) 3 Axes(s) + + + + ../Icons/WF_object3Axes.svg../Icons/WF_object3Axes.svg + + + + 32 + 32 + + + + + + + + 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 + + + + + + + + Qt::Vertical + + + + 20 + 483 + + + + + + + + + + + + + + ../Icons/WF_circle.svg../Icons/WF_circle.svg + + + Circle + + + + + + + + Select an Axis and a Point to create a Circle +centered on the Point, perpendicular to the Axis +with the given radius. - Enlarge(Axis) + Circle=(Axis, center) - ../Icons/WF_enlargeLine.svg../Icons/WF_enlargeLine.svg + ../Icons/WF_lineCenterCircle.svg../Icons/WF_lineCenterCircle.svg @@ -1764,13 +2139,102 @@ NB: - - - - 0 - 0 - + + + + 40 + 0 + + + + 60 + 16777215 + + + + Radius of the Circle. + + + 10.0 + + + + + + + + + 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 + + + + + + + + Select 3 Points to create a Circle. + + + Circle=(3 points) + + + + ../Icons/WF_3pointsCircle.svg../Icons/WF_3pointsCircle.svg + + + + 32 + 32 + + + + + + + + + + Create Arcs: +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 + +NB: You can change the successive lines to be bicolor (red and white) +in "Ori. Pref." TAB + + + Arcs=Cut(Circle) + + + + ../Icons/WF_cutCircle.svg../Icons/WF_cutCircle.svg + + + + 32 + 32 + + + + + + 40 @@ -1784,32 +2248,32 @@ NB: - Extension of the Line in percentage of original length of the Line. -If the extension is 50% it means that each side is extended with 25% length. - -Positive values will enlarge the Axis. -Negative values will start to shrink it. + The number indicates in how many parts the selected Circle will be cut (Max 100). - - 50.0 + + 2 + + + 100 + + + 1 - - + + - Create a set of Lines on a Plane perpendicular to the view at location of 2 mouse clicks. -- Click first on the Button then at least twice click on the View (with no object in background). -- 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. + Select a center and 2 Points to create an Ellipse. - Click + Ellipse=(3 points) - ../Icons/WF_clickLine.svg../Icons/WF_clickLine.svg + ../Icons/WF_3pointsEllipse.svg../Icons/WF_3pointsEllipse.svg @@ -1819,36 +2283,29 @@ Negative values will start to shrink it. - - - - Create 3 Axes at Base location of all selected Object(s). + + + + Qt::Vertical - - Object(s) Base Axes - - - - ../Icons/WF_baseObjectsAxes.svg../Icons/WF_baseObjectsAxes.svg - - + - 32 - 32 + 20 + 40 - + - - + + - Transform Line(s) in Sketch's Line(s) by projection onto the Sketch's Plane: + Transform Circle(s) and Arc(s) in Sketch's object(s) by projection onto the Sketch's Plane: - First select an existing Skecth; -- Select as much as Lines needed; +- Select as much as Circles and arcs needed; Then click on this button. - Axis(es) to Sketch + Circle(s) to Sketch @@ -1862,15 +2319,15 @@ Then click on this button. - - + + Qt::Vertical 20 - 40 + 121 @@ -1922,8 +2379,8 @@ Then click on this button. 0 0 - 259 - 650 + 249 + 648 @@ -2234,7 +2691,7 @@ save your custom curves. - Parameters + Parameter : @@ -2384,7 +2841,7 @@ save your custom curves. - Type of 2D Curve + Type of 2D Curve : @@ -2411,12 +2868,12 @@ save your custom curves. - + true - Bspline + Bezier false @@ -2427,12 +2884,12 @@ save your custom curves. - + true - Bezier + Bspline false @@ -2528,7 +2985,7 @@ To save your curve you need to go to "Edit". 0 0 - 207 + 202 692 @@ -2876,7 +3333,7 @@ save your custom curves. - Parameters + Parameter : @@ -3023,67 +3480,6 @@ save your custom curves. - - - - Type of 3D Curve - - - - - - Points - - - true - - - - - - - Polyline - - - true - - - true - - - - - - - Bspline - - - false - - - true - - - - - - - true - - - Bezier - - - false - - - true - - - - - - @@ -3166,6 +3562,67 @@ To save your curve you need to go to "Edit". + + + + Type of 3D Curve : + + + + + + Points + + + true + + + + + + + Polyline + + + true + + + true + + + + + + + Bspline + + + false + + + true + + + + + + + true + + + Bezier + + + false + + + true + + + + + + @@ -3176,233 +3633,672 @@ To save your curve you need to go to "Edit". - + - ../Icons/WF_circle.svg../Icons/WF_circle.svg + ../Icons/WF_plane.svg../Icons/WF_plane.svg - Circle + Plane - + - - - - - Select an Axis and a Point to create a Circle -centered on the Point, perpendicular to the Axis -with the given radius. - - - Circle=(Axis, center) - - - - ../Icons/WF_lineCenterCircle.svg../Icons/WF_lineCenterCircle.svg - - - - 32 - 32 - - - - - - - - - 40 - 0 - - - - - 60 - 16777215 - - - - Radius of the Circle. - - - 10.0 - - - - - - - - - Select an Axis and a Point to create a Circle -centered on the Axis and tangenting the Point. + + + 1 - - Circle=(Axis, point) - - - - ../Icons/WF_linePointCircle.svg../Icons/WF_linePointCircle.svg - - - - 32 - 32 - - - - - - - - Select 3 Points to create a Circle. - - - Circle=(3 points) - - - - ../Icons/WF_3pointsCircle.svg../Icons/WF_3pointsCircle.svg - - - - 32 - 32 - - - - - - - - - - Create Arcs: -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 + + + Plane 1/2 + + + + + + Plane=(3 Points): +Create a Plane crossing 3 Points. +- First select 3 different points +- Second push this button + + + Plane=(3 Points) + + + + ../Icons/WF_threePointsPlane.svg../Icons/WF_threePointsPlane.svg + + + + 32 + 32 + + + + + + + + Plane=(2 Points): +Create a Plane in the middle of 2 points. +PLANE is perpendicular to line (P1 P2) and contains the midpoint of P1 and P2. +The direction of the normal of PLANE is the same as the vector from P1 to P2. +- First select 2 different points +- Second push this button + + + Plane=(2 Points) + + + + ../Icons/WF_twoPointsPlane.svg../Icons/WF_twoPointsPlane.svg + + + + 32 + 32 + + + + + + + + Plane=(N Points): +Create a "best fit" Plane from a set of points using Singular Value Decomposition. +- First select several Points (at least 3); +- Then push this button + + + Plane=(N Points) + + + + ../Icons/WF_NpointsPlane.svg../Icons/WF_NpointsPlane.svg + + + + 32 + 32 + + + + + + + + Plane=(Point, Axis): +Create a plane crossing a Line and a Point. +- First select a line and a point NOT on the previous line +- Second push this button + + + Plane=(Point, Axis) + + + + ../Icons/WF_linePointPlane.svg../Icons/WF_linePointPlane.svg + + + + 32 + 32 + + + + + + + + Plane=(Point, _|Axis): +Create a plane perpendicular to a Line and crossing a Point. +- First select a line and a point NOT on the previous line +- Second push this button + + + Plane=(Point, _|Axis) + + + + ../Icons/WF_linePointPlane2.svg../Icons/WF_linePointPlane2.svg + + + + 32 + 32 + + + + + + + + + + Plane=(Point, Plane): +Create a plane crossing a Point and parallel to a Plane. +- First select a plane and a point NOT on the previous plane +- Second push this button -NB: You can change the successive lines to be bicolor (red and white) -in "Ori. Pref." TAB - - - Arcs=Cut(Circle) - - - - ../Icons/WF_cutCircle.svg../Icons/WF_cutCircle.svg - - - - 32 - 32 - - - - - - - - - 40 - 0 - - - - - 50 - 16777215 - - - - The number indicates in how many parts the selected Circle will be cut (Max 100). - - - 2 - - - 100 - - - 1 - - - - - - - - - Select a center and 2 Points to create an Ellipse. - - - Ellipse=(3 points) - - - - ../Icons/WF_3pointsEllipse.svg../Icons/WF_3pointsEllipse.svg - - - - 32 - 32 - - +NB: you can enlarge the created new plane by setting first an extension length. + + + Plane=(Point, Plane) + + + + ../Icons/WF_pointPlanePlane.svg../Icons/WF_pointPlanePlane.svg + + + + 32 + 32 + + + + + + + + + 40 + 0 + + + + + 60 + 16777215 + + + + Length for the extensions of the new Plane compared to initial one. + + + 0.0 + + + + + + + + + + + + 0 + 0 + + + + Plane=(Plane, Axis): +Create a Plane crossing a Line and perpendicular to a Plane. +- First select a plane and a line NOT on the previous plane +- Second push this button + +NB: The plane created can be rotated if a none null angle is defined first. + + + Plane=(Plane, Axis) + + + + ../Icons/WF_planeLinePlane.svg../Icons/WF_planeLinePlane.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 60 + 16777215 + + + + Angle of rotation of the created Plane (in degrees). + + + 0.0 + + + + + + + + + + + Plane=(Plane,dist): +Create a Plane parallel to a Plane at a given distance. +- First select a plane or several Planes +- Second push this button + +NB: + - The distance to the plane created can be defined first. +Positive number in one direction and negative in the other one. +The second number indicates the number of planes to create. +With option "Object copy" in "Ori. Pref." TAB + - If a Face of a Cube is selected the Cube is duplicate with the +corresponding Face at the defined distance from the original. +Several Faces of the cube can be selected. + + + Plane=(Plane,dist) + + + + ../Icons/WF_distPlanePlane.svg../Icons/WF_distPlanePlane.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 40 + 16777215 + + + + Distance to the new plane. +Can be negative for the reverse direction! + + + 10.0 + + + + + + + + 30 + 0 + + + + + 30 + 16777215 + + + + The number of copies (Max 100). + + + QAbstractSpinBox::NoButtons + + + false + + + 1 + + + 100 + + + 1 + + + 1 + + + + + + + + + + + + 0 + 0 + + + + Face Tangent: +Create a tanget Plane at click location of a Face. +- First click in the view to select and object, +- Second push this button +-Third click on a location on the selected object. + +NB: The plane width and length can be defined first. + + + Face Tangent + + + + ../Icons/WF_FaceTangent.svg../Icons/WF_FaceTangent.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + Length of the Plane. + + + 10.0 + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + Width of the Plane. + + + 10.0 + + + + + + + + + Qt::Vertical + + + + 20 + 235 + + + + + + + + + Plane 1/2 + + + + + + + + + 0 + 0 + + + + Click: +Create a rectangular Plane perpendicular to the view at location of one mouse click. +Define the width and the length of the Plane if needed. +- Click first on the Button then click once on the View. +- Click first on the Button then click once on top of one object of the View + to attach the plane at this object. +- You can also select an already existing point first and click the button to attach the plane. + +NB: The plane width and length can be defined first. + +Use left mouse button (MB1) to generate Planes. +MB2 and MB3 can still be used for view zoom and view rotation. + + + + Click + + + + ../Icons/WF_clickPlane.svg../Icons/WF_clickPlane.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + Length of the Plane. + + + 10.0 + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + Width of the Plane. + + + 10.0 + + + + + + + + + + + + 0 + 0 + + + + Enlarge(Plane): +Extend a Plane in each dimension. +- First select a Plane (or several Planes) +- Second push this button + +NB: + - The percentage of the extension can be defined first. + + + Enlarge(Plane) + + + + ../Icons/WF_enlargePlane.svg../Icons/WF_enlargePlane.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + Extension of the Plane in each dimension in percentage. + + + 50.0 + + + + + + + + + Object(s) Center Planes: +Create 3 Planes (XY, XZ and YZ) at center location of all selected Object(s). +- First select one or severl objects +- Second push this button + + + Object(s) Center Planes + + + + ../Icons/WF_centerObjectsPlanes.svg../Icons/WF_centerObjectsPlanes.svg + + + + 32 + 32 + + + + + + + + Qt::Vertical + + + + 20 + 527 + + + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Transform Circle(s) and Arc(s) in Sketch's object(s) by projection onto the Sketch's Plane: -- First select an existing Skecth; -- Select as much as Circles and arcs needed; -Then click on this button. - - - Circle(s) to Sketch - - - - ../Icons/WF_2Sketch.svg../Icons/WF_2Sketch.svg - - - - 32 - 32 - - - - - - - - Qt::Vertical - - - - 20 - 121 - - - - @@ -3411,7 +4307,7 @@ Then click on this button. ../Icons/WF_Beam.svg../Icons/WF_Beam.svg - Sweeping + Sweep @@ -3602,613 +4498,6 @@ Will extrude a Section along a Linear Trajectory. - - - - ../Icons/WF_plane.svg../Icons/WF_plane.svg - - - Plane 1/2 - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - 0 - 0 - - - - Click: -Create a rectangular Plane perpendicular to the view at location of one mouse click. -Define the width and the length of the Plane if needed. -- Click first on the Button then click once on the View. -- Click first on the Button then click once on top of one object of the View - to attach the plane at this object. -- You can also select an already existing point first and click the button to attach the plane. - -NB: The plane width and length can be defined first. - - - - Click - - - - ../Icons/WF_clickPlane.svg../Icons/WF_clickPlane.svg - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - - 50 - 16777215 - - - - Length of the Plane. - - - 10.0 - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - - 50 - 16777215 - - - - Width of the Plane. - - - 10.0 - - - - - - - - - - - - 0 - 0 - - - - Plane=(Plane, Axis): -Create a Plane crossing a Line and perpendicular to a Plane. -- First select a plane and a line NOT on the previous plane -- Second push this button - -NB: The plane created can be rotated if a none null angle is defined first. - - - Plane=(Plane, Axis) - - - - ../Icons/WF_planeLinePlane.svg../Icons/WF_planeLinePlane.svg - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - - 60 - 16777215 - - - - Angle of rotation of the created Plane (in degrees). - - - 0.0 - - - - - - - - - Plane=(Point, Axis): -Create a plane crossing a Line and a Point. -- First select a line and a point NOT on the previous line -- Second push this button - - - Plane=(Point, Axis) - - - - ../Icons/WF_linePointPlane.svg../Icons/WF_linePointPlane.svg - - - - 32 - 32 - - - - - - - - Plane=(Point, _|Axis): -Create a plane perpendicular to a Line and crossing a Point. -- First select a line and a point NOT on the previous line -- Second push this button - - - Plane=(Point, _|Axis) - - - - ../Icons/WF_linePointPlane2.svg../Icons/WF_linePointPlane2.svg - - - - 32 - 32 - - - - - - - - - - - 0 - 0 - - - - Face Tangent: -Create a tanget Plane at click location of a Face. -- First click in the view to select and object, -- Second push this button --Third click on a location on the selected object. - -NB: The plane width and length can be defined first. - - - Face Tangent - - - - ../Icons/WF_FaceTangent.svg../Icons/WF_FaceTangent.svg - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - - 50 - 16777215 - - - - Length of the Plane. - - - 10.0 - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - - 50 - 16777215 - - - - Width of the Plane. - - - 10.0 - - - - - - - - - Plane=(3 Points): -Create a Plane crossing 3 Points. -- First select 3 different points -- Second push this button - - - Plane=(3 Points) - - - - ../Icons/WF_threePointsPlane.svg../Icons/WF_threePointsPlane.svg - - - - 32 - 32 - - - - - - - - - - Plane=(Plane,dist): -Create a Plane parallel to a Plane at a given distance. -- First select a plane or several Planes -- Second push this button - -NB: - - The distance to the plane created can be defined first. -Positive number in one direction and negative in the other one. -The second number indicates the number of planes to create. -With option "Object copy" in "Ori. Pref." TAB - - If a Face of a Cube is selected the Cube is duplicate with the -corresponding Face at the defined distance from the original. -Several Faces of the cube can be selected. - - - Plane=(Plane,dist) - - - - ../Icons/WF_distPlanePlane.svg../Icons/WF_distPlanePlane.svg - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - - 40 - 16777215 - - - - Distance to the new plane. -Can be negative for the reverse direction! - - - 10.0 - - - - - - - - 30 - 0 - - - - - 30 - 16777215 - - - - The number of copies (Max 100). - - - QAbstractSpinBox::NoButtons - - - false - - - 1 - - - 100 - - - 1 - - - 1 - - - - - - - - - - - Plane=(Point, Plane): -Create a plane crossing a Point and parallel to a Plane. -- First select a plane and a point NOT on the previous plane -- Second push this button - -NB: you can enlarge the created new plane by setting first an extension length. - - - Plane=(Point, Plane) - - - - ../Icons/WF_pointPlanePlane.svg../Icons/WF_pointPlanePlane.svg - - - - 32 - 32 - - - - - - - - - 40 - 0 - - - - - 60 - 16777215 - - - - Length for the extensions of the new Plane compared to initial one. - - - 0.0 - - - - - - - - - - - ../Icons/WF_plane.svg../Icons/WF_plane.svg - - - Plane 2/2 - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Object(s) Center Planes: -Create 3 Planes (XY, XZ and YZ) at center location of all selected Object(s). -- First select one or severl objects -- Second push this button - - - Object(s) Center Planes - - - - ../Icons/WF_centerObjectsPlanes.svg../Icons/WF_centerObjectsPlanes.svg - - - - 32 - 32 - - - - - - - - - - - 0 - 0 - - - - Enlarge(Plane): -Extend a Plane in each dimension. -- First select a Plane (or several Planes) -- Second push this button - -NB: - - The percentage of the extension can be defined first. - - - Enlarge(Plane) - - - - ../Icons/WF_enlargePlane.svg../Icons/WF_enlargePlane.svg - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - - 50 - 16777215 - - - - Extension of the Plane in each dimension in percentage. - - - 50.0 - - - - - - - true @@ -4893,7 +5182,7 @@ Original code from HighlightDifference.FCMacro Align - + @@ -5087,20 +5376,77 @@ NB: - - - - Qt::Vertical - - - - 20 - 40 - - - - + + + + + Align the main Axis (first of the 2 axis set) from selected object(s) to the last Edge (or 2 main Axis from an object) selected. + - Click first to select at least one object! +This or These first object(s) will be rotated. + - Click last to select an Edge (or an Object) to align to (this last object is fixed and will never move). +Then Click the button. + +NB: + The 2 main first axis are calculated using scan and sort from all axis of the object. + The center of rotation is at center mass location of each selected object. + + In case of several objects selection : + The 2 main Axis of the first object(s) will be aligned on the 2 main Axis of the last one. + In case of several objects selection plus one Edge : + The first main Axis of the object(s) will be aligned on the Edge. + + - One click will align first main Axes. + - Second click will also align the second main Axes if exists on last object or + will rotate by 180 deg the moving objects on first main axes. + - Third and following clicks will rotate by 180 deg the moving objects on first main axes. + + + Align Main Axis + + + + ../Icons/WF_objectAlignMainAxis.svg../Icons/WF_objectAlignMainAxis.svg + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + This Angle (in degrees) will be added to the angle needed to align Edges. + + + 0.0 + + + + + + Joint Point(s) from selected object(s) to the last Point selected. @@ -5126,7 +5472,7 @@ Then Click the button. - + Joint Face(s) from selected object(s) to the last Face selected. @@ -5153,6 +5499,19 @@ Then Click the button. + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -6223,6 +6582,9 @@ On the last result the same Sketch is both link to Pad001 but also still to Pad. 16777215 + + Please Enter a new coordinate and type RETURN to validate! + 0.0 @@ -6256,6 +6618,9 @@ On the last result the same Sketch is both link to Pad001 but also still to Pad. 16777215 + + Please Enter a new coordinate and type RETURN to validate! + 0.0 @@ -6289,6 +6654,9 @@ On the last result the same Sketch is both link to Pad001 but also still to Pad. 16777215 + + Please Enter a new coordinate and type RETURN to validate! + 0.0 @@ -6438,6 +6806,9 @@ On the last result the same Sketch is both link to Pad001 but also still to Pad. 16777215 + + Please Enter a new coordinate and type RETURN to validate! + 0.0 @@ -6471,6 +6842,9 @@ On the last result the same Sketch is both link to Pad001 but also still to Pad. 16777215 + + Please Enter a new coordinate and type RETURN to validate! + 0.0 @@ -6504,6 +6878,9 @@ On the last result the same Sketch is both link to Pad001 but also still to Pad. 16777215 + + Please Enter a new coordinate and type RETURN to validate! + 0.0 diff --git a/WorkFeature/Utils/WF_Utils.py b/WorkFeature/Utils/WF_Utils.py new file mode 100644 index 0000000..a347b75 --- /dev/null +++ b/WorkFeature/Utils/WF_Utils.py @@ -0,0 +1,238 @@ +# -*- coding: utf-8 -*- +""" +""" +import os.path + +from PySide import QtCore +try: + _fromUtf8 = QtCore.QString.fromUtf8 +except AttributeError: + _fromUtf8 = lambda s: s + + +############################################################################### +# Functions +def print_attributes(obj, doc=False): + """ Print all the attributes of this object and their value """ + __m_type = obj.__class__.__name__ + print '* Attributes print for '+ str(__m_type) + '*' + for names in dir(obj): + attr = getattr(obj,names) + if not callable(attr): + if doc: + print names,':',attr + else: + print names + +def print_methods(obj, doc=False): + """ Print all the methods of this object and their doc string""" + __m_type = obj.__class__.__name__ + print '\n* Methods print for '+ str(__m_type) + '*' + for names in dir(obj): + attr = getattr(obj,names) + if callable(attr): + if doc: + print names,':',attr.__doc__ + else: + print names + + +def write_text(filename=None, text=None): + """ + Write the text into an ASCII file. + + Return True if success, false if not. + + *filename* : (string) full path name. + + *text* : (string) the text to write. + """ + if filename != None and text != None: + try: + __m_f=open(filename,'w') + __m_f.write(text) + __m_f.close() + return True + except: + print "\nERROR : The file " + str(filename) + \ + " cannot be opened in write mode !" + return False + else: + return False + + +def append_text(filename=None, text="" ): + """ + Print/Add text either on screen or on at the end of an existing ASCII text file. + + *filename* : (string) full path name. + + *text* : (string) the text to add at the end of the file. + """ + if text.__class__.__name__ != 'str': + return None + if filename and os.path.exists(filename): + try: + __m_f=open(filename,'r+') + __m_f.readlines() + __m_f.write(text+'\n') + __m_f.close() + except: + print "\nERROR : The file " + str(filename) + \ + " can not be opened for append mode !" + return False + else: + print text +'\n' + +def read_text_into_list(filename): + """ + Read the complete ASCII file *filename* (if possible) into a unique + list of strings and return the list + (or None in case of error). + + Controls are done on *filename*. + + *filename* : (string) full path name. + """ + if filename and os.path.exists(filename): + try: + __m_f=open(filename,'r') + # read the complete ASCII file if possible into a unique list of strings + try: + #m_strings = __m_f.readlines() + m_strings = __m_f.read().splitlines() + except: + __m_f.close() + print "\nERROR : The file " + str(filename) + \ + " cannot be fully read !" + return None + finally: + __m_f.close() + __m_f.close() + return m_strings + except: + print "\nERROR : The file " + str(filename) + \ + " cannot be opened in read mode !" + return None + else: + if os.path.exists(filename) == False: + print "\nERROR : " + str(filename) + " not a valid file !" + return None + + +def read_text(filename): + """ + Read the complete ASCII file *filename* (if possible) into a unique + string and return the string + (or None in case of error). + + Controls are done on *filename*. + + *filename* : (string) full path name. + """ + if filename and os.path.exists(filename): + try: + __m_f=open(filename,'r') + # read the complete ASCII file if possible into a unique string + try: + m_string = __m_f.read() + except: + __m_f.close() + print "\nERROR : The file " + str(filename) + \ + " cannot be fully read !" + return None + finally: + __m_f.close() + __m_f.close() + return m_string + except: + print "\nERROR : The file " + str(filename) + \ + " cannot be opened in read mode !" + return None + else: + if os.path.exists(filename) == False: + print "\nERROR : " + str(filename) + " not a valid file !" + return None + + +############################################################################### +# Classes +class DefineAndConnectEvents(): + def __init__(self, ui, obj): + """ + Definition of communications between a Gui and an python Object. + This class is a base class and must be derived like : + + class ParametricCurve2DEvents(DefineAndConnectEvents): + def __init__(self,ui): + self.ui = ui + # Create Parametric Curve objects + self.parcurv2D = ParametricCurve2D(self.ui) + DefineAndConnectEvents.__init__(self, self.ui, self.parcurv2D) + + + def defineEvents(self): + #============================== + + # Definition of connections + + # by type of actions on widgets of the Gui. + #============================== + self.connections_for_button_pressed = { + "ParCurve_button_edit_2" : "edit", + "ParCurve_button_apply_2" : "draw", + "ParCurve_button_store_2" : "store", + } + ... + """ + if self.__class__ is DefineAndConnectEvents: + raise Exception("Direct construction not allowed !\nSee doc of the Class.") + self.ui = ui + self.obj = obj + self.defineEvents() + self.connectEvents() + + def defineEvents(self): + """ + Definition of connections by type of actions on widgets of the Gui. + """ + self.connections_for_slider_changed = {} + self.connections_for_button_pressed = {} + self.connections_for_combobox_changed = {} + self.connections_for_checkbox_toggled = {} + self.connections_for_spin_changed = {} + self.connections_for_return_pressed = {} + + def connectEvents(self): + for m_key, m_val in self.connections_for_slider_changed.items(): + #print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.obj, str(m_val))) ) + QtCore.QObject.connect(getattr(self.ui, str(m_key)), + QtCore.SIGNAL("valueChanged(int)"),getattr(self.obj, str(m_val))) + + for m_key, m_val in self.connections_for_button_pressed.items(): + #print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.obj, str(m_val))) ) + QtCore.QObject.connect(getattr(self.ui, str(m_key)), + QtCore.SIGNAL("pressed()"),getattr(self.obj, str(m_val))) + + for m_key, m_val in self.connections_for_combobox_changed.items(): + #print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.obj, str(m_val))) ) + QtCore.QObject.connect(getattr(self.ui, str(m_key)), + QtCore.SIGNAL(_fromUtf8("currentIndexChanged(QString)")),getattr(self.obj, str(m_val))) + + for m_key, m_val in self.connections_for_checkbox_toggled.items(): + #print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.obj, str(m_val))) ) + QtCore.QObject.connect(getattr(self.ui, str(m_key)), + QtCore.SIGNAL(_fromUtf8("toggled(bool)")),getattr(self.obj, str(m_val))) + + for m_key, m_val in self.connections_for_spin_changed.items(): + #print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.obj, str(m_val))) ) + QtCore.QObject.connect(getattr(self.ui, str(m_key)), + QtCore.SIGNAL("valueChanged(int)"),getattr(self.obj, str(m_val))) + + for m_key, m_val in self.connections_for_return_pressed.items(): + #print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.obj, str(m_val))) ) + QtCore.QObject.connect(getattr(self.ui, str(m_key)), + QtCore.SIGNAL("returnPressed()"),getattr(self.obj, str(m_val))) + +if __name__ == '__main__': + myObject = DefineAndConnectEvents(None, None) \ No newline at end of file diff --git a/WorkFeature/Utils/WF_points_set.py b/WorkFeature/Utils/WF_points_set.py new file mode 100644 index 0000000..dc96926 --- /dev/null +++ b/WorkFeature/Utils/WF_points_set.py @@ -0,0 +1,232 @@ +# -*- coding: utf-8 -*- +""" +Created on Mon Jan 18 22:19:48 2016 + +@author: laurent +""" +import os + +def write_ascii(filename, text): + """Write the text into an ASCII file. + + **Return** True if success, false if not. + + *filename* : (string) full path name. + + *text* : (string) the text to write. + + >>> filename = "toto.txt" + >>> text = "my text to write!" + >>> write_ascii(filename, text) + + """ + if (None in [filename,text]) : + print "\nERROR in : " + str(write_ascii.func_name) + print "At least one of arguments not defined !" + return False + try: + __m_f=open(filename,'w') + __m_f.write(text) + __m_f.close() + return True + except: + print "\nERROR :in : " + str(write_ascii.func_name) + print "The file " + str(filename) + \ + " cannot be opened in write mode !" + return False + + +class points_set(): + def __init__(self, points=None, filename="pointSet.txt"): + """Create a points_set object. + + *points* : (tuple, list, dict or set) a serie of triplet (x, y, z). + + *filename* : (string) full path name. + + **Return** : None if points not defined + False if points not (tuple, list, dict, set) + + >>> # To load a set of points from titi.txt + >>> m_pts = points_set([],"titi.txt") + >>> m_points = m_pts.load() + """ + if (None in [points]) : + print "\nERROR in : points_set.__init__" + print "'points' not defined !" + return None + + if not isinstance(points, (tuple, list, dict, set)): + print "\nERROR in : points_set.__init__" + print "points arguments must be one of (tuple, list, dict, set) !" + return False + + self.__points = list(points) + self.__format = '<15.3f' + if filename == None: + filename = "pointSet.txt" + self.__filename = filename + + def __str__(self): + return str(self.__points) + + def load(self, filename=None): + """Load a set of points from an ASCII file. + + ASCII format is 3 values by line seperated by blank as : + <15.3f <15.3f <15.3f + Values are read as float + + Lines starting with characeter : # or / are considered as comment lines + + *filename* : (string) full path name. + + >>> # To read + >>> m_pts2 = points_set([],"titi.txt") + >>> m_points = m_pts2.load() + >>> print m_points + >>> # or + >>> print points_set([],"tutu.txt").load() + """ + if (None in [filename]) : + m_file = self.__filename + else: + m_file = filename + if not os.path.exists(m_file): + print "\nERROR in : points_set.load" + print "not able to find the file " + str(m_file) + " !" + return False + try: + fo = open(m_file,'r') + fo.close() + except: + print "\nERROR in : points_set.load" + print "not able to open the file " + str(m_file) + " !" + return False + with open(m_file, 'r') as f: + m_points = [] + for line in f: + #print line + x =0.0; y =0.0; z =0.0 + if line[0] == '#' or line[0] == '/': + continue + words = line.strip().split() + + if len(words) == 0: + continue + if words[0] == '#' or line[0] == '/': + continue + if len(words) >= 1: + x = words[0] + if len(words) >= 2: + y = words[1] + if len(words) >= 3: + z = words[2] + m_points.append((x,y,z)) + #print m_points + if len(m_points) == 0: + print "\nWARNING in : points_set.load" + print "no point read from the file " + str(m_file) + " !" + return False + self.__points.append(m_points) + return m_points + + def save(self, filename=None, fmt='<15.3f'): + """Save a points set into an ASCII file. + + One (x, y, z) triplet per line seperated by blank. + + *filename* : (string) full path name. + + *fmt* : (char or string) format pattern. + + >>> # Save from a list + >>> m_points = [] + >>> x =0.0; y =10.0; z =10.0 + >>> m_points.append((x, y, z)) + >>> x =0.0; y =0.0; z =10.0 + >>> m_points.append((x, y, z)) + >>> m_pts = points_set(m_points) + >>> m_pts.save("titi.txt") + >>> # or + >>> sample = [(-1,-1,0.0),(0,3,0.0),(1,2.5,0.0),(2,5,0.0),(3,4,0.0),(5,2,0.0),(7,5,0.0),(9,4,0.0)] + >>> m_points2 = list(sample) + >>> m_pts1 = points_set(m_points2, filename="tutu.txt") + >>> m_pts1.save() + """ + if (None in [filename]) : + m_file = self.__filename + else: + m_file = filename + try: + fo = open(m_file,'w') + fo.close() + except: + print "\nERROR in : points_set.save" + print "not able to open the file " + str(m_file) + " !" + return False + + if len(self.__points) < 1: + return False + + self.__format = fmt + with open(m_file, 'w') as f: + #m_line = "# ASCII : <15.3f <15.3f <15.3f\n" + m_line = "# ASCII : "+str(self.__format)+" "+str(self.__format)+" "+str(self.__format)+"\n" + f.write(m_line) + m_format="{0:"+str(self.__format)+"}" + for m_point in self.__points: + m_line = " " + for m_i in range(2): + #m_line = m_line + '{0:<15.3f}'.format(m_point[m_i]) + m_line = m_line + str(m_format).format(m_point[m_i]) + m_line = m_line + " " + m_i = 2 + #m_line = m_line + '{0:<15.3f}'.format(m_point[m_i]) + m_line = m_line + str(m_format).format(m_point[m_i]) + m_line = m_line + '\n' + f.write(m_line) + + return True + +if __name__ == "__main__": + filename = "toto.txt" + text = "my text" + write_ascii(filename, text) + + m_points = [] + x =0.0; y =10.0; z =10.0 + m_points.append((x, y, z)) + x =0.0; y =0.0; z =10.0 + m_points.append((x, y, z)) + x =10.0; y =0.0; z =10.0 + m_points.append((x, y, z)) + x =10.0; y =0.0; z =0.0 + m_points.append((x, y, z)) + x =0.0; y =0.0; z =10.0 + m_points.append((x, y, z)) + x =0.0; y =0.0; z =0.0 + m_points.append((x, y, z)) + x =10.0; y =10.0; z =10.0 + m_points.append((x, y, z)) + x =10.0; y =10.0; z =0.0 + m_points.append((x, y, z)) + #print str(m_points) + + m_pts = points_set(m_points) + m_pts.save("titi.txt") + print "Save done!" + + sample = [(-1,-1,0.0),(0,3,0.0),(1,2.5,0.0),(2,5,0.0),(3,4,0.0),(5,2,0.0),(7,5,0.0),(9,4,0.0)] + m_points2 = list(sample) + m_pts1 = points_set(m_points2, filename="tutu.txt") + m_pts1.save() + print "Save done!" + + m_pts2 = points_set([],"titi.txt") + m_points = m_pts2.load() + print "First set of points after reading : " + print m_points + print "Second set of points after reading : " + print points_set([],"tutu.txt").load() + \ No newline at end of file diff --git a/WorkFeature/Utils/__init__.py b/WorkFeature/Utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/WorkFeature/WFGui_2015.py b/WorkFeature/WFGui_2015.py index 075986e..06e5bb5 100644 --- a/WorkFeature/WFGui_2015.py +++ b/WorkFeature/WFGui_2015.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'WFGui_2015.ui' # -# Created: Sun Dec 13 18:49:39 2015 +# Created: Tue Mar 29 07:16:30 2016 # by: PySide UI code generator 4.11.3 # # WARNING! All changes made in this file will be lost! @@ -40,7 +40,7 @@ class Ui_Form(object): self.scrollArea.setWidgetResizable(True) self.scrollArea.setObjectName(_fromUtf8("scrollArea")) self.scrollAreaWidgetContents = QtGui.QWidget() - self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 362, 786)) + self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 365, 773)) self.scrollAreaWidgetContents.setObjectName(_fromUtf8("scrollAreaWidgetContents")) self.gridLayout_128 = QtGui.QGridLayout(self.scrollAreaWidgetContents) self.gridLayout_128.setObjectName(_fromUtf8("gridLayout_128")) @@ -96,44 +96,47 @@ class Ui_Form(object): spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.gridLayout_65.addItem(spacerItem, 2, 0, 1, 1) self.tabWidget_7.addTab(self.Origin_Tab_2, icon1, _fromUtf8("")) - self.Point_Tab1_2 = QtGui.QWidget() - self.Point_Tab1_2.setObjectName(_fromUtf8("Point_Tab1_2")) - self.gridLayout_68 = QtGui.QGridLayout(self.Point_Tab1_2) - self.gridLayout_68.setObjectName(_fromUtf8("gridLayout_68")) - spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_68.addItem(spacerItem1, 10, 0, 1, 1) - self.button_circle_center = QtGui.QPushButton(self.Point_Tab1_2) + self.Point_Tab = QtGui.QWidget() + self.Point_Tab.setObjectName(_fromUtf8("Point_Tab")) + self.gridLayout_10 = QtGui.QGridLayout(self.Point_Tab) + self.gridLayout_10.setObjectName(_fromUtf8("gridLayout_10")) + self.tabWidget = QtGui.QTabWidget(self.Point_Tab) + self.tabWidget.setObjectName(_fromUtf8("tabWidget")) + self.Point_Tab1_3 = QtGui.QWidget() + self.Point_Tab1_3.setObjectName(_fromUtf8("Point_Tab1_3")) + self.gridLayout_11 = QtGui.QGridLayout(self.Point_Tab1_3) + self.gridLayout_11.setObjectName(_fromUtf8("gridLayout_11")) + self.horizontalLayout_46 = QtGui.QHBoxLayout() + self.horizontalLayout_46.setObjectName(_fromUtf8("horizontalLayout_46")) + self.button_object_center = QtGui.QPushButton(self.Point_Tab1_3) icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerCirclePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_circle_center.setIcon(icon2) - self.button_circle_center.setIconSize(QtCore.QSize(32, 32)) - self.button_circle_center.setObjectName(_fromUtf8("button_circle_center")) - self.gridLayout_68.addWidget(self.button_circle_center, 4, 0, 1, 1) - self.button_point_line_point = QtGui.QPushButton(self.Point_Tab1_2) + 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_46.addWidget(self.button_object_center) + self.checkBox_object_center = QtGui.QCheckBox(self.Point_Tab1_3) + self.checkBox_object_center.setObjectName(_fromUtf8("checkBox_object_center")) + self.horizontalLayout_46.addWidget(self.checkBox_object_center) + self.gridLayout_11.addLayout(self.horizontalLayout_46, 0, 0, 1, 1) + self.button_Npoints_center = QtGui.QPushButton(self.Point_Tab1_3) icon3 = QtGui.QIcon() - icon3.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_line_point.setIcon(icon3) - self.button_point_line_point.setIconSize(QtCore.QSize(32, 32)) - self.button_point_line_point.setObjectName(_fromUtf8("button_point_line_point")) - self.gridLayout_68.addWidget(self.button_point_line_point, 9, 0, 1, 1) - self.button_face_center = QtGui.QPushButton(self.Point_Tab1_2) - icon4 = QtGui.QIcon() - icon4.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_face_center.setIcon(icon4) - self.button_face_center.setIconSize(QtCore.QSize(32, 32)) - self.button_face_center.setObjectName(_fromUtf8("button_face_center")) - self.gridLayout_68.addWidget(self.button_face_center, 5, 0, 1, 1) + icon3.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_Npoints_center.setIcon(icon3) + self.button_Npoints_center.setIconSize(QtCore.QSize(32, 32)) + self.button_Npoints_center.setObjectName(_fromUtf8("button_Npoints_center")) + self.gridLayout_11.addWidget(self.button_Npoints_center, 1, 0, 1, 1) self.horizontalLayout_45 = QtGui.QHBoxLayout() self.horizontalLayout_45.setObjectName(_fromUtf8("horizontalLayout_45")) - self.button_line_center = QtGui.QPushButton(self.Point_Tab1_2) + self.button_line_center = QtGui.QPushButton(self.Point_Tab1_3) self.button_line_center.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon5 = QtGui.QIcon() - icon5.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_center.setIcon(icon5) + icon4 = QtGui.QIcon() + icon4.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_center.setIcon(icon4) self.button_line_center.setIconSize(QtCore.QSize(32, 32)) self.button_line_center.setObjectName(_fromUtf8("button_line_center")) self.horizontalLayout_45.addWidget(self.button_line_center) - self.spin_line_center = QtGui.QSpinBox(self.Point_Tab1_2) + self.spin_line_center = QtGui.QSpinBox(self.Point_Tab1_3) self.spin_line_center.setMinimumSize(QtCore.QSize(40, 0)) self.spin_line_center.setMaximumSize(QtCore.QSize(50, 16777215)) self.spin_line_center.setMinimum(2) @@ -141,79 +144,80 @@ class Ui_Form(object): self.spin_line_center.setSingleStep(1) self.spin_line_center.setObjectName(_fromUtf8("spin_line_center")) self.horizontalLayout_45.addWidget(self.spin_line_center) - self.gridLayout_68.addLayout(self.horizontalLayout_45, 2, 0, 1, 1) - self.button_Npoints_center = QtGui.QPushButton(self.Point_Tab1_2) - icon6 = QtGui.QIcon() - icon6.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_Npoints_center.setIcon(icon6) - self.button_Npoints_center.setIconSize(QtCore.QSize(32, 32)) - self.button_Npoints_center.setObjectName(_fromUtf8("button_Npoints_center")) - self.gridLayout_68.addWidget(self.button_Npoints_center, 1, 0, 1, 1) - self.button_line_face_point = QtGui.QPushButton(self.Point_Tab1_2) - icon7 = QtGui.QIcon() - icon7.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_face_point.setIcon(icon7) - self.button_line_face_point.setIconSize(QtCore.QSize(32, 32)) - self.button_line_face_point.setObjectName(_fromUtf8("button_line_face_point")) - self.gridLayout_68.addWidget(self.button_line_face_point, 6, 0, 1, 1) - self.horizontalLayout_46 = QtGui.QHBoxLayout() - self.horizontalLayout_46.setObjectName(_fromUtf8("horizontalLayout_46")) - self.button_object_center = QtGui.QPushButton(self.Point_Tab1_2) - icon8 = QtGui.QIcon() - icon8.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_center.setIcon(icon8) - self.button_object_center.setIconSize(QtCore.QSize(32, 32)) - self.button_object_center.setObjectName(_fromUtf8("button_object_center")) - self.horizontalLayout_46.addWidget(self.button_object_center) - self.checkBox_object_center = QtGui.QCheckBox(self.Point_Tab1_2) - self.checkBox_object_center.setObjectName(_fromUtf8("checkBox_object_center")) - self.horizontalLayout_46.addWidget(self.checkBox_object_center) - self.gridLayout_68.addLayout(self.horizontalLayout_46, 0, 0, 1, 1) - self.button_line_extrema = QtGui.QPushButton(self.Point_Tab1_2) - icon9 = QtGui.QIcon() - icon9.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_extremaLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_extrema.setIcon(icon9) + self.gridLayout_11.addLayout(self.horizontalLayout_45, 2, 0, 1, 1) + self.button_line_extrema = QtGui.QPushButton(self.Point_Tab1_3) + icon5 = QtGui.QIcon() + icon5.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_extremaLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_extrema.setIcon(icon5) self.button_line_extrema.setIconSize(QtCore.QSize(32, 32)) self.button_line_extrema.setObjectName(_fromUtf8("button_line_extrema")) - self.gridLayout_68.addWidget(self.button_line_extrema, 3, 0, 1, 1) - self.button_point_face_point = QtGui.QPushButton(self.Point_Tab1_2) - 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) + self.gridLayout_11.addWidget(self.button_line_extrema, 3, 0, 1, 1) + self.button_circle_center = QtGui.QPushButton(self.Point_Tab1_3) + icon6 = QtGui.QIcon() + icon6.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerCirclePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_circle_center.setIcon(icon6) + self.button_circle_center.setIconSize(QtCore.QSize(32, 32)) + self.button_circle_center.setObjectName(_fromUtf8("button_circle_center")) + self.gridLayout_11.addWidget(self.button_circle_center, 4, 0, 1, 1) + self.button_face_center = QtGui.QPushButton(self.Point_Tab1_3) + 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_11.addWidget(self.button_face_center, 5, 0, 1, 1) + self.button_line_face_point = QtGui.QPushButton(self.Point_Tab1_3) + 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_11.addWidget(self.button_line_face_point, 6, 0, 1, 1) + self.button_point_face_point = QtGui.QPushButton(self.Point_Tab1_3) + icon9 = QtGui.QIcon() + icon9.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointFacePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_face_point.setIcon(icon9) self.button_point_face_point.setIconSize(QtCore.QSize(32, 32)) self.button_point_face_point.setObjectName(_fromUtf8("button_point_face_point")) - self.gridLayout_68.addWidget(self.button_point_face_point, 8, 0, 1, 1) + self.gridLayout_11.addWidget(self.button_point_face_point, 7, 0, 1, 1) + self.button_point_line_point = QtGui.QPushButton(self.Point_Tab1_3) + icon10 = QtGui.QIcon() + icon10.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_line_point.setIcon(icon10) + self.button_point_line_point.setIconSize(QtCore.QSize(32, 32)) + self.button_point_line_point.setObjectName(_fromUtf8("button_point_line_point")) + self.gridLayout_11.addWidget(self.button_point_line_point, 8, 0, 1, 1) + spacerItem1 = QtGui.QSpacerItem(20, 252, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_11.addItem(spacerItem1, 9, 0, 1, 1) + self.tabWidget.addTab(self.Point_Tab1_3, _fromUtf8("")) + self.Point_Tab2_3 = QtGui.QWidget() + self.Point_Tab2_3.setObjectName(_fromUtf8("Point_Tab2_3")) + self.gridLayout_13 = QtGui.QGridLayout(self.Point_Tab2_3) + self.gridLayout_13.setObjectName(_fromUtf8("gridLayout_13")) + self.button_twolines_point = QtGui.QPushButton(self.Point_Tab2_3) icon11 = QtGui.QIcon() - icon11.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_point.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.Point_Tab1_2, icon11, _fromUtf8("")) - self.Point_Tab2_2 = QtGui.QWidget() - self.Point_Tab2_2.setObjectName(_fromUtf8("Point_Tab2_2")) - self.gridLayout_70 = QtGui.QGridLayout(self.Point_Tab2_2) - self.gridLayout_70.setObjectName(_fromUtf8("gridLayout_70")) - self.button_twolines_point = QtGui.QPushButton(self.Point_Tab2_2) - icon12 = QtGui.QIcon() - icon12.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twolines_point.setIcon(icon12) + 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_70.addWidget(self.button_twolines_point, 0, 0, 1, 1) + self.gridLayout_13.addWidget(self.button_twolines_point, 0, 0, 1, 1) self.horizontalLayout_47 = QtGui.QHBoxLayout() self.horizontalLayout_47.setSizeConstraint(QtGui.QLayout.SetFixedSize) self.horizontalLayout_47.setObjectName(_fromUtf8("horizontalLayout_47")) - self.button_point_on_line = QtGui.QPushButton(self.Point_Tab2_2) + self.button_point_on_line = QtGui.QPushButton(self.Point_Tab2_3) 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) self.button_point_on_line.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon13 = QtGui.QIcon() - icon13.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_alongLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_on_line.setIcon(icon13) + icon12 = QtGui.QIcon() + icon12.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_alongLinePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_on_line.setIcon(icon12) self.button_point_on_line.setIconSize(QtCore.QSize(32, 32)) self.button_point_on_line.setObjectName(_fromUtf8("button_point_on_line")) self.horizontalLayout_47.addWidget(self.button_point_on_line) - self.distance_point_on_line = QtGui.QLineEdit(self.Point_Tab2_2) + self.distance_point_on_line = QtGui.QLineEdit(self.Point_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -223,17 +227,17 @@ 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_47.addWidget(self.distance_point_on_line) - self.gridLayout_70.addLayout(self.horizontalLayout_47, 1, 0, 1, 1) + self.gridLayout_13.addLayout(self.horizontalLayout_47, 1, 0, 1, 1) self.horizontalLayout_48 = QtGui.QHBoxLayout() self.horizontalLayout_48.setObjectName(_fromUtf8("horizontalLayout_48")) - self.button_distPoint = QtGui.QPushButton(self.Point_Tab2_2) - icon14 = QtGui.QIcon() - icon14.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distPointPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_distPoint.setIcon(icon14) + self.button_distPoint = QtGui.QPushButton(self.Point_Tab2_3) + icon13 = QtGui.QIcon() + icon13.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distPointPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_distPoint.setIcon(icon13) self.button_distPoint.setIconSize(QtCore.QSize(32, 32)) self.button_distPoint.setObjectName(_fromUtf8("button_distPoint")) self.horizontalLayout_48.addWidget(self.button_distPoint) - self.dist_point = QtGui.QLineEdit(self.Point_Tab2_2) + self.dist_point = QtGui.QLineEdit(self.Point_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -243,7 +247,7 @@ class Ui_Form(object): self.dist_point.setMaximumSize(QtCore.QSize(40, 16777215)) self.dist_point.setObjectName(_fromUtf8("dist_point")) self.horizontalLayout_48.addWidget(self.dist_point) - self.spin_dist_point = QtGui.QSpinBox(self.Point_Tab2_2) + self.spin_dist_point = QtGui.QSpinBox(self.Point_Tab2_3) self.spin_dist_point.setMinimumSize(QtCore.QSize(30, 0)) self.spin_dist_point.setMaximumSize(QtCore.QSize(30, 16777215)) self.spin_dist_point.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) @@ -254,18 +258,18 @@ class Ui_Form(object): self.spin_dist_point.setProperty("value", 1) self.spin_dist_point.setObjectName(_fromUtf8("spin_dist_point")) self.horizontalLayout_48.addWidget(self.spin_dist_point) - self.gridLayout_70.addLayout(self.horizontalLayout_48, 2, 0, 1, 1) + self.gridLayout_13.addLayout(self.horizontalLayout_48, 2, 0, 1, 1) self.horizontalLayout_49 = QtGui.QHBoxLayout() self.horizontalLayout_49.setObjectName(_fromUtf8("horizontalLayout_49")) - self.button_cut_wire_point = QtGui.QPushButton(self.Point_Tab2_2) + self.button_cut_wire_point = QtGui.QPushButton(self.Point_Tab2_3) self.button_cut_wire_point.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon15 = QtGui.QIcon() - icon15.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutWirePoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cut_wire_point.setIcon(icon15) + icon14 = QtGui.QIcon() + icon14.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutWirePoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_wire_point.setIcon(icon14) self.button_cut_wire_point.setIconSize(QtCore.QSize(32, 32)) self.button_cut_wire_point.setObjectName(_fromUtf8("button_cut_wire_point")) self.horizontalLayout_49.addWidget(self.button_cut_wire_point) - self.spin_wire_cut_point = QtGui.QSpinBox(self.Point_Tab2_2) + self.spin_wire_cut_point = QtGui.QSpinBox(self.Point_Tab2_3) 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) @@ -273,105 +277,195 @@ class Ui_Form(object): self.spin_wire_cut_point.setSingleStep(1) self.spin_wire_cut_point.setObjectName(_fromUtf8("spin_wire_cut_point")) self.horizontalLayout_49.addWidget(self.spin_wire_cut_point) - self.gridLayout_70.addLayout(self.horizontalLayout_49, 3, 0, 1, 1) - self.button_click_for_point = QtGui.QRadioButton(self.Point_Tab2_2) - icon16 = QtGui.QIcon() - icon16.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_click_for_point.setIcon(icon16) + self.gridLayout_13.addLayout(self.horizontalLayout_49, 3, 0, 1, 1) + self.button_click_for_point = QtGui.QRadioButton(self.Point_Tab2_3) + icon15 = QtGui.QIcon() + icon15.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_click_for_point.setIcon(icon15) 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_70.addWidget(self.button_click_for_point, 4, 0, 1, 1) - self.button_object_base_point = QtGui.QPushButton(self.Point_Tab2_2) - icon17 = QtGui.QIcon() - icon17.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectBasePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_base_point.setIcon(icon17) + self.gridLayout_13.addWidget(self.button_click_for_point, 4, 0, 1, 1) + self.button_object_base_point = QtGui.QPushButton(self.Point_Tab2_3) + icon16 = QtGui.QIcon() + icon16.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectBasePoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_base_point.setIcon(icon16) self.button_object_base_point.setIconSize(QtCore.QSize(32, 32)) self.button_object_base_point.setObjectName(_fromUtf8("button_object_base_point")) - self.gridLayout_70.addWidget(self.button_object_base_point, 5, 0, 1, 1) - self.button_point_to_sketch = QtGui.QPushButton(self.Point_Tab2_2) + self.gridLayout_13.addWidget(self.button_object_base_point, 5, 0, 1, 1) + self.button_object_center_mass_point = QtGui.QPushButton(self.Point_Tab2_3) + icon17 = QtGui.QIcon() + icon17.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectCenterMassPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_center_mass_point.setIcon(icon17) + self.button_object_center_mass_point.setIconSize(QtCore.QSize(32, 32)) + self.button_object_center_mass_point.setObjectName(_fromUtf8("button_object_center_mass_point")) + self.gridLayout_13.addWidget(self.button_object_center_mass_point, 6, 0, 1, 1) + self.button_object_Npoint = QtGui.QPushButton(self.Point_Tab2_3) icon18 = QtGui.QIcon() - icon18.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2Sketch.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_to_sketch.setIcon(icon18) + icon18.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectNPoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_Npoint.setIcon(icon18) + self.button_object_Npoint.setIconSize(QtCore.QSize(32, 32)) + self.button_object_Npoint.setObjectName(_fromUtf8("button_object_Npoint")) + self.gridLayout_13.addWidget(self.button_object_Npoint, 7, 0, 1, 1) + self.button_point_to_sketch = QtGui.QPushButton(self.Point_Tab2_3) + icon19 = QtGui.QIcon() + icon19.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2Sketch.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_to_sketch.setIcon(icon19) self.button_point_to_sketch.setIconSize(QtCore.QSize(32, 32)) self.button_point_to_sketch.setObjectName(_fromUtf8("button_point_to_sketch")) - self.gridLayout_70.addWidget(self.button_point_to_sketch, 6, 0, 1, 1) - spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_70.addItem(spacerItem2, 7, 0, 1, 1) - self.tabWidget_7.addTab(self.Point_Tab2_2, icon11, _fromUtf8("")) - self.Axis_Tab1_2 = QtGui.QWidget() - self.Axis_Tab1_2.setObjectName(_fromUtf8("Axis_Tab1_2")) - self.gridLayout_4 = QtGui.QGridLayout(self.Axis_Tab1_2) - self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) - self.button_object_axis = QtGui.QPushButton(self.Axis_Tab1_2) - 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_4.addWidget(self.button_object_axis, 0, 0, 1, 1) + self.gridLayout_13.addWidget(self.button_point_to_sketch, 8, 0, 1, 1) + spacerItem2 = QtGui.QSpacerItem(20, 255, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_13.addItem(spacerItem2, 9, 0, 1, 1) + self.tabWidget.addTab(self.Point_Tab2_3, _fromUtf8("")) + self.Point_Tab3_3 = QtGui.QWidget() + self.Point_Tab3_3.setObjectName(_fromUtf8("Point_Tab3_3")) + self.gridLayout_12 = QtGui.QGridLayout(self.Point_Tab3_3) + self.gridLayout_12.setObjectName(_fromUtf8("gridLayout_12")) + self.button_points_load = QtGui.QPushButton(self.Point_Tab3_3) + icon20 = QtGui.QIcon() + icon20.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointsSetLoad.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_points_load.setIcon(icon20) + self.button_points_load.setIconSize(QtCore.QSize(32, 32)) + self.button_points_load.setObjectName(_fromUtf8("button_points_load")) + self.gridLayout_12.addWidget(self.button_points_load, 0, 0, 1, 1) + self.button_points_save = QtGui.QPushButton(self.Point_Tab3_3) + icon21 = QtGui.QIcon() + icon21.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointsSetSave.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_points_save.setIcon(icon21) + self.button_points_save.setIconSize(QtCore.QSize(32, 32)) + self.button_points_save.setObjectName(_fromUtf8("button_points_save")) + self.gridLayout_12.addWidget(self.button_points_save, 1, 0, 1, 1) + spacerItem3 = QtGui.QSpacerItem(20, 579, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_12.addItem(spacerItem3, 2, 0, 1, 1) + self.tabWidget.addTab(self.Point_Tab3_3, _fromUtf8("")) + self.gridLayout_10.addWidget(self.tabWidget, 0, 0, 1, 1) + icon22 = QtGui.QIcon() + icon22.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_point.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.Point_Tab, icon22, _fromUtf8("")) + self.Axis_Tab = QtGui.QWidget() + self.Axis_Tab.setObjectName(_fromUtf8("Axis_Tab")) + self.gridLayout_14 = QtGui.QGridLayout(self.Axis_Tab) + self.gridLayout_14.setObjectName(_fromUtf8("gridLayout_14")) + self.tabWidget_2 = QtGui.QTabWidget(self.Axis_Tab) + self.tabWidget_2.setObjectName(_fromUtf8("tabWidget_2")) + self.Axis_Tab1_3 = QtGui.QWidget() + self.Axis_Tab1_3.setObjectName(_fromUtf8("Axis_Tab1_3")) + self.gridLayout_15 = QtGui.QGridLayout(self.Axis_Tab1_3) + self.gridLayout_15.setObjectName(_fromUtf8("gridLayout_15")) self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.button_twopoints_axis = QtGui.QPushButton(self.Axis_Tab1_2) + self.button_twopoints_axis = QtGui.QPushButton(self.Axis_Tab1_3) 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) self.button_twopoints_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon20 = QtGui.QIcon() - icon20.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2pointsLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twopoints_axis.setIcon(icon20) + icon23 = QtGui.QIcon() + icon23.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2pointsLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twopoints_axis.setIcon(icon23) self.button_twopoints_axis.setIconSize(QtCore.QSize(32, 32)) self.button_twopoints_axis.setObjectName(_fromUtf8("button_twopoints_axis")) self.horizontalLayout.addWidget(self.button_twopoints_axis) - self.extension_twopoints_axis = QtGui.QLineEdit(self.Axis_Tab1_2) + self.extension_twopoints_axis = QtGui.QLineEdit(self.Axis_Tab1_3) self.extension_twopoints_axis.setMaximumSize(QtCore.QSize(40, 16777215)) self.extension_twopoints_axis.setObjectName(_fromUtf8("extension_twopoints_axis")) self.horizontalLayout.addWidget(self.extension_twopoints_axis) - self.gridLayout_4.addLayout(self.horizontalLayout, 1, 0, 1, 1) - self.button_Npoints_axis = QtGui.QPushButton(self.Axis_Tab1_2) - icon21 = QtGui.QIcon() - icon21.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_Npoints_axis.setIcon(icon21) + self.gridLayout_15.addLayout(self.horizontalLayout, 1, 0, 1, 1) + spacerItem4 = QtGui.QSpacerItem(20, 233, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_15.addItem(spacerItem4, 7, 0, 1, 1) + self.button_object_axis = QtGui.QPushButton(self.Axis_Tab1_3) + icon24 = QtGui.QIcon() + icon24.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_axis.setIcon(icon24) + self.button_object_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_object_axis.setObjectName(_fromUtf8("button_object_axis")) + self.gridLayout_15.addWidget(self.button_object_axis, 0, 0, 1, 1) + self.horizontalLayout_53 = QtGui.QHBoxLayout() + self.horizontalLayout_53.setObjectName(_fromUtf8("horizontalLayout_53")) + self.button_line_point_axis = QtGui.QPushButton(self.Axis_Tab1_3) + 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) + self.button_line_point_axis.setMinimumSize(QtCore.QSize(0, 0)) + self.button_line_point_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon25 = QtGui.QIcon() + icon25.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_point_axis.setIcon(icon25) + self.button_line_point_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_line_point_axis.setObjectName(_fromUtf8("button_line_point_axis")) + self.horizontalLayout_53.addWidget(self.button_line_point_axis) + self.extension_line_point_axis = QtGui.QLineEdit(self.Axis_Tab1_3) + self.extension_line_point_axis.setMaximumSize(QtCore.QSize(40, 16777215)) + self.extension_line_point_axis.setObjectName(_fromUtf8("extension_line_point_axis")) + self.horizontalLayout_53.addWidget(self.extension_line_point_axis) + self.gridLayout_15.addLayout(self.horizontalLayout_53, 5, 0, 1, 1) + self.button_Npoints_axis = QtGui.QPushButton(self.Axis_Tab1_3) + icon26 = QtGui.QIcon() + icon26.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_Npoints_axis.setIcon(icon26) self.button_Npoints_axis.setIconSize(QtCore.QSize(32, 32)) self.button_Npoints_axis.setObjectName(_fromUtf8("button_Npoints_axis")) - self.gridLayout_4.addWidget(self.button_Npoints_axis, 2, 0, 1, 1) + self.gridLayout_15.addWidget(self.button_Npoints_axis, 2, 0, 1, 1) + self.horizontalLayout_52 = QtGui.QHBoxLayout() + self.horizontalLayout_52.setObjectName(_fromUtf8("horizontalLayout_52")) + self.button_point_line_axis = QtGui.QPushButton(self.Axis_Tab1_3) + self.button_point_line_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) + icon27 = QtGui.QIcon() + icon27.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLineAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_point_line_axis.setIcon(icon27) + self.button_point_line_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_point_line_axis.setObjectName(_fromUtf8("button_point_line_axis")) + self.horizontalLayout_52.addWidget(self.button_point_line_axis) + self.extension_line = QtGui.QLineEdit(self.Axis_Tab1_3) + self.extension_line.setMaximumSize(QtCore.QSize(40, 16777215)) + self.extension_line.setObjectName(_fromUtf8("extension_line")) + self.horizontalLayout_52.addWidget(self.extension_line) + self.point_loc_comboBox = QtGui.QComboBox(self.Axis_Tab1_3) + 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_52.addWidget(self.point_loc_comboBox) + self.gridLayout_15.addLayout(self.horizontalLayout_52, 4, 0, 1, 1) self.horizontalLayout_51 = QtGui.QHBoxLayout() self.horizontalLayout_51.setObjectName(_fromUtf8("horizontalLayout_51")) self.verticalLayout_3 = QtGui.QVBoxLayout() self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3")) - self.button_cylinder_axis = QtGui.QPushButton(self.Axis_Tab1_2) + self.button_cylinder_axis = QtGui.QPushButton(self.Axis_Tab1_3) self.button_cylinder_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon22 = QtGui.QIcon() - icon22.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinderAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cylinder_axis.setIcon(icon22) + icon28 = QtGui.QIcon() + icon28.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinderAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cylinder_axis.setIcon(icon28) self.button_cylinder_axis.setIconSize(QtCore.QSize(32, 32)) self.button_cylinder_axis.setObjectName(_fromUtf8("button_cylinder_axis")) self.verticalLayout_3.addWidget(self.button_cylinder_axis) - self.button_plane_axis = QtGui.QPushButton(self.Axis_Tab1_2) + self.button_plane_axis = QtGui.QPushButton(self.Axis_Tab1_3) self.button_plane_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon23 = QtGui.QIcon() - icon23.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_plane_axis.setIcon(icon23) + icon29 = QtGui.QIcon() + icon29.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_plane_axis.setIcon(icon29) self.button_plane_axis.setIconSize(QtCore.QSize(32, 32)) self.button_plane_axis.setObjectName(_fromUtf8("button_plane_axis")) self.verticalLayout_3.addWidget(self.button_plane_axis) - self.button_face_normal = QtGui.QPushButton(self.Axis_Tab1_2) + self.button_face_normal = QtGui.QPushButton(self.Axis_Tab1_3) 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)) - icon24 = QtGui.QIcon() - icon24.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceNormal.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_face_normal.setIcon(icon24) + icon30 = QtGui.QIcon() + icon30.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceNormal.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_face_normal.setIcon(icon30) self.button_face_normal.setIconSize(QtCore.QSize(32, 32)) self.button_face_normal.setObjectName(_fromUtf8("button_face_normal")) self.verticalLayout_3.addWidget(self.button_face_normal) self.horizontalLayout_51.addLayout(self.verticalLayout_3) - self.frame_8 = QtGui.QFrame(self.Axis_Tab1_2) + self.frame_8 = QtGui.QFrame(self.Axis_Tab1_3) self.frame_8.setMinimumSize(QtCore.QSize(60, 0)) self.frame_8.setMaximumSize(QtCore.QSize(50, 16777215)) self.frame_8.setFrameShape(QtGui.QFrame.StyledPanel) @@ -385,97 +479,50 @@ class Ui_Form(object): self.extension_face_normal.setObjectName(_fromUtf8("extension_face_normal")) self.gridLayout_72.addWidget(self.extension_face_normal, 0, 0, 1, 1) self.horizontalLayout_51.addWidget(self.frame_8) - self.gridLayout_4.addLayout(self.horizontalLayout_51, 3, 0, 1, 1) - self.horizontalLayout_52 = QtGui.QHBoxLayout() - self.horizontalLayout_52.setObjectName(_fromUtf8("horizontalLayout_52")) - self.button_point_line_axis = QtGui.QPushButton(self.Axis_Tab1_2) - self.button_point_line_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon25 = QtGui.QIcon() - icon25.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointLineAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_point_line_axis.setIcon(icon25) - self.button_point_line_axis.setIconSize(QtCore.QSize(32, 32)) - self.button_point_line_axis.setObjectName(_fromUtf8("button_point_line_axis")) - self.horizontalLayout_52.addWidget(self.button_point_line_axis) - self.extension_line = QtGui.QLineEdit(self.Axis_Tab1_2) - self.extension_line.setMaximumSize(QtCore.QSize(40, 16777215)) - self.extension_line.setObjectName(_fromUtf8("extension_line")) - self.horizontalLayout_52.addWidget(self.extension_line) - self.point_loc_comboBox = QtGui.QComboBox(self.Axis_Tab1_2) - 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_52.addWidget(self.point_loc_comboBox) - self.gridLayout_4.addLayout(self.horizontalLayout_52, 4, 0, 1, 1) - self.horizontalLayout_53 = QtGui.QHBoxLayout() - self.horizontalLayout_53.setObjectName(_fromUtf8("horizontalLayout_53")) - self.button_line_point_axis = QtGui.QPushButton(self.Axis_Tab1_2) - 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) - self.button_line_point_axis.setMinimumSize(QtCore.QSize(0, 0)) - self.button_line_point_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon26 = QtGui.QIcon() - icon26.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_point_axis.setIcon(icon26) - self.button_line_point_axis.setIconSize(QtCore.QSize(32, 32)) - self.button_line_point_axis.setObjectName(_fromUtf8("button_line_point_axis")) - self.horizontalLayout_53.addWidget(self.button_line_point_axis) - self.extension_line_point_axis = QtGui.QLineEdit(self.Axis_Tab1_2) - self.extension_line_point_axis.setMaximumSize(QtCore.QSize(40, 16777215)) - self.extension_line_point_axis.setObjectName(_fromUtf8("extension_line_point_axis")) - self.horizontalLayout_53.addWidget(self.extension_line_point_axis) - self.gridLayout_4.addLayout(self.horizontalLayout_53, 5, 0, 1, 1) - self.button_twolines_axis = QtGui.QPushButton(self.Axis_Tab1_2) - icon27 = QtGui.QIcon() - icon27.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_twoLinesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twolines_axis.setIcon(icon27) + self.gridLayout_15.addLayout(self.horizontalLayout_51, 3, 0, 1, 1) + self.button_twolines_axis = QtGui.QPushButton(self.Axis_Tab1_3) + icon31 = QtGui.QIcon() + icon31.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_twoLinesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twolines_axis.setIcon(icon31) self.button_twolines_axis.setIconSize(QtCore.QSize(32, 32)) self.button_twolines_axis.setObjectName(_fromUtf8("button_twolines_axis")) - self.gridLayout_4.addWidget(self.button_twolines_axis, 6, 0, 1, 1) - self.button_plane_point_line_axis = QtGui.QPushButton(self.Axis_Tab1_2) - icon28 = QtGui.QIcon() - icon28.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_plane_point_line_axis.setIcon(icon28) + self.gridLayout_15.addWidget(self.button_twolines_axis, 6, 0, 1, 1) + self.tabWidget_2.addTab(self.Axis_Tab1_3, _fromUtf8("")) + self.Axis_Tab2_3 = QtGui.QWidget() + self.Axis_Tab2_3.setObjectName(_fromUtf8("Axis_Tab2_3")) + self.gridLayout_4 = QtGui.QGridLayout(self.Axis_Tab2_3) + self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) + self.button_plane_point_line_axis = QtGui.QPushButton(self.Axis_Tab2_3) + icon32 = QtGui.QIcon() + icon32.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePointAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_plane_point_line_axis.setIcon(icon32) 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_4.addWidget(self.button_plane_point_line_axis, 7, 0, 1, 1) - spacerItem3 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_4.addItem(spacerItem3, 8, 0, 1, 1) - icon29 = QtGui.QIcon() - icon29.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_axis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.Axis_Tab1_2, icon29, _fromUtf8("")) - self.Axis_Tab2_2 = QtGui.QWidget() - self.Axis_Tab2_2.setObjectName(_fromUtf8("Axis_Tab2_2")) - self.gridLayout_73 = QtGui.QGridLayout(self.Axis_Tab2_2) - self.gridLayout_73.setObjectName(_fromUtf8("gridLayout_73")) - self.button_line_plane_axis = QtGui.QPushButton(self.Axis_Tab2_2) - icon30 = QtGui.QIcon() - icon30.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePlaneAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_line_plane_axis.setIcon(icon30) + self.gridLayout_4.addWidget(self.button_plane_point_line_axis, 0, 0, 1, 1) + self.button_line_plane_axis = QtGui.QPushButton(self.Axis_Tab2_3) + icon33 = QtGui.QIcon() + icon33.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePlaneAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_line_plane_axis.setIcon(icon33) self.button_line_plane_axis.setIconSize(QtCore.QSize(32, 32)) self.button_line_plane_axis.setObjectName(_fromUtf8("button_line_plane_axis")) - self.gridLayout_73.addWidget(self.button_line_plane_axis, 0, 0, 1, 1) - self.button_twoplanes_axis = QtGui.QPushButton(self.Axis_Tab2_2) - icon31 = QtGui.QIcon() - icon31.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2PlanesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_twoplanes_axis.setIcon(icon31) + self.gridLayout_4.addWidget(self.button_line_plane_axis, 1, 0, 1, 1) + self.button_twoplanes_axis = QtGui.QPushButton(self.Axis_Tab2_3) + icon34 = QtGui.QIcon() + icon34.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_2PlanesAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twoplanes_axis.setIcon(icon34) self.button_twoplanes_axis.setIconSize(QtCore.QSize(32, 32)) self.button_twoplanes_axis.setObjectName(_fromUtf8("button_twoplanes_axis")) - self.gridLayout_73.addWidget(self.button_twoplanes_axis, 1, 0, 1, 1) + self.gridLayout_4.addWidget(self.button_twoplanes_axis, 2, 0, 1, 1) self.horizontalLayout_54 = QtGui.QHBoxLayout() self.horizontalLayout_54.setObjectName(_fromUtf8("horizontalLayout_54")) - self.button_distLine = QtGui.QPushButton(self.Axis_Tab2_2) - icon32 = QtGui.QIcon() - icon32.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distAxisAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_distLine.setIcon(icon32) + self.button_distLine = QtGui.QPushButton(self.Axis_Tab2_3) + icon35 = QtGui.QIcon() + icon35.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distAxisAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_distLine.setIcon(icon35) self.button_distLine.setIconSize(QtCore.QSize(32, 32)) self.button_distLine.setObjectName(_fromUtf8("button_distLine")) self.horizontalLayout_54.addWidget(self.button_distLine) - self.dist_line = QtGui.QLineEdit(self.Axis_Tab2_2) + self.dist_line = QtGui.QLineEdit(self.Axis_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -485,7 +532,7 @@ class Ui_Form(object): self.dist_line.setMaximumSize(QtCore.QSize(40, 16777215)) self.dist_line.setObjectName(_fromUtf8("dist_line")) self.horizontalLayout_54.addWidget(self.dist_line) - self.spin_dist_line = QtGui.QSpinBox(self.Axis_Tab2_2) + self.spin_dist_line = QtGui.QSpinBox(self.Axis_Tab2_3) self.spin_dist_line.setMinimumSize(QtCore.QSize(30, 0)) self.spin_dist_line.setMaximumSize(QtCore.QSize(30, 16777215)) self.spin_dist_line.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) @@ -496,17 +543,17 @@ class Ui_Form(object): self.spin_dist_line.setProperty("value", 1) self.spin_dist_line.setObjectName(_fromUtf8("spin_dist_line")) self.horizontalLayout_54.addWidget(self.spin_dist_line) - self.gridLayout_73.addLayout(self.horizontalLayout_54, 2, 0, 1, 1) + self.gridLayout_4.addLayout(self.horizontalLayout_54, 3, 0, 1, 1) self.horizontalLayout_55 = QtGui.QHBoxLayout() self.horizontalLayout_55.setObjectName(_fromUtf8("horizontalLayout_55")) - self.button_angleLine = QtGui.QPushButton(self.Axis_Tab2_2) - icon33 = QtGui.QIcon() - icon33.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_angleAxisAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_angleLine.setIcon(icon33) + self.button_angleLine = QtGui.QPushButton(self.Axis_Tab2_3) + icon36 = QtGui.QIcon() + icon36.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_angleAxisAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_angleLine.setIcon(icon36) self.button_angleLine.setIconSize(QtCore.QSize(32, 32)) self.button_angleLine.setObjectName(_fromUtf8("button_angleLine")) self.horizontalLayout_55.addWidget(self.button_angleLine) - self.angle_line = QtGui.QLineEdit(self.Axis_Tab2_2) + self.angle_line = QtGui.QLineEdit(self.Axis_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -516,7 +563,7 @@ class Ui_Form(object): self.angle_line.setMaximumSize(QtCore.QSize(40, 16777215)) self.angle_line.setObjectName(_fromUtf8("angle_line")) self.horizontalLayout_55.addWidget(self.angle_line) - self.spin_angle_line = QtGui.QSpinBox(self.Axis_Tab2_2) + self.spin_angle_line = QtGui.QSpinBox(self.Axis_Tab2_3) self.spin_angle_line.setMinimumSize(QtCore.QSize(30, 0)) self.spin_angle_line.setMaximumSize(QtCore.QSize(30, 16777215)) self.spin_angle_line.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) @@ -527,18 +574,18 @@ class Ui_Form(object): self.spin_angle_line.setProperty("value", 1) self.spin_angle_line.setObjectName(_fromUtf8("spin_angle_line")) self.horizontalLayout_55.addWidget(self.spin_angle_line) - self.gridLayout_73.addLayout(self.horizontalLayout_55, 3, 0, 1, 1) + self.gridLayout_4.addLayout(self.horizontalLayout_55, 4, 0, 1, 1) self.horizontalLayout_56 = QtGui.QHBoxLayout() self.horizontalLayout_56.setObjectName(_fromUtf8("horizontalLayout_56")) - self.button_cut_wire_axis = QtGui.QPushButton(self.Axis_Tab2_2) + self.button_cut_wire_axis = QtGui.QPushButton(self.Axis_Tab2_3) self.button_cut_wire_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon34 = QtGui.QIcon() - icon34.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutWireAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cut_wire_axis.setIcon(icon34) + icon37 = QtGui.QIcon() + icon37.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutWireAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_wire_axis.setIcon(icon37) self.button_cut_wire_axis.setIconSize(QtCore.QSize(32, 32)) self.button_cut_wire_axis.setObjectName(_fromUtf8("button_cut_wire_axis")) self.horizontalLayout_56.addWidget(self.button_cut_wire_axis) - self.spin_wire_cut_axis = QtGui.QSpinBox(self.Axis_Tab2_2) + self.spin_wire_cut_axis = QtGui.QSpinBox(self.Axis_Tab2_3) 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) @@ -546,18 +593,18 @@ class Ui_Form(object): self.spin_wire_cut_axis.setSingleStep(1) self.spin_wire_cut_axis.setObjectName(_fromUtf8("spin_wire_cut_axis")) self.horizontalLayout_56.addWidget(self.spin_wire_cut_axis) - self.gridLayout_73.addLayout(self.horizontalLayout_56, 4, 0, 1, 1) + self.gridLayout_4.addLayout(self.horizontalLayout_56, 5, 0, 1, 1) self.horizontalLayout_57 = QtGui.QHBoxLayout() self.horizontalLayout_57.setObjectName(_fromUtf8("horizontalLayout_57")) - self.button_cut_axis = QtGui.QPushButton(self.Axis_Tab2_2) + self.button_cut_axis = QtGui.QPushButton(self.Axis_Tab2_3) self.button_cut_axis.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon35 = QtGui.QIcon() - icon35.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cut_axis.setIcon(icon35) + icon38 = QtGui.QIcon() + icon38.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_axis.setIcon(icon38) self.button_cut_axis.setIconSize(QtCore.QSize(32, 32)) self.button_cut_axis.setObjectName(_fromUtf8("button_cut_axis")) self.horizontalLayout_57.addWidget(self.button_cut_axis) - self.spin_axis_cut = QtGui.QSpinBox(self.Axis_Tab2_2) + self.spin_axis_cut = QtGui.QSpinBox(self.Axis_Tab2_3) self.spin_axis_cut.setMinimumSize(QtCore.QSize(40, 0)) self.spin_axis_cut.setMaximumSize(QtCore.QSize(50, 16777215)) self.spin_axis_cut.setMinimum(2) @@ -565,22 +612,22 @@ class Ui_Form(object): self.spin_axis_cut.setSingleStep(1) self.spin_axis_cut.setObjectName(_fromUtf8("spin_axis_cut")) self.horizontalLayout_57.addWidget(self.spin_axis_cut) - self.gridLayout_73.addLayout(self.horizontalLayout_57, 5, 0, 1, 1) + self.gridLayout_4.addLayout(self.horizontalLayout_57, 6, 0, 1, 1) self.horizontalLayout_58 = QtGui.QHBoxLayout() self.horizontalLayout_58.setObjectName(_fromUtf8("horizontalLayout_58")) - self.button_extension_axis = QtGui.QPushButton(self.Axis_Tab2_2) + self.button_extension_axis = QtGui.QPushButton(self.Axis_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.button_extension_axis.sizePolicy().hasHeightForWidth()) self.button_extension_axis.setSizePolicy(sizePolicy) - icon36 = QtGui.QIcon() - icon36.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_enlargeLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_extension_axis.setIcon(icon36) + icon39 = QtGui.QIcon() + icon39.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_enlargeLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_extension_axis.setIcon(icon39) self.button_extension_axis.setIconSize(QtCore.QSize(32, 32)) self.button_extension_axis.setObjectName(_fromUtf8("button_extension_axis")) self.horizontalLayout_58.addWidget(self.button_extension_axis) - self.extension_axis = QtGui.QLineEdit(self.Axis_Tab2_2) + self.extension_axis = QtGui.QLineEdit(self.Axis_Tab2_3) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -590,29 +637,124 @@ class Ui_Form(object): self.extension_axis.setMaximumSize(QtCore.QSize(50, 16777215)) self.extension_axis.setObjectName(_fromUtf8("extension_axis")) self.horizontalLayout_58.addWidget(self.extension_axis) - self.gridLayout_73.addLayout(self.horizontalLayout_58, 6, 0, 1, 1) - self.button_click_for_axis = QtGui.QRadioButton(self.Axis_Tab2_2) - icon37 = QtGui.QIcon() - icon37.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_click_for_axis.setIcon(icon37) + self.gridLayout_4.addLayout(self.horizontalLayout_58, 7, 0, 1, 1) + self.button_click_for_axis = QtGui.QRadioButton(self.Axis_Tab2_3) + icon40 = QtGui.QIcon() + icon40.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickLine.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_click_for_axis.setIcon(icon40) self.button_click_for_axis.setIconSize(QtCore.QSize(32, 32)) self.button_click_for_axis.setObjectName(_fromUtf8("button_click_for_axis")) - self.gridLayout_73.addWidget(self.button_click_for_axis, 7, 0, 1, 1) - self.button_object_base_axes = QtGui.QPushButton(self.Axis_Tab2_2) - icon38 = QtGui.QIcon() - icon38.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_baseObjectsAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_base_axes.setIcon(icon38) + self.gridLayout_4.addWidget(self.button_click_for_axis, 8, 0, 1, 1) + spacerItem5 = QtGui.QSpacerItem(20, 238, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_4.addItem(spacerItem5, 9, 0, 1, 1) + self.tabWidget_2.addTab(self.Axis_Tab2_3, _fromUtf8("")) + self.Axis_Tab31_3 = QtGui.QWidget() + self.Axis_Tab31_3.setObjectName(_fromUtf8("Axis_Tab31_3")) + self.gridLayout_16 = QtGui.QGridLayout(self.Axis_Tab31_3) + self.gridLayout_16.setObjectName(_fromUtf8("gridLayout_16")) + self.button_object_base_axes = QtGui.QPushButton(self.Axis_Tab31_3) + icon41 = QtGui.QIcon() + icon41.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_baseObjectsAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_base_axes.setIcon(icon41) self.button_object_base_axes.setIconSize(QtCore.QSize(32, 32)) self.button_object_base_axes.setObjectName(_fromUtf8("button_object_base_axes")) - self.gridLayout_73.addWidget(self.button_object_base_axes, 8, 0, 1, 1) - self.button_line_to_sketch = QtGui.QPushButton(self.Axis_Tab2_2) - self.button_line_to_sketch.setIcon(icon18) + self.gridLayout_16.addWidget(self.button_object_base_axes, 0, 0, 1, 1) + self.button_object_Naxes = QtGui.QPushButton(self.Axis_Tab31_3) + icon42 = QtGui.QIcon() + icon42.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectNAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_Naxes.setIcon(icon42) + self.button_object_Naxes.setIconSize(QtCore.QSize(32, 32)) + self.button_object_Naxes.setObjectName(_fromUtf8("button_object_Naxes")) + self.gridLayout_16.addWidget(self.button_object_Naxes, 1, 0, 1, 1) + self.button_object_3axes = QtGui.QPushButton(self.Axis_Tab31_3) + icon43 = QtGui.QIcon() + icon43.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_object3Axes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_3axes.setIcon(icon43) + self.button_object_3axes.setIconSize(QtCore.QSize(32, 32)) + self.button_object_3axes.setObjectName(_fromUtf8("button_object_3axes")) + self.gridLayout_16.addWidget(self.button_object_3axes, 2, 0, 1, 1) + self.button_line_to_sketch = QtGui.QPushButton(self.Axis_Tab31_3) + self.button_line_to_sketch.setIcon(icon19) self.button_line_to_sketch.setIconSize(QtCore.QSize(32, 32)) self.button_line_to_sketch.setObjectName(_fromUtf8("button_line_to_sketch")) - self.gridLayout_73.addWidget(self.button_line_to_sketch, 9, 0, 1, 1) - spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_73.addItem(spacerItem4, 10, 0, 1, 1) - self.tabWidget_7.addTab(self.Axis_Tab2_2, icon29, _fromUtf8("")) + self.gridLayout_16.addWidget(self.button_line_to_sketch, 3, 0, 1, 1) + spacerItem6 = QtGui.QSpacerItem(20, 483, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_16.addItem(spacerItem6, 4, 0, 1, 1) + self.tabWidget_2.addTab(self.Axis_Tab31_3, _fromUtf8("")) + self.gridLayout_14.addWidget(self.tabWidget_2, 0, 0, 1, 1) + icon44 = QtGui.QIcon() + icon44.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_axis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.Axis_Tab, icon44, _fromUtf8("")) + self.tab_16 = QtGui.QWidget() + self.tab_16.setObjectName(_fromUtf8("tab_16")) + self.gridLayout = QtGui.QGridLayout(self.tab_16) + self.gridLayout.setObjectName(_fromUtf8("gridLayout")) + self.horizontalLayout_66 = QtGui.QHBoxLayout() + self.horizontalLayout_66.setObjectName(_fromUtf8("horizontalLayout_66")) + self.button_linecenter_circle = QtGui.QPushButton(self.tab_16) + icon45 = QtGui.QIcon() + icon45.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineCenterCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_linecenter_circle.setIcon(icon45) + self.button_linecenter_circle.setIconSize(QtCore.QSize(32, 32)) + self.button_linecenter_circle.setObjectName(_fromUtf8("button_linecenter_circle")) + self.horizontalLayout_66.addWidget(self.button_linecenter_circle) + self.radius_circle = QtGui.QLineEdit(self.tab_16) + self.radius_circle.setMinimumSize(QtCore.QSize(40, 0)) + self.radius_circle.setMaximumSize(QtCore.QSize(60, 16777215)) + self.radius_circle.setObjectName(_fromUtf8("radius_circle")) + self.horizontalLayout_66.addWidget(self.radius_circle) + self.gridLayout.addLayout(self.horizontalLayout_66, 0, 0, 1, 1) + self.button_linepoint_circle = QtGui.QPushButton(self.tab_16) + icon46 = QtGui.QIcon() + icon46.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_linepoint_circle.setIcon(icon46) + self.button_linepoint_circle.setIconSize(QtCore.QSize(32, 32)) + self.button_linepoint_circle.setObjectName(_fromUtf8("button_linepoint_circle")) + self.gridLayout.addWidget(self.button_linepoint_circle, 1, 0, 1, 1) + self.button_3points_circle = QtGui.QPushButton(self.tab_16) + icon47 = QtGui.QIcon() + icon47.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_3points_circle.setIcon(icon47) + self.button_3points_circle.setIconSize(QtCore.QSize(32, 32)) + self.button_3points_circle.setObjectName(_fromUtf8("button_3points_circle")) + self.gridLayout.addWidget(self.button_3points_circle, 2, 0, 1, 1) + self.horizontalLayout_67 = QtGui.QHBoxLayout() + self.horizontalLayout_67.setObjectName(_fromUtf8("horizontalLayout_67")) + self.button_cut_circle = QtGui.QPushButton(self.tab_16) + icon48 = QtGui.QIcon() + icon48.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cut_circle.setIcon(icon48) + self.button_cut_circle.setIconSize(QtCore.QSize(32, 32)) + self.button_cut_circle.setObjectName(_fromUtf8("button_cut_circle")) + self.horizontalLayout_67.addWidget(self.button_cut_circle) + self.spin_circle_cut = QtGui.QSpinBox(self.tab_16) + 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(100) + self.spin_circle_cut.setSingleStep(1) + self.spin_circle_cut.setObjectName(_fromUtf8("spin_circle_cut")) + self.horizontalLayout_67.addWidget(self.spin_circle_cut) + self.gridLayout.addLayout(self.horizontalLayout_67, 3, 0, 1, 1) + self.button_3points_ellipse = QtGui.QPushButton(self.tab_16) + icon49 = QtGui.QIcon() + icon49.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsEllipse.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_3points_ellipse.setIcon(icon49) + self.button_3points_ellipse.setIconSize(QtCore.QSize(32, 32)) + self.button_3points_ellipse.setObjectName(_fromUtf8("button_3points_ellipse")) + self.gridLayout.addWidget(self.button_3points_ellipse, 4, 0, 1, 1) + spacerItem7 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout.addItem(spacerItem7, 5, 0, 1, 1) + self.button_circle_to_sketch = QtGui.QPushButton(self.tab_16) + self.button_circle_to_sketch.setIcon(icon19) + self.button_circle_to_sketch.setIconSize(QtCore.QSize(32, 32)) + self.button_circle_to_sketch.setObjectName(_fromUtf8("button_circle_to_sketch")) + self.gridLayout.addWidget(self.button_circle_to_sketch, 6, 0, 1, 1) + spacerItem8 = QtGui.QSpacerItem(20, 121, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout.addItem(spacerItem8, 7, 0, 1, 1) + icon50 = QtGui.QIcon() + icon50.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_circle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.tab_16, icon50, _fromUtf8("")) self.Wire_Tab_2 = QtGui.QWidget() self.Wire_Tab_2.setObjectName(_fromUtf8("Wire_Tab_2")) self.gridLayout_74 = QtGui.QGridLayout(self.Wire_Tab_2) @@ -636,12 +778,12 @@ class Ui_Form(object): self.scrollArea_2.setWidgetResizable(True) self.scrollArea_2.setObjectName(_fromUtf8("scrollArea_2")) self.scrollAreaWidgetContents_5 = QtGui.QWidget() - self.scrollAreaWidgetContents_5.setGeometry(QtCore.QRect(0, 0, 245, 648)) + self.scrollAreaWidgetContents_5.setGeometry(QtCore.QRect(0, 0, 249, 648)) self.scrollAreaWidgetContents_5.setObjectName(_fromUtf8("scrollAreaWidgetContents_5")) self.gridLayout_76 = QtGui.QGridLayout(self.scrollAreaWidgetContents_5) self.gridLayout_76.setObjectName(_fromUtf8("gridLayout_76")) - spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_76.addItem(spacerItem5, 7, 0, 1, 1) + spacerItem9 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_76.addItem(spacerItem9, 7, 0, 1, 1) self.groupBox_14 = QtGui.QGroupBox(self.scrollAreaWidgetContents_5) self.groupBox_14.setObjectName(_fromUtf8("groupBox_14")) self.gridLayout_77 = QtGui.QGridLayout(self.groupBox_14) @@ -820,18 +962,18 @@ class Ui_Form(object): self.checkBox_polyline_2.setAutoExclusive(True) self.checkBox_polyline_2.setObjectName(_fromUtf8("checkBox_polyline_2")) self.gridLayout_2.addWidget(self.checkBox_polyline_2, 0, 1, 1, 1) - self.checkBox_bspline_2 = QtGui.QCheckBox(self.groupBox_16) - self.checkBox_bspline_2.setEnabled(True) - self.checkBox_bspline_2.setChecked(False) - self.checkBox_bspline_2.setAutoExclusive(True) - self.checkBox_bspline_2.setObjectName(_fromUtf8("checkBox_bspline_2")) - self.gridLayout_2.addWidget(self.checkBox_bspline_2, 1, 0, 1, 1) self.checkBox_bezier_2 = QtGui.QCheckBox(self.groupBox_16) self.checkBox_bezier_2.setEnabled(True) self.checkBox_bezier_2.setChecked(False) self.checkBox_bezier_2.setAutoExclusive(True) self.checkBox_bezier_2.setObjectName(_fromUtf8("checkBox_bezier_2")) - self.gridLayout_2.addWidget(self.checkBox_bezier_2, 1, 1, 1, 1) + self.gridLayout_2.addWidget(self.checkBox_bezier_2, 1, 0, 1, 1) + self.checkBox_bspline_2 = QtGui.QCheckBox(self.groupBox_16) + self.checkBox_bspline_2.setEnabled(True) + self.checkBox_bspline_2.setChecked(False) + self.checkBox_bspline_2.setAutoExclusive(True) + self.checkBox_bspline_2.setObjectName(_fromUtf8("checkBox_bspline_2")) + self.gridLayout_2.addWidget(self.checkBox_bspline_2, 1, 1, 1, 1) self.gridLayout_76.addWidget(self.groupBox_16, 4, 0, 1, 1) self.horizontalLayout_62 = QtGui.QHBoxLayout() self.horizontalLayout_62.setObjectName(_fromUtf8("horizontalLayout_62")) @@ -840,8 +982,8 @@ class Ui_Form(object): self.ParCurve_button_store_2.setMaximumSize(QtCore.QSize(60, 16777215)) self.ParCurve_button_store_2.setObjectName(_fromUtf8("ParCurve_button_store_2")) self.horizontalLayout_62.addWidget(self.ParCurve_button_store_2) - spacerItem6 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_62.addItem(spacerItem6) + spacerItem10 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_62.addItem(spacerItem10) self.ParCurve_button_apply_2 = QtGui.QPushButton(self.scrollAreaWidgetContents_5) self.ParCurve_button_apply_2.setMinimumSize(QtCore.QSize(40, 0)) self.ParCurve_button_apply_2.setMaximumSize(QtCore.QSize(60, 16777215)) @@ -859,7 +1001,7 @@ class Ui_Form(object): self.scrollArea_5.setWidgetResizable(True) self.scrollArea_5.setObjectName(_fromUtf8("scrollArea_5")) self.scrollAreaWidgetContents_6 = QtGui.QWidget() - self.scrollAreaWidgetContents_6.setGeometry(QtCore.QRect(0, 0, 207, 692)) + self.scrollAreaWidgetContents_6.setGeometry(QtCore.QRect(0, 0, 202, 692)) self.scrollAreaWidgetContents_6.setObjectName(_fromUtf8("scrollAreaWidgetContents_6")) self.gridLayout_81 = QtGui.QGridLayout(self.scrollAreaWidgetContents_6) self.gridLayout_81.setObjectName(_fromUtf8("gridLayout_81")) @@ -1045,31 +1187,6 @@ class Ui_Form(object): self.ParCurve_tmin_3.setObjectName(_fromUtf8("ParCurve_tmin_3")) self.gridLayout_82.addWidget(self.ParCurve_tmin_3, 0, 1, 1, 1) self.gridLayout_81.addWidget(self.groupBox_18, 3, 0, 1, 1) - self.groupBox_19 = QtGui.QGroupBox(self.scrollAreaWidgetContents_6) - self.groupBox_19.setObjectName(_fromUtf8("groupBox_19")) - self.gridLayout_3 = QtGui.QGridLayout(self.groupBox_19) - self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) - self.checkBox_points_3 = QtGui.QCheckBox(self.groupBox_19) - self.checkBox_points_3.setAutoExclusive(True) - self.checkBox_points_3.setObjectName(_fromUtf8("checkBox_points_3")) - self.gridLayout_3.addWidget(self.checkBox_points_3, 0, 0, 1, 1) - self.checkBox_polyline_3 = QtGui.QCheckBox(self.groupBox_19) - self.checkBox_polyline_3.setChecked(True) - self.checkBox_polyline_3.setAutoExclusive(True) - self.checkBox_polyline_3.setObjectName(_fromUtf8("checkBox_polyline_3")) - self.gridLayout_3.addWidget(self.checkBox_polyline_3, 0, 1, 1, 1) - self.checkBox_bspline_3 = QtGui.QCheckBox(self.groupBox_19) - self.checkBox_bspline_3.setChecked(False) - self.checkBox_bspline_3.setAutoExclusive(True) - self.checkBox_bspline_3.setObjectName(_fromUtf8("checkBox_bspline_3")) - self.gridLayout_3.addWidget(self.checkBox_bspline_3, 1, 0, 1, 1) - self.checkBox_bezier_3 = QtGui.QCheckBox(self.groupBox_19) - self.checkBox_bezier_3.setEnabled(True) - self.checkBox_bezier_3.setChecked(False) - self.checkBox_bezier_3.setAutoExclusive(True) - self.checkBox_bezier_3.setObjectName(_fromUtf8("checkBox_bezier_3")) - self.gridLayout_3.addWidget(self.checkBox_bezier_3, 1, 1, 1, 1) - self.gridLayout_81.addWidget(self.groupBox_19, 4, 0, 1, 1) self.checkBox_close_3 = QtGui.QCheckBox(self.scrollAreaWidgetContents_6) self.checkBox_close_3.setObjectName(_fromUtf8("checkBox_close_3")) self.gridLayout_81.addWidget(self.checkBox_close_3, 5, 0, 1, 1) @@ -1080,93 +1197,280 @@ class Ui_Form(object): self.ParCurve_button_store_3.setMaximumSize(QtCore.QSize(60, 16777215)) self.ParCurve_button_store_3.setObjectName(_fromUtf8("ParCurve_button_store_3")) self.horizontalLayout_65.addWidget(self.ParCurve_button_store_3) - spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_65.addItem(spacerItem7) + spacerItem11 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_65.addItem(spacerItem11) self.ParCurve_button_apply_3 = QtGui.QPushButton(self.scrollAreaWidgetContents_6) self.ParCurve_button_apply_3.setMinimumSize(QtCore.QSize(40, 0)) self.ParCurve_button_apply_3.setMaximumSize(QtCore.QSize(60, 16777215)) self.ParCurve_button_apply_3.setObjectName(_fromUtf8("ParCurve_button_apply_3")) self.horizontalLayout_65.addWidget(self.ParCurve_button_apply_3) self.gridLayout_81.addLayout(self.horizontalLayout_65, 6, 0, 1, 1) - spacerItem8 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_81.addItem(spacerItem8, 7, 0, 1, 1) + spacerItem12 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_81.addItem(spacerItem12, 7, 0, 1, 1) + self.groupBox_19 = QtGui.QGroupBox(self.scrollAreaWidgetContents_6) + self.groupBox_19.setObjectName(_fromUtf8("groupBox_19")) + self.gridLayout_3 = QtGui.QGridLayout(self.groupBox_19) + self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) + self.checkBox_points_3 = QtGui.QCheckBox(self.groupBox_19) + self.checkBox_points_3.setAutoExclusive(True) + self.checkBox_points_3.setObjectName(_fromUtf8("checkBox_points_3")) + self.gridLayout_3.addWidget(self.checkBox_points_3, 0, 1, 1, 1) + self.checkBox_polyline_3 = QtGui.QCheckBox(self.groupBox_19) + self.checkBox_polyline_3.setChecked(True) + self.checkBox_polyline_3.setAutoExclusive(True) + self.checkBox_polyline_3.setObjectName(_fromUtf8("checkBox_polyline_3")) + self.gridLayout_3.addWidget(self.checkBox_polyline_3, 0, 2, 1, 1) + self.checkBox_bspline_3 = QtGui.QCheckBox(self.groupBox_19) + self.checkBox_bspline_3.setChecked(False) + self.checkBox_bspline_3.setAutoExclusive(True) + self.checkBox_bspline_3.setObjectName(_fromUtf8("checkBox_bspline_3")) + self.gridLayout_3.addWidget(self.checkBox_bspline_3, 1, 2, 1, 1) + self.checkBox_bezier_3 = QtGui.QCheckBox(self.groupBox_19) + self.checkBox_bezier_3.setEnabled(True) + self.checkBox_bezier_3.setChecked(False) + self.checkBox_bezier_3.setAutoExclusive(True) + self.checkBox_bezier_3.setObjectName(_fromUtf8("checkBox_bezier_3")) + self.gridLayout_3.addWidget(self.checkBox_bezier_3, 1, 1, 1, 1) + self.gridLayout_81.addWidget(self.groupBox_19, 4, 0, 1, 1) self.scrollArea_5.setWidget(self.scrollAreaWidgetContents_6) self.gridLayout_80.addWidget(self.scrollArea_5, 0, 0, 1, 1) self.tabWidget_8.addTab(self.tab_15, _fromUtf8("")) self.gridLayout_74.addWidget(self.tabWidget_8, 1, 0, 1, 1) - icon39 = QtGui.QIcon() - icon39.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_wire.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.Wire_Tab_2, icon39, _fromUtf8("")) - self.tab_16 = QtGui.QWidget() - self.tab_16.setObjectName(_fromUtf8("tab_16")) - self.gridLayout = QtGui.QGridLayout(self.tab_16) - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.horizontalLayout_66 = QtGui.QHBoxLayout() - self.horizontalLayout_66.setObjectName(_fromUtf8("horizontalLayout_66")) - self.button_linecenter_circle = QtGui.QPushButton(self.tab_16) - icon40 = QtGui.QIcon() - icon40.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_lineCenterCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_linecenter_circle.setIcon(icon40) - self.button_linecenter_circle.setIconSize(QtCore.QSize(32, 32)) - self.button_linecenter_circle.setObjectName(_fromUtf8("button_linecenter_circle")) - self.horizontalLayout_66.addWidget(self.button_linecenter_circle) - self.radius_circle = QtGui.QLineEdit(self.tab_16) - self.radius_circle.setMinimumSize(QtCore.QSize(40, 0)) - self.radius_circle.setMaximumSize(QtCore.QSize(60, 16777215)) - self.radius_circle.setObjectName(_fromUtf8("radius_circle")) - self.horizontalLayout_66.addWidget(self.radius_circle) - self.gridLayout.addLayout(self.horizontalLayout_66, 0, 0, 1, 1) - self.button_linepoint_circle = QtGui.QPushButton(self.tab_16) - icon41 = QtGui.QIcon() - icon41.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_linepoint_circle.setIcon(icon41) - self.button_linepoint_circle.setIconSize(QtCore.QSize(32, 32)) - self.button_linepoint_circle.setObjectName(_fromUtf8("button_linepoint_circle")) - self.gridLayout.addWidget(self.button_linepoint_circle, 1, 0, 1, 1) - self.button_3points_circle = QtGui.QPushButton(self.tab_16) - icon42 = QtGui.QIcon() - icon42.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_3points_circle.setIcon(icon42) - self.button_3points_circle.setIconSize(QtCore.QSize(32, 32)) - self.button_3points_circle.setObjectName(_fromUtf8("button_3points_circle")) - self.gridLayout.addWidget(self.button_3points_circle, 2, 0, 1, 1) - self.horizontalLayout_67 = QtGui.QHBoxLayout() - self.horizontalLayout_67.setObjectName(_fromUtf8("horizontalLayout_67")) - self.button_cut_circle = QtGui.QPushButton(self.tab_16) - icon43 = QtGui.QIcon() - icon43.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cutCircle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cut_circle.setIcon(icon43) - self.button_cut_circle.setIconSize(QtCore.QSize(32, 32)) - self.button_cut_circle.setObjectName(_fromUtf8("button_cut_circle")) - self.horizontalLayout_67.addWidget(self.button_cut_circle) - self.spin_circle_cut = QtGui.QSpinBox(self.tab_16) - 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(100) - self.spin_circle_cut.setSingleStep(1) - self.spin_circle_cut.setObjectName(_fromUtf8("spin_circle_cut")) - self.horizontalLayout_67.addWidget(self.spin_circle_cut) - self.gridLayout.addLayout(self.horizontalLayout_67, 3, 0, 1, 1) - self.button_3points_ellipse = QtGui.QPushButton(self.tab_16) - icon44 = QtGui.QIcon() - icon44.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_3pointsEllipse.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_3points_ellipse.setIcon(icon44) - self.button_3points_ellipse.setIconSize(QtCore.QSize(32, 32)) - self.button_3points_ellipse.setObjectName(_fromUtf8("button_3points_ellipse")) - self.gridLayout.addWidget(self.button_3points_ellipse, 4, 0, 1, 1) - spacerItem9 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout.addItem(spacerItem9, 5, 0, 1, 1) - self.button_circle_to_sketch = QtGui.QPushButton(self.tab_16) - self.button_circle_to_sketch.setIcon(icon18) - self.button_circle_to_sketch.setIconSize(QtCore.QSize(32, 32)) - self.button_circle_to_sketch.setObjectName(_fromUtf8("button_circle_to_sketch")) - self.gridLayout.addWidget(self.button_circle_to_sketch, 6, 0, 1, 1) - spacerItem10 = QtGui.QSpacerItem(20, 121, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout.addItem(spacerItem10, 7, 0, 1, 1) - icon45 = QtGui.QIcon() - icon45.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_circle.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.tab_16, icon45, _fromUtf8("")) + icon51 = QtGui.QIcon() + icon51.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_wire.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.Wire_Tab_2, icon51, _fromUtf8("")) + self.Plane_Tab = QtGui.QWidget() + self.Plane_Tab.setObjectName(_fromUtf8("Plane_Tab")) + self.gridLayout_17 = QtGui.QGridLayout(self.Plane_Tab) + self.gridLayout_17.setObjectName(_fromUtf8("gridLayout_17")) + self.tabWidget_3 = QtGui.QTabWidget(self.Plane_Tab) + self.tabWidget_3.setObjectName(_fromUtf8("tabWidget_3")) + self.Plane_Tab1_2 = QtGui.QWidget() + self.Plane_Tab1_2.setObjectName(_fromUtf8("Plane_Tab1_2")) + self.gridLayout_18 = QtGui.QGridLayout(self.Plane_Tab1_2) + self.gridLayout_18.setObjectName(_fromUtf8("gridLayout_18")) + self.button_threepoints_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon52 = QtGui.QIcon() + icon52.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_threePointsPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_threepoints_plane.setIcon(icon52) + self.button_threepoints_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_threepoints_plane.setObjectName(_fromUtf8("button_threepoints_plane")) + self.gridLayout_18.addWidget(self.button_threepoints_plane, 0, 0, 1, 1) + self.button_twopoints_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon53 = QtGui.QIcon() + icon53.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_twoPointsPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_twopoints_plane.setIcon(icon53) + self.button_twopoints_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_twopoints_plane.setObjectName(_fromUtf8("button_twopoints_plane")) + self.gridLayout_18.addWidget(self.button_twopoints_plane, 1, 0, 1, 1) + self.button_Npoints_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon54 = QtGui.QIcon() + icon54.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_NpointsPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_Npoints_plane.setIcon(icon54) + self.button_Npoints_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_Npoints_plane.setObjectName(_fromUtf8("button_Npoints_plane")) + self.gridLayout_18.addWidget(self.button_Npoints_plane, 2, 0, 1, 1) + self.button_axisandpoint_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon55 = QtGui.QIcon() + icon55.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_axisandpoint_plane.setIcon(icon55) + self.button_axisandpoint_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_axisandpoint_plane.setObjectName(_fromUtf8("button_axisandpoint_plane")) + self.gridLayout_18.addWidget(self.button_axisandpoint_plane, 3, 0, 1, 1) + self.button_axis_point_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon56 = QtGui.QIcon() + icon56.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane2.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_axis_point_plane.setIcon(icon56) + self.button_axis_point_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_axis_point_plane.setObjectName(_fromUtf8("button_axis_point_plane")) + self.gridLayout_18.addWidget(self.button_axis_point_plane, 4, 0, 1, 1) + self.gridLayout_90 = QtGui.QGridLayout() + self.gridLayout_90.setObjectName(_fromUtf8("gridLayout_90")) + self.button_planeandpoint_plane = QtGui.QPushButton(self.Plane_Tab1_2) + icon57 = QtGui.QIcon() + icon57.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointPlanePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_planeandpoint_plane.setIcon(icon57) + self.button_planeandpoint_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_planeandpoint_plane.setObjectName(_fromUtf8("button_planeandpoint_plane")) + self.gridLayout_90.addWidget(self.button_planeandpoint_plane, 0, 0, 1, 1) + self.extension_planePointPlane = QtGui.QLineEdit(self.Plane_Tab1_2) + 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_90.addWidget(self.extension_planePointPlane, 0, 1, 1, 1) + self.gridLayout_18.addLayout(self.gridLayout_90, 5, 0, 1, 1) + self.gridLayout_89 = QtGui.QGridLayout() + self.gridLayout_89.setObjectName(_fromUtf8("gridLayout_89")) + self.button_planeandaxis_plane = QtGui.QPushButton(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.button_planeandaxis_plane.sizePolicy().hasHeightForWidth()) + self.button_planeandaxis_plane.setSizePolicy(sizePolicy) + icon58 = QtGui.QIcon() + icon58.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_planeandaxis_plane.setIcon(icon58) + self.button_planeandaxis_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_planeandaxis_plane.setObjectName(_fromUtf8("button_planeandaxis_plane")) + self.gridLayout_89.addWidget(self.button_planeandaxis_plane, 0, 0, 1, 1) + self.angle_planeandaxis_plane = QtGui.QLineEdit(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.angle_planeandaxis_plane.sizePolicy().hasHeightForWidth()) + self.angle_planeandaxis_plane.setSizePolicy(sizePolicy) + self.angle_planeandaxis_plane.setMinimumSize(QtCore.QSize(40, 0)) + self.angle_planeandaxis_plane.setMaximumSize(QtCore.QSize(60, 16777215)) + self.angle_planeandaxis_plane.setObjectName(_fromUtf8("angle_planeandaxis_plane")) + self.gridLayout_89.addWidget(self.angle_planeandaxis_plane, 0, 1, 1, 1) + self.gridLayout_18.addLayout(self.gridLayout_89, 6, 0, 1, 1) + self.horizontalLayout_70 = QtGui.QHBoxLayout() + self.horizontalLayout_70.setObjectName(_fromUtf8("horizontalLayout_70")) + self.button_distPlane = QtGui.QPushButton(self.Plane_Tab1_2) + icon59 = QtGui.QIcon() + icon59.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distPlanePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_distPlane.setIcon(icon59) + self.button_distPlane.setIconSize(QtCore.QSize(32, 32)) + self.button_distPlane.setObjectName(_fromUtf8("button_distPlane")) + self.horizontalLayout_70.addWidget(self.button_distPlane) + self.dist_plane = QtGui.QLineEdit(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.dist_plane.sizePolicy().hasHeightForWidth()) + self.dist_plane.setSizePolicy(sizePolicy) + self.dist_plane.setMinimumSize(QtCore.QSize(40, 0)) + self.dist_plane.setMaximumSize(QtCore.QSize(40, 16777215)) + self.dist_plane.setObjectName(_fromUtf8("dist_plane")) + self.horizontalLayout_70.addWidget(self.dist_plane) + self.spin_dist_plane = QtGui.QSpinBox(self.Plane_Tab1_2) + self.spin_dist_plane.setMinimumSize(QtCore.QSize(30, 0)) + self.spin_dist_plane.setMaximumSize(QtCore.QSize(30, 16777215)) + self.spin_dist_plane.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) + self.spin_dist_plane.setKeyboardTracking(False) + self.spin_dist_plane.setMinimum(1) + self.spin_dist_plane.setMaximum(100) + self.spin_dist_plane.setSingleStep(1) + self.spin_dist_plane.setProperty("value", 1) + self.spin_dist_plane.setObjectName(_fromUtf8("spin_dist_plane")) + self.horizontalLayout_70.addWidget(self.spin_dist_plane) + self.gridLayout_18.addLayout(self.horizontalLayout_70, 7, 0, 1, 1) + self.horizontalLayout_69 = QtGui.QHBoxLayout() + self.horizontalLayout_69.setObjectName(_fromUtf8("horizontalLayout_69")) + self.button_face_tangent = QtGui.QPushButton(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.button_face_tangent.sizePolicy().hasHeightForWidth()) + self.button_face_tangent.setSizePolicy(sizePolicy) + icon60 = QtGui.QIcon() + icon60.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceTangent.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_face_tangent.setIcon(icon60) + self.button_face_tangent.setIconSize(QtCore.QSize(32, 32)) + self.button_face_tangent.setObjectName(_fromUtf8("button_face_tangent")) + self.horizontalLayout_69.addWidget(self.button_face_tangent) + self.length_plane_2 = QtGui.QLineEdit(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.length_plane_2.sizePolicy().hasHeightForWidth()) + self.length_plane_2.setSizePolicy(sizePolicy) + self.length_plane_2.setMinimumSize(QtCore.QSize(40, 0)) + self.length_plane_2.setMaximumSize(QtCore.QSize(50, 16777215)) + self.length_plane_2.setObjectName(_fromUtf8("length_plane_2")) + self.horizontalLayout_69.addWidget(self.length_plane_2) + self.width_plane_2 = QtGui.QLineEdit(self.Plane_Tab1_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.width_plane_2.sizePolicy().hasHeightForWidth()) + self.width_plane_2.setSizePolicy(sizePolicy) + self.width_plane_2.setMinimumSize(QtCore.QSize(40, 0)) + self.width_plane_2.setMaximumSize(QtCore.QSize(50, 16777215)) + self.width_plane_2.setObjectName(_fromUtf8("width_plane_2")) + self.horizontalLayout_69.addWidget(self.width_plane_2) + self.gridLayout_18.addLayout(self.horizontalLayout_69, 8, 0, 1, 1) + spacerItem13 = QtGui.QSpacerItem(20, 235, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_18.addItem(spacerItem13, 9, 0, 1, 1) + self.tabWidget_3.addTab(self.Plane_Tab1_2, _fromUtf8("")) + self.Plane_Tab2_2 = QtGui.QWidget() + self.Plane_Tab2_2.setObjectName(_fromUtf8("Plane_Tab2_2")) + self.gridLayout_36 = QtGui.QGridLayout(self.Plane_Tab2_2) + self.gridLayout_36.setObjectName(_fromUtf8("gridLayout_36")) + self.horizontalLayout_68 = QtGui.QHBoxLayout() + self.horizontalLayout_68.setObjectName(_fromUtf8("horizontalLayout_68")) + self.button_click_for_plane = QtGui.QPushButton(self.Plane_Tab2_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.button_click_for_plane.sizePolicy().hasHeightForWidth()) + self.button_click_for_plane.setSizePolicy(sizePolicy) + icon61 = QtGui.QIcon() + icon61.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_click_for_plane.setIcon(icon61) + self.button_click_for_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_click_for_plane.setObjectName(_fromUtf8("button_click_for_plane")) + self.horizontalLayout_68.addWidget(self.button_click_for_plane) + self.length_plane = QtGui.QLineEdit(self.Plane_Tab2_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.length_plane.sizePolicy().hasHeightForWidth()) + self.length_plane.setSizePolicy(sizePolicy) + self.length_plane.setMinimumSize(QtCore.QSize(40, 0)) + self.length_plane.setMaximumSize(QtCore.QSize(50, 16777215)) + self.length_plane.setObjectName(_fromUtf8("length_plane")) + self.horizontalLayout_68.addWidget(self.length_plane) + self.width_plane = QtGui.QLineEdit(self.Plane_Tab2_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.width_plane.sizePolicy().hasHeightForWidth()) + self.width_plane.setSizePolicy(sizePolicy) + self.width_plane.setMinimumSize(QtCore.QSize(40, 0)) + self.width_plane.setMaximumSize(QtCore.QSize(50, 16777215)) + self.width_plane.setObjectName(_fromUtf8("width_plane")) + self.horizontalLayout_68.addWidget(self.width_plane) + self.gridLayout_36.addLayout(self.horizontalLayout_68, 0, 0, 1, 1) + self.horizontalLayout_71 = QtGui.QHBoxLayout() + self.horizontalLayout_71.setObjectName(_fromUtf8("horizontalLayout_71")) + self.button_extension_plane = QtGui.QPushButton(self.Plane_Tab2_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.button_extension_plane.sizePolicy().hasHeightForWidth()) + self.button_extension_plane.setSizePolicy(sizePolicy) + icon62 = QtGui.QIcon() + icon62.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_enlargePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_extension_plane.setIcon(icon62) + self.button_extension_plane.setIconSize(QtCore.QSize(32, 32)) + self.button_extension_plane.setObjectName(_fromUtf8("button_extension_plane")) + self.horizontalLayout_71.addWidget(self.button_extension_plane) + self.extension_plane = QtGui.QLineEdit(self.Plane_Tab2_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.extension_plane.sizePolicy().hasHeightForWidth()) + self.extension_plane.setSizePolicy(sizePolicy) + self.extension_plane.setMinimumSize(QtCore.QSize(40, 0)) + self.extension_plane.setMaximumSize(QtCore.QSize(50, 16777215)) + self.extension_plane.setObjectName(_fromUtf8("extension_plane")) + self.horizontalLayout_71.addWidget(self.extension_plane) + self.gridLayout_36.addLayout(self.horizontalLayout_71, 1, 0, 1, 1) + self.button_object_center_planes = QtGui.QPushButton(self.Plane_Tab2_2) + icon63 = QtGui.QIcon() + icon63.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsPlanes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_object_center_planes.setIcon(icon63) + self.button_object_center_planes.setIconSize(QtCore.QSize(32, 32)) + self.button_object_center_planes.setObjectName(_fromUtf8("button_object_center_planes")) + self.gridLayout_36.addWidget(self.button_object_center_planes, 2, 0, 1, 1) + spacerItem14 = QtGui.QSpacerItem(20, 527, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_36.addItem(spacerItem14, 3, 0, 1, 1) + self.tabWidget_3.addTab(self.Plane_Tab2_2, _fromUtf8("")) + self.gridLayout_17.addWidget(self.tabWidget_3, 0, 0, 1, 1) + icon64 = QtGui.QIcon() + icon64.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_plane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.Plane_Tab, icon64, _fromUtf8("")) self.tab_17 = QtGui.QWidget() self.tab_17.setObjectName(_fromUtf8("tab_17")) self.gridLayout_6 = QtGui.QGridLayout(self.tab_17) @@ -1203,233 +1507,23 @@ class Ui_Form(object): self.gridLayout_87.addWidget(self.radioButton_Frenet, 1, 1, 1, 1) self.gridLayout_86.addLayout(self.gridLayout_87, 0, 0, 1, 1) self.button_sweep = QtGui.QPushButton(self.frame_9) - icon46 = QtGui.QIcon() - icon46.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Sweep.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_sweep.setIcon(icon46) + icon65 = QtGui.QIcon() + icon65.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Sweep.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_sweep.setIcon(icon65) self.button_sweep.setIconSize(QtCore.QSize(32, 32)) self.button_sweep.setObjectName(_fromUtf8("button_sweep")) self.gridLayout_86.addWidget(self.button_sweep, 1, 0, 1, 1) self.gridLayout_6.addWidget(self.frame_9, 0, 0, 1, 1) - spacerItem11 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_6.addItem(spacerItem11, 2, 0, 1, 1) + spacerItem15 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_6.addItem(spacerItem15, 2, 0, 1, 1) self.button_beam = QtGui.QPushButton(self.tab_17) - icon47 = QtGui.QIcon() - icon47.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Beam.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_beam.setIcon(icon47) + icon66 = QtGui.QIcon() + icon66.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Beam.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_beam.setIcon(icon66) self.button_beam.setIconSize(QtCore.QSize(32, 32)) self.button_beam.setObjectName(_fromUtf8("button_beam")) self.gridLayout_6.addWidget(self.button_beam, 1, 0, 1, 1) - self.tabWidget_7.addTab(self.tab_17, icon47, _fromUtf8("")) - self.Plane_Tab1_3 = QtGui.QWidget() - self.Plane_Tab1_3.setObjectName(_fromUtf8("Plane_Tab1_3")) - self.gridLayout_88 = QtGui.QGridLayout(self.Plane_Tab1_3) - self.gridLayout_88.setObjectName(_fromUtf8("gridLayout_88")) - spacerItem12 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_88.addItem(spacerItem12, 9, 0, 1, 1) - self.horizontalLayout_68 = QtGui.QHBoxLayout() - self.horizontalLayout_68.setObjectName(_fromUtf8("horizontalLayout_68")) - self.button_click_for_plane = QtGui.QPushButton(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.button_click_for_plane.sizePolicy().hasHeightForWidth()) - self.button_click_for_plane.setSizePolicy(sizePolicy) - icon48 = QtGui.QIcon() - icon48.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_clickPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_click_for_plane.setIcon(icon48) - self.button_click_for_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_click_for_plane.setObjectName(_fromUtf8("button_click_for_plane")) - self.horizontalLayout_68.addWidget(self.button_click_for_plane) - self.length_plane = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.length_plane.sizePolicy().hasHeightForWidth()) - self.length_plane.setSizePolicy(sizePolicy) - self.length_plane.setMinimumSize(QtCore.QSize(40, 0)) - self.length_plane.setMaximumSize(QtCore.QSize(50, 16777215)) - self.length_plane.setObjectName(_fromUtf8("length_plane")) - self.horizontalLayout_68.addWidget(self.length_plane) - self.width_plane = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.width_plane.sizePolicy().hasHeightForWidth()) - self.width_plane.setSizePolicy(sizePolicy) - self.width_plane.setMinimumSize(QtCore.QSize(40, 0)) - self.width_plane.setMaximumSize(QtCore.QSize(50, 16777215)) - self.width_plane.setObjectName(_fromUtf8("width_plane")) - self.horizontalLayout_68.addWidget(self.width_plane) - self.gridLayout_88.addLayout(self.horizontalLayout_68, 8, 0, 1, 1) - self.gridLayout_89 = QtGui.QGridLayout() - self.gridLayout_89.setObjectName(_fromUtf8("gridLayout_89")) - self.button_planeandaxis_plane = QtGui.QPushButton(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.button_planeandaxis_plane.sizePolicy().hasHeightForWidth()) - self.button_planeandaxis_plane.setSizePolicy(sizePolicy) - icon49 = QtGui.QIcon() - icon49.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_planeLinePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_planeandaxis_plane.setIcon(icon49) - self.button_planeandaxis_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_planeandaxis_plane.setObjectName(_fromUtf8("button_planeandaxis_plane")) - self.gridLayout_89.addWidget(self.button_planeandaxis_plane, 0, 0, 1, 1) - self.angle_planeandaxis_plane = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.angle_planeandaxis_plane.sizePolicy().hasHeightForWidth()) - self.angle_planeandaxis_plane.setSizePolicy(sizePolicy) - self.angle_planeandaxis_plane.setMinimumSize(QtCore.QSize(40, 0)) - self.angle_planeandaxis_plane.setMaximumSize(QtCore.QSize(60, 16777215)) - self.angle_planeandaxis_plane.setObjectName(_fromUtf8("angle_planeandaxis_plane")) - self.gridLayout_89.addWidget(self.angle_planeandaxis_plane, 0, 1, 1, 1) - self.gridLayout_88.addLayout(self.gridLayout_89, 4, 0, 1, 1) - self.button_axisandpoint_plane = QtGui.QPushButton(self.Plane_Tab1_3) - icon50 = QtGui.QIcon() - icon50.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_axisandpoint_plane.setIcon(icon50) - self.button_axisandpoint_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_axisandpoint_plane.setObjectName(_fromUtf8("button_axisandpoint_plane")) - self.gridLayout_88.addWidget(self.button_axisandpoint_plane, 1, 0, 1, 1) - self.button_axis_point_plane = QtGui.QPushButton(self.Plane_Tab1_3) - icon51 = QtGui.QIcon() - icon51.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_linePointPlane2.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_axis_point_plane.setIcon(icon51) - self.button_axis_point_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_axis_point_plane.setObjectName(_fromUtf8("button_axis_point_plane")) - self.gridLayout_88.addWidget(self.button_axis_point_plane, 2, 0, 1, 1) - self.horizontalLayout_69 = QtGui.QHBoxLayout() - self.horizontalLayout_69.setObjectName(_fromUtf8("horizontalLayout_69")) - self.button_face_tangent = QtGui.QPushButton(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.button_face_tangent.sizePolicy().hasHeightForWidth()) - self.button_face_tangent.setSizePolicy(sizePolicy) - icon52 = QtGui.QIcon() - icon52.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FaceTangent.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_face_tangent.setIcon(icon52) - self.button_face_tangent.setIconSize(QtCore.QSize(32, 32)) - self.button_face_tangent.setObjectName(_fromUtf8("button_face_tangent")) - self.horizontalLayout_69.addWidget(self.button_face_tangent) - self.length_plane_2 = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.length_plane_2.sizePolicy().hasHeightForWidth()) - self.length_plane_2.setSizePolicy(sizePolicy) - self.length_plane_2.setMinimumSize(QtCore.QSize(40, 0)) - self.length_plane_2.setMaximumSize(QtCore.QSize(50, 16777215)) - self.length_plane_2.setObjectName(_fromUtf8("length_plane_2")) - self.horizontalLayout_69.addWidget(self.length_plane_2) - self.width_plane_2 = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.width_plane_2.sizePolicy().hasHeightForWidth()) - self.width_plane_2.setSizePolicy(sizePolicy) - self.width_plane_2.setMinimumSize(QtCore.QSize(40, 0)) - self.width_plane_2.setMaximumSize(QtCore.QSize(50, 16777215)) - self.width_plane_2.setObjectName(_fromUtf8("width_plane_2")) - self.horizontalLayout_69.addWidget(self.width_plane_2) - self.gridLayout_88.addLayout(self.horizontalLayout_69, 6, 0, 1, 1) - self.button_threepoints_plane = QtGui.QPushButton(self.Plane_Tab1_3) - icon53 = QtGui.QIcon() - icon53.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_threePointsPlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_threepoints_plane.setIcon(icon53) - self.button_threepoints_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_threepoints_plane.setObjectName(_fromUtf8("button_threepoints_plane")) - self.gridLayout_88.addWidget(self.button_threepoints_plane, 0, 0, 1, 1) - self.horizontalLayout_70 = QtGui.QHBoxLayout() - self.horizontalLayout_70.setObjectName(_fromUtf8("horizontalLayout_70")) - self.button_distPlane = QtGui.QPushButton(self.Plane_Tab1_3) - icon54 = QtGui.QIcon() - icon54.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distPlanePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_distPlane.setIcon(icon54) - self.button_distPlane.setIconSize(QtCore.QSize(32, 32)) - self.button_distPlane.setObjectName(_fromUtf8("button_distPlane")) - self.horizontalLayout_70.addWidget(self.button_distPlane) - self.dist_plane = QtGui.QLineEdit(self.Plane_Tab1_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.dist_plane.sizePolicy().hasHeightForWidth()) - self.dist_plane.setSizePolicy(sizePolicy) - self.dist_plane.setMinimumSize(QtCore.QSize(40, 0)) - self.dist_plane.setMaximumSize(QtCore.QSize(40, 16777215)) - self.dist_plane.setObjectName(_fromUtf8("dist_plane")) - self.horizontalLayout_70.addWidget(self.dist_plane) - self.spin_dist_plane = QtGui.QSpinBox(self.Plane_Tab1_3) - self.spin_dist_plane.setMinimumSize(QtCore.QSize(30, 0)) - self.spin_dist_plane.setMaximumSize(QtCore.QSize(30, 16777215)) - self.spin_dist_plane.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) - self.spin_dist_plane.setKeyboardTracking(False) - self.spin_dist_plane.setMinimum(1) - self.spin_dist_plane.setMaximum(100) - self.spin_dist_plane.setSingleStep(1) - self.spin_dist_plane.setProperty("value", 1) - self.spin_dist_plane.setObjectName(_fromUtf8("spin_dist_plane")) - self.horizontalLayout_70.addWidget(self.spin_dist_plane) - self.gridLayout_88.addLayout(self.horizontalLayout_70, 5, 0, 1, 1) - self.gridLayout_90 = QtGui.QGridLayout() - self.gridLayout_90.setObjectName(_fromUtf8("gridLayout_90")) - self.button_planeandpoint_plane = QtGui.QPushButton(self.Plane_Tab1_3) - icon55 = QtGui.QIcon() - icon55.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointPlanePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_planeandpoint_plane.setIcon(icon55) - self.button_planeandpoint_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_planeandpoint_plane.setObjectName(_fromUtf8("button_planeandpoint_plane")) - self.gridLayout_90.addWidget(self.button_planeandpoint_plane, 0, 0, 1, 1) - self.extension_planePointPlane = QtGui.QLineEdit(self.Plane_Tab1_3) - 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_90.addWidget(self.extension_planePointPlane, 0, 1, 1, 1) - self.gridLayout_88.addLayout(self.gridLayout_90, 3, 0, 1, 1) - icon56 = QtGui.QIcon() - icon56.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_plane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.Plane_Tab1_3, icon56, _fromUtf8("")) - self.Plane_Tab1_4 = QtGui.QWidget() - self.Plane_Tab1_4.setObjectName(_fromUtf8("Plane_Tab1_4")) - self.gridLayout_91 = QtGui.QGridLayout(self.Plane_Tab1_4) - self.gridLayout_91.setObjectName(_fromUtf8("gridLayout_91")) - spacerItem13 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_91.addItem(spacerItem13, 2, 0, 1, 1) - self.button_object_center_planes = QtGui.QPushButton(self.Plane_Tab1_4) - icon57 = QtGui.QIcon() - icon57.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_centerObjectsPlanes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_object_center_planes.setIcon(icon57) - self.button_object_center_planes.setIconSize(QtCore.QSize(32, 32)) - self.button_object_center_planes.setObjectName(_fromUtf8("button_object_center_planes")) - self.gridLayout_91.addWidget(self.button_object_center_planes, 1, 0, 1, 1) - self.horizontalLayout_71 = QtGui.QHBoxLayout() - self.horizontalLayout_71.setObjectName(_fromUtf8("horizontalLayout_71")) - self.button_extension_plane = QtGui.QPushButton(self.Plane_Tab1_4) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.button_extension_plane.sizePolicy().hasHeightForWidth()) - self.button_extension_plane.setSizePolicy(sizePolicy) - icon58 = QtGui.QIcon() - icon58.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_enlargePlane.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_extension_plane.setIcon(icon58) - self.button_extension_plane.setIconSize(QtCore.QSize(32, 32)) - self.button_extension_plane.setObjectName(_fromUtf8("button_extension_plane")) - self.horizontalLayout_71.addWidget(self.button_extension_plane) - self.extension_plane = QtGui.QLineEdit(self.Plane_Tab1_4) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.extension_plane.sizePolicy().hasHeightForWidth()) - self.extension_plane.setSizePolicy(sizePolicy) - self.extension_plane.setMinimumSize(QtCore.QSize(40, 0)) - self.extension_plane.setMaximumSize(QtCore.QSize(50, 16777215)) - self.extension_plane.setObjectName(_fromUtf8("extension_plane")) - self.horizontalLayout_71.addWidget(self.extension_plane) - self.gridLayout_91.addLayout(self.horizontalLayout_71, 0, 0, 1, 1) - self.tabWidget_7.addTab(self.Plane_Tab1_4, icon56, _fromUtf8("")) + self.tabWidget_7.addTab(self.tab_17, icon66, _fromUtf8("")) self.Objects_Tab2_2 = QtGui.QWidget() self.Objects_Tab2_2.setEnabled(True) self.Objects_Tab2_2.setMinimumSize(QtCore.QSize(0, 0)) @@ -1442,17 +1536,17 @@ class Ui_Form(object): self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4")) self.button_boundingboxes = QtGui.QPushButton(self.Objects_Tab2_2) self.button_boundingboxes.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon59 = QtGui.QIcon() - icon59.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBoxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_boundingboxes.setIcon(icon59) + icon67 = QtGui.QIcon() + icon67.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBoxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_boundingboxes.setIcon(icon67) self.button_boundingboxes.setIconSize(QtCore.QSize(32, 32)) self.button_boundingboxes.setObjectName(_fromUtf8("button_boundingboxes")) self.verticalLayout_4.addWidget(self.button_boundingboxes) self.button_boundingbox = QtGui.QPushButton(self.Objects_Tab2_2) self.button_boundingbox.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon60 = QtGui.QIcon() - icon60.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBox.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_boundingbox.setIcon(icon60) + icon68 = QtGui.QIcon() + icon68.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_boundingBox.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_boundingbox.setIcon(icon68) self.button_boundingbox.setIconSize(QtCore.QSize(32, 32)) self.button_boundingbox.setObjectName(_fromUtf8("button_boundingbox")) self.verticalLayout_4.addWidget(self.button_boundingbox) @@ -1473,9 +1567,9 @@ class Ui_Form(object): self.gridLayout_93 = QtGui.QGridLayout() self.gridLayout_93.setObjectName(_fromUtf8("gridLayout_93")) self.button_cylinder_create = QtGui.QPushButton(self.Objects_Tab2_2) - icon61 = QtGui.QIcon() - icon61.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinder.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cylinder_create.setIcon(icon61) + icon69 = QtGui.QIcon() + icon69.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cylinder.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cylinder_create.setIcon(icon69) self.button_cylinder_create.setIconSize(QtCore.QSize(32, 32)) self.button_cylinder_create.setObjectName(_fromUtf8("button_cylinder_create")) self.gridLayout_93.addWidget(self.button_cylinder_create, 0, 0, 1, 1) @@ -1503,9 +1597,9 @@ class Ui_Form(object): self.horizontalLayout_73 = QtGui.QHBoxLayout() self.horizontalLayout_73.setObjectName(_fromUtf8("horizontalLayout_73")) self.button_cube_create = QtGui.QPushButton(self.Objects_Tab2_2) - icon62 = QtGui.QIcon() - icon62.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cube.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_cube_create.setIcon(icon62) + icon70 = QtGui.QIcon() + icon70.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_cube.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_cube_create.setIcon(icon70) self.button_cube_create.setIconSize(QtCore.QSize(32, 32)) self.button_cube_create.setObjectName(_fromUtf8("button_cube_create")) self.horizontalLayout_73.addWidget(self.button_cube_create) @@ -1533,9 +1627,9 @@ class Ui_Form(object): self.horizontalLayout_74 = QtGui.QHBoxLayout() self.horizontalLayout_74.setObjectName(_fromUtf8("horizontalLayout_74")) self.button_sphere_create = QtGui.QPushButton(self.Objects_Tab2_2) - icon63 = QtGui.QIcon() - icon63.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_sphere.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_sphere_create.setIcon(icon63) + icon71 = QtGui.QIcon() + icon71.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_sphere.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_sphere_create.setIcon(icon71) self.button_sphere_create.setIconSize(QtCore.QSize(32, 32)) self.button_sphere_create.setObjectName(_fromUtf8("button_sphere_create")) self.horizontalLayout_74.addWidget(self.button_sphere_create) @@ -1553,9 +1647,9 @@ class Ui_Form(object): self.horizontalLayout_77 = QtGui.QHBoxLayout() self.horizontalLayout_77.setObjectName(_fromUtf8("horizontalLayout_77")) self.button_dome_create = QtGui.QPushButton(self.Objects_Tab2_2) - icon64 = QtGui.QIcon() - icon64.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_dome.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_dome_create.setIcon(icon64) + icon72 = QtGui.QIcon() + icon72.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_dome.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_dome_create.setIcon(icon72) self.button_dome_create.setIconSize(QtCore.QSize(32, 32)) self.button_dome_create.setObjectName(_fromUtf8("button_dome_create")) self.horizontalLayout_77.addWidget(self.button_dome_create) @@ -1582,9 +1676,9 @@ class Ui_Form(object): self.horizontalLayout_75 = QtGui.QHBoxLayout() self.horizontalLayout_75.setObjectName(_fromUtf8("horizontalLayout_75")) self.button_letter = QtGui.QPushButton(self.Objects_Tab2_2) - icon65 = QtGui.QIcon() - icon65.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointText.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_letter.setIcon(icon65) + icon73 = QtGui.QIcon() + icon73.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_pointText.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_letter.setIcon(icon73) self.button_letter.setIconSize(QtCore.QSize(32, 32)) self.button_letter.setObjectName(_fromUtf8("button_letter")) self.horizontalLayout_75.addWidget(self.button_letter) @@ -1606,9 +1700,9 @@ class Ui_Form(object): self.horizontalLayout_76 = QtGui.QHBoxLayout() self.horizontalLayout_76.setObjectName(_fromUtf8("horizontalLayout_76")) self.button_revolve = QtGui.QPushButton(self.Objects_Tab2_2) - icon66 = QtGui.QIcon() - icon66.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Revolve.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_revolve.setIcon(icon66) + icon74 = QtGui.QIcon() + icon74.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Revolve.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_revolve.setIcon(icon74) self.button_revolve.setIconSize(QtCore.QSize(32, 32)) self.button_revolve.setObjectName(_fromUtf8("button_revolve")) self.horizontalLayout_76.addWidget(self.button_revolve) @@ -1624,31 +1718,31 @@ class Ui_Form(object): self.horizontalLayout_76.addWidget(self.angle_revolve) self.gridLayout_5.addLayout(self.horizontalLayout_76, 7, 0, 1, 1) self.button_copy_objects = QtGui.QPushButton(self.Objects_Tab2_2) - icon67 = QtGui.QIcon() - icon67.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectCopy.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_copy_objects.setIcon(icon67) + icon75 = QtGui.QIcon() + icon75.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectCopy.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_copy_objects.setIcon(icon75) self.button_copy_objects.setIconSize(QtCore.QSize(32, 32)) self.button_copy_objects.setObjectName(_fromUtf8("button_copy_objects")) self.gridLayout_5.addWidget(self.button_copy_objects, 8, 0, 1, 1) self.button_common = QtGui.QPushButton(self.Objects_Tab2_2) - icon68 = QtGui.QIcon() - icon68.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Common.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_common.setIcon(icon68) + icon76 = QtGui.QIcon() + icon76.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Common.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_common.setIcon(icon76) self.button_common.setIconSize(QtCore.QSize(32, 32)) self.button_common.setObjectName(_fromUtf8("button_common")) self.gridLayout_5.addWidget(self.button_common, 9, 0, 1, 1) self.button_difference = QtGui.QPushButton(self.Objects_Tab2_2) - icon69 = QtGui.QIcon() - icon69.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Difference.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_difference.setIcon(icon69) + icon77 = QtGui.QIcon() + icon77.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_Difference.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_difference.setIcon(icon77) self.button_difference.setIconSize(QtCore.QSize(32, 32)) self.button_difference.setObjectName(_fromUtf8("button_difference")) self.gridLayout_5.addWidget(self.button_difference, 10, 0, 1, 1) - spacerItem14 = QtGui.QSpacerItem(17, 8, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_5.addItem(spacerItem14, 11, 0, 1, 1) - icon70 = QtGui.QIcon() - icon70.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_box.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.Objects_Tab2_2, icon70, _fromUtf8("")) + spacerItem16 = QtGui.QSpacerItem(17, 8, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_5.addItem(spacerItem16, 11, 0, 1, 1) + icon78 = QtGui.QIcon() + icon78.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_box.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.Objects_Tab2_2, icon78, _fromUtf8("")) self.Modif_Tab_2 = QtGui.QWidget() self.Modif_Tab_2.setObjectName(_fromUtf8("Modif_Tab_2")) self.gridLayout_94 = QtGui.QGridLayout(self.Modif_Tab_2) @@ -1657,8 +1751,8 @@ class Ui_Form(object): self.tabWidget_9.setObjectName(_fromUtf8("tabWidget_9")) self.align_tab_2 = QtGui.QWidget() self.align_tab_2.setObjectName(_fromUtf8("align_tab_2")) - self.gridLayout_95 = QtGui.QGridLayout(self.align_tab_2) - self.gridLayout_95.setObjectName(_fromUtf8("gridLayout_95")) + self.gridLayout_9 = QtGui.QGridLayout(self.align_tab_2) + self.gridLayout_9.setObjectName(_fromUtf8("gridLayout_9")) self.button_alignface2view = QtGui.QPushButton(self.align_tab_2) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -1666,19 +1760,19 @@ class Ui_Form(object): sizePolicy.setHeightForWidth(self.button_alignface2view.sizePolicy().hasHeightForWidth()) self.button_alignface2view.setSizePolicy(sizePolicy) self.button_alignface2view.setMaximumSize(QtCore.QSize(220, 16777215)) - icon71 = QtGui.QIcon() - icon71.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_viewAlignFace.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_alignface2view.setIcon(icon71) + icon79 = QtGui.QIcon() + icon79.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_viewAlignFace.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_alignface2view.setIcon(icon79) self.button_alignface2view.setIconSize(QtCore.QSize(32, 32)) self.button_alignface2view.setObjectName(_fromUtf8("button_alignface2view")) - self.gridLayout_95.addWidget(self.button_alignface2view, 0, 0, 1, 1) + self.gridLayout_9.addWidget(self.button_alignface2view, 0, 0, 1, 1) self.horizontalLayout_78 = QtGui.QHBoxLayout() self.horizontalLayout_78.setObjectName(_fromUtf8("horizontalLayout_78")) self.button_align_faces = QtGui.QPushButton(self.align_tab_2) self.button_align_faces.setMaximumSize(QtCore.QSize(220, 16777215)) - icon72 = QtGui.QIcon() - icon72.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectAlignFaces.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_align_faces.setIcon(icon72) + icon80 = QtGui.QIcon() + icon80.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectAlignFaces.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_align_faces.setIcon(icon80) self.button_align_faces.setIconSize(QtCore.QSize(32, 32)) self.button_align_faces.setObjectName(_fromUtf8("button_align_faces")) self.horizontalLayout_78.addWidget(self.button_align_faces) @@ -1692,14 +1786,14 @@ class Ui_Form(object): self.angle_align_faces.setMaximumSize(QtCore.QSize(50, 16777215)) self.angle_align_faces.setObjectName(_fromUtf8("angle_align_faces")) self.horizontalLayout_78.addWidget(self.angle_align_faces) - self.gridLayout_95.addLayout(self.horizontalLayout_78, 1, 0, 1, 1) + self.gridLayout_9.addLayout(self.horizontalLayout_78, 1, 0, 1, 1) self.horizontalLayout_79 = QtGui.QHBoxLayout() self.horizontalLayout_79.setObjectName(_fromUtf8("horizontalLayout_79")) self.button_align_edges = QtGui.QPushButton(self.align_tab_2) self.button_align_edges.setMaximumSize(QtCore.QSize(220, 16777215)) - icon73 = QtGui.QIcon() - icon73.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectAlignAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_align_edges.setIcon(icon73) + icon81 = QtGui.QIcon() + icon81.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectAlignAxes.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_align_edges.setIcon(icon81) self.button_align_edges.setIconSize(QtCore.QSize(32, 32)) self.button_align_edges.setObjectName(_fromUtf8("button_align_edges")) self.horizontalLayout_79.addWidget(self.button_align_edges) @@ -1713,23 +1807,43 @@ class Ui_Form(object): self.angle_align_edges.setMaximumSize(QtCore.QSize(50, 16777215)) self.angle_align_edges.setObjectName(_fromUtf8("angle_align_edges")) self.horizontalLayout_79.addWidget(self.angle_align_edges) - self.gridLayout_95.addLayout(self.horizontalLayout_79, 2, 0, 1, 1) - spacerItem15 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_95.addItem(spacerItem15, 5, 0, 1, 1) + self.gridLayout_9.addLayout(self.horizontalLayout_79, 2, 0, 1, 1) + self.horizontalLayout_2 = QtGui.QHBoxLayout() + self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) + self.button_align_main_axis = QtGui.QPushButton(self.align_tab_2) + icon82 = QtGui.QIcon() + icon82.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectAlignMainAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_align_main_axis.setIcon(icon82) + self.button_align_main_axis.setIconSize(QtCore.QSize(32, 32)) + self.button_align_main_axis.setObjectName(_fromUtf8("button_align_main_axis")) + self.horizontalLayout_2.addWidget(self.button_align_main_axis) + self.angle_align_main_axis = QtGui.QLineEdit(self.align_tab_2) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.angle_align_main_axis.sizePolicy().hasHeightForWidth()) + self.angle_align_main_axis.setSizePolicy(sizePolicy) + self.angle_align_main_axis.setMinimumSize(QtCore.QSize(40, 0)) + self.angle_align_main_axis.setMaximumSize(QtCore.QSize(50, 16777215)) + self.angle_align_main_axis.setObjectName(_fromUtf8("angle_align_main_axis")) + self.horizontalLayout_2.addWidget(self.angle_align_main_axis) + self.gridLayout_9.addLayout(self.horizontalLayout_2, 3, 0, 1, 1) self.button_joint_points = QtGui.QPushButton(self.align_tab_2) - icon74 = QtGui.QIcon() - icon74.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectJointPoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_joint_points.setIcon(icon74) + icon83 = QtGui.QIcon() + icon83.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectJointPoints.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_joint_points.setIcon(icon83) self.button_joint_points.setIconSize(QtCore.QSize(32, 32)) self.button_joint_points.setObjectName(_fromUtf8("button_joint_points")) - self.gridLayout_95.addWidget(self.button_joint_points, 3, 0, 1, 1) + self.gridLayout_9.addWidget(self.button_joint_points, 4, 0, 1, 1) self.button_joint_faces = QtGui.QPushButton(self.align_tab_2) - icon75 = QtGui.QIcon() - icon75.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectJointFaces.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_joint_faces.setIcon(icon75) + icon84 = QtGui.QIcon() + icon84.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_objectJointFaces.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_joint_faces.setIcon(icon84) self.button_joint_faces.setIconSize(QtCore.QSize(32, 32)) self.button_joint_faces.setObjectName(_fromUtf8("button_joint_faces")) - self.gridLayout_95.addWidget(self.button_joint_faces, 4, 0, 1, 1) + self.gridLayout_9.addWidget(self.button_joint_faces, 5, 0, 1, 1) + spacerItem17 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_9.addItem(spacerItem17, 6, 0, 1, 1) self.tabWidget_9.addTab(self.align_tab_2, _fromUtf8("")) self.cut_tab_2 = QtGui.QWidget() self.cut_tab_2.setObjectName(_fromUtf8("cut_tab_2")) @@ -1839,8 +1953,8 @@ class Ui_Form(object): self.button_cut_reset.setMaximumSize(QtCore.QSize(60, 16777215)) self.button_cut_reset.setObjectName(_fromUtf8("button_cut_reset")) self.horizontalLayout_80.addWidget(self.button_cut_reset) - spacerItem16 = QtGui.QSpacerItem(18, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_80.addItem(spacerItem16) + spacerItem18 = QtGui.QSpacerItem(18, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_80.addItem(spacerItem18) self.button_cut_apply = QtGui.QPushButton(self.groupBox_20) self.button_cut_apply.setEnabled(False) self.button_cut_apply.setMaximumSize(QtCore.QSize(50, 16777215)) @@ -1851,8 +1965,8 @@ class Ui_Form(object): self.gridLayout_98.addLayout(self.gridLayout_100, 1, 0, 1, 1) self.gridLayout_97.addWidget(self.groupBox_20, 0, 0, 1, 1) self.gridLayout_96.addWidget(self.frame_10, 0, 0, 1, 1) - spacerItem17 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_96.addItem(spacerItem17, 1, 0, 1, 1) + spacerItem19 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_96.addItem(spacerItem19, 1, 0, 1, 1) self.tabWidget_9.addTab(self.cut_tab_2, _fromUtf8("")) self.rotate_tab_2 = QtGui.QWidget() self.rotate_tab_2.setObjectName(_fromUtf8("rotate_tab_2")) @@ -1896,9 +2010,9 @@ class Ui_Form(object): self.ObjRot_button_select_axis.setMaximumSize(QtCore.QSize(80, 16777215)) self.ObjRot_button_select_axis.setObjectName(_fromUtf8("ObjRot_button_select_axis")) self.gridLayout_105.addWidget(self.ObjRot_button_select_axis, 1, 0, 1, 1) - icon76 = QtGui.QIcon() - icon76.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_rotationAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_10.addTab(self.tab_18, icon76, _fromUtf8("")) + icon85 = QtGui.QIcon() + icon85.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_rotationAxis.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_10.addTab(self.tab_18, icon85, _fromUtf8("")) self.tab_19 = QtGui.QWidget() self.tab_19.setObjectName(_fromUtf8("tab_19")) self.gridLayout_106 = QtGui.QGridLayout(self.tab_19) @@ -1925,9 +2039,9 @@ class Ui_Form(object): self.ObjRot_button_select_center.setMaximumSize(QtCore.QSize(80, 16777215)) self.ObjRot_button_select_center.setObjectName(_fromUtf8("ObjRot_button_select_center")) self.gridLayout_106.addWidget(self.ObjRot_button_select_center, 1, 0, 1, 1) - icon77 = QtGui.QIcon() - icon77.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_rotationPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_10.addTab(self.tab_19, icon77, _fromUtf8("")) + icon86 = QtGui.QIcon() + icon86.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_rotationPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_10.addTab(self.tab_19, icon86, _fromUtf8("")) self.gridLayout_104.addWidget(self.tabWidget_10, 1, 0, 1, 1) self.groupBox_21 = QtGui.QGroupBox(self.frame_11) self.groupBox_21.setMinimumSize(QtCore.QSize(150, 67)) @@ -1963,9 +2077,9 @@ class Ui_Form(object): self.ObjRot_button_select_angle.setMaximumSize(QtCore.QSize(80, 16777215)) self.ObjRot_button_select_angle.setObjectName(_fromUtf8("ObjRot_button_select_angle")) self.gridLayout_109.addWidget(self.ObjRot_button_select_angle, 0, 0, 1, 1) - icon78 = QtGui.QIcon() - icon78.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_click.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_11.addTab(self.tab_21, icon78, _fromUtf8("")) + icon87 = QtGui.QIcon() + icon87.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_click.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_11.addTab(self.tab_21, icon87, _fromUtf8("")) self.gridLayout_107.addWidget(self.tabWidget_11, 0, 0, 1, 1) self.horizontalLayout_81 = QtGui.QHBoxLayout() self.horizontalLayout_81.setObjectName(_fromUtf8("horizontalLayout_81")) @@ -1993,8 +2107,8 @@ class Ui_Form(object): self.ObjRot_button_reset.setMaximumSize(QtCore.QSize(60, 16777215)) self.ObjRot_button_reset.setObjectName(_fromUtf8("ObjRot_button_reset")) self.horizontalLayout_82.addWidget(self.ObjRot_button_reset) - spacerItem18 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_82.addItem(spacerItem18) + spacerItem20 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_82.addItem(spacerItem20) self.ObjRot_button_apply = QtGui.QPushButton(self.frame_11) self.ObjRot_button_apply.setMinimumSize(QtCore.QSize(40, 0)) self.ObjRot_button_apply.setMaximumSize(QtCore.QSize(60, 16777215)) @@ -2002,8 +2116,8 @@ class Ui_Form(object): self.horizontalLayout_82.addWidget(self.ObjRot_button_apply) self.gridLayout_104.addLayout(self.horizontalLayout_82, 3, 0, 1, 1) self.gridLayout_103.addWidget(self.frame_11, 0, 0, 1, 1) - spacerItem19 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_103.addItem(spacerItem19, 1, 0, 1, 1) + spacerItem21 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_103.addItem(spacerItem21, 1, 0, 1, 1) self.tabWidget_9.addTab(self.rotate_tab_2, _fromUtf8("")) self.translate_tab_2 = QtGui.QWidget() self.translate_tab_2.setObjectName(_fromUtf8("translate_tab_2")) @@ -2114,9 +2228,9 @@ class Ui_Form(object): self.gridLayout_114.addLayout(self.gridLayout_117, 2, 0, 1, 1) self.gridLayout_113.addLayout(self.gridLayout_114, 2, 0, 1, 1) self.gridLayout_112.addWidget(self.groupBox_22, 0, 0, 1, 1) - icon79 = QtGui.QIcon() - icon79.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_startPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_12.addTab(self.tab_22, icon79, _fromUtf8("")) + icon88 = QtGui.QIcon() + icon88.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_startPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_12.addTab(self.tab_22, icon88, _fromUtf8("")) self.tab_23 = QtGui.QWidget() self.tab_23.setObjectName(_fromUtf8("tab_23")) self.gridLayout_118 = QtGui.QGridLayout(self.tab_23) @@ -2191,9 +2305,9 @@ class Ui_Form(object): self.gridLayout_120.addLayout(self.gridLayout_123, 0, 0, 1, 1) self.gridLayout_119.addLayout(self.gridLayout_120, 2, 0, 1, 1) self.gridLayout_118.addWidget(self.groupBox_23, 0, 0, 1, 1) - icon80 = QtGui.QIcon() - icon80.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_endPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_12.addTab(self.tab_23, icon80, _fromUtf8("")) + icon89 = QtGui.QIcon() + icon89.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_endPoint.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_12.addTab(self.tab_23, icon89, _fromUtf8("")) self.gridLayout_111.addWidget(self.tabWidget_12, 2, 0, 1, 1) self.horizontalLayout_84 = QtGui.QHBoxLayout() self.horizontalLayout_84.setObjectName(_fromUtf8("horizontalLayout_84")) @@ -2202,8 +2316,8 @@ class Ui_Form(object): self.ObjTrans_button_reset.setMaximumSize(QtCore.QSize(60, 16777215)) self.ObjTrans_button_reset.setObjectName(_fromUtf8("ObjTrans_button_reset")) self.horizontalLayout_84.addWidget(self.ObjTrans_button_reset) - spacerItem20 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_84.addItem(spacerItem20) + spacerItem22 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_84.addItem(spacerItem22) self.ObjTrans_button_apply = QtGui.QPushButton(self.frame_12) self.ObjTrans_button_apply.setMinimumSize(QtCore.QSize(40, 0)) self.ObjTrans_button_apply.setMaximumSize(QtCore.QSize(60, 16777215)) @@ -2211,8 +2325,8 @@ class Ui_Form(object): self.horizontalLayout_84.addWidget(self.ObjTrans_button_apply) self.gridLayout_111.addLayout(self.horizontalLayout_84, 3, 0, 1, 1) self.gridLayout_110.addWidget(self.frame_12, 0, 0, 1, 1) - spacerItem21 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_110.addItem(spacerItem21, 1, 0, 1, 1) + spacerItem23 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_110.addItem(spacerItem23, 1, 0, 1, 1) self.tabWidget_9.addTab(self.translate_tab_2, _fromUtf8("")) self.gridLayout_94.addWidget(self.tabWidget_9, 0, 0, 1, 1) self.tabWidget_7.addTab(self.Modif_Tab_2, _fromUtf8("")) @@ -2227,103 +2341,103 @@ class Ui_Form(object): sizePolicy.setHeightForWidth(self.button_alignview.sizePolicy().hasHeightForWidth()) self.button_alignview.setSizePolicy(sizePolicy) self.button_alignview.setMaximumSize(QtCore.QSize(16777215, 16777215)) - icon81 = QtGui.QIcon() - icon81.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_viewAlign.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_alignview.setIcon(icon81) + icon90 = QtGui.QIcon() + icon90.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_viewAlign.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_alignview.setIcon(icon90) self.button_alignview.setIconSize(QtCore.QSize(32, 32)) self.button_alignview.setObjectName(_fromUtf8("button_alignview")) self.gridLayout_124.addWidget(self.button_alignview, 0, 0, 1, 1) - spacerItem22 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_124.addItem(spacerItem22, 2, 0, 1, 1) + spacerItem24 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_124.addItem(spacerItem24, 2, 0, 1, 1) self.button_trackcamera = QtGui.QPushButton(self.View_Tab_2) - icon82 = QtGui.QIcon() - icon82.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_trackCamera.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_trackcamera.setIcon(icon82) + icon91 = QtGui.QIcon() + icon91.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_trackCamera.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_trackcamera.setIcon(icon91) self.button_trackcamera.setIconSize(QtCore.QSize(32, 32)) self.button_trackcamera.setObjectName(_fromUtf8("button_trackcamera")) self.gridLayout_124.addWidget(self.button_trackcamera, 1, 0, 1, 1) - icon83 = QtGui.QIcon() - icon83.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_view.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.View_Tab_2, icon83, _fromUtf8("")) + icon92 = QtGui.QIcon() + icon92.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_view.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.View_Tab_2, icon92, _fromUtf8("")) self.tab_24 = QtGui.QWidget() self.tab_24.setObjectName(_fromUtf8("tab_24")) self.gridLayout_125 = QtGui.QGridLayout(self.tab_24) self.gridLayout_125.setObjectName(_fromUtf8("gridLayout_125")) self.button_isView = QtGui.QPushButton(self.tab_24) - icon84 = QtGui.QIcon() - icon84.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FCCamera_02.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isView.setIcon(icon84) + icon93 = QtGui.QIcon() + icon93.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_FCCamera_02.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isView.setIcon(icon93) self.button_isView.setIconSize(QtCore.QSize(32, 32)) self.button_isView.setObjectName(_fromUtf8("button_isView")) self.gridLayout_125.addWidget(self.button_isView, 9, 0, 1, 1) - spacerItem23 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_125.addItem(spacerItem23, 10, 0, 1, 1) + spacerItem25 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_125.addItem(spacerItem25, 10, 0, 1, 1) self.button_isParallel = QtGui.QPushButton(self.tab_24) - icon85 = QtGui.QIcon() - icon85.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isParallel.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isParallel.setIcon(icon85) + icon94 = QtGui.QIcon() + icon94.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isParallel.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isParallel.setIcon(icon94) self.button_isParallel.setIconSize(QtCore.QSize(32, 32)) self.button_isParallel.setObjectName(_fromUtf8("button_isParallel")) self.gridLayout_125.addWidget(self.button_isParallel, 0, 0, 1, 1) self.button_isAngle = QtGui.QPushButton(self.tab_24) - icon86 = QtGui.QIcon() - icon86.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_angleBetween.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isAngle.setIcon(icon86) + icon95 = QtGui.QIcon() + icon95.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_angleBetween.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isAngle.setIcon(icon95) self.button_isAngle.setIconSize(QtCore.QSize(32, 32)) self.button_isAngle.setObjectName(_fromUtf8("button_isAngle")) self.gridLayout_125.addWidget(self.button_isAngle, 4, 0, 1, 1) self.button_isLength = QtGui.QPushButton(self.tab_24) - icon87 = QtGui.QIcon() - icon87.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isLength.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isLength.setIcon(icon87) + icon96 = QtGui.QIcon() + icon96.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isLength.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isLength.setIcon(icon96) self.button_isLength.setIconSize(QtCore.QSize(32, 32)) self.button_isLength.setObjectName(_fromUtf8("button_isLength")) self.gridLayout_125.addWidget(self.button_isLength, 6, 0, 1, 1) self.button_isDistance = QtGui.QPushButton(self.tab_24) - icon88 = QtGui.QIcon() - icon88.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distanceBetween.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isDistance.setIcon(icon88) + icon97 = QtGui.QIcon() + icon97.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_distanceBetween.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isDistance.setIcon(icon97) self.button_isDistance.setIconSize(QtCore.QSize(32, 32)) self.button_isDistance.setObjectName(_fromUtf8("button_isDistance")) self.gridLayout_125.addWidget(self.button_isDistance, 5, 0, 1, 1) self.button_isCoplanar = QtGui.QPushButton(self.tab_24) - icon89 = QtGui.QIcon() - icon89.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isCoplanar.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isCoplanar.setIcon(icon89) + icon98 = QtGui.QIcon() + icon98.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isCoplanar.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isCoplanar.setIcon(icon98) self.button_isCoplanar.setIconSize(QtCore.QSize(32, 32)) self.button_isCoplanar.setObjectName(_fromUtf8("button_isCoplanar")) self.gridLayout_125.addWidget(self.button_isCoplanar, 2, 0, 1, 1) self.button_isArea = QtGui.QPushButton(self.tab_24) - icon90 = QtGui.QIcon() - icon90.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isArea.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isArea.setIcon(icon90) + icon99 = QtGui.QIcon() + icon99.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isArea.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isArea.setIcon(icon99) self.button_isArea.setIconSize(QtCore.QSize(32, 32)) self.button_isArea.setObjectName(_fromUtf8("button_isArea")) self.gridLayout_125.addWidget(self.button_isArea, 7, 0, 1, 1) self.button_isPerpendicular = QtGui.QPushButton(self.tab_24) - icon91 = QtGui.QIcon() - icon91.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isPerpendicular.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isPerpendicular.setIcon(icon91) + icon100 = QtGui.QIcon() + icon100.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isPerpendicular.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isPerpendicular.setIcon(icon100) self.button_isPerpendicular.setIconSize(QtCore.QSize(32, 32)) self.button_isPerpendicular.setObjectName(_fromUtf8("button_isPerpendicular")) self.gridLayout_125.addWidget(self.button_isPerpendicular, 1, 0, 1, 1) self.button_isClearance = QtGui.QPushButton(self.tab_24) - icon92 = QtGui.QIcon() - icon92.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isClearance.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isClearance.setIcon(icon92) + icon101 = QtGui.QIcon() + icon101.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isClearance.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isClearance.setIcon(icon101) self.button_isClearance.setIconSize(QtCore.QSize(32, 32)) self.button_isClearance.setObjectName(_fromUtf8("button_isClearance")) self.gridLayout_125.addWidget(self.button_isClearance, 3, 0, 1, 1) self.button_isRadius = QtGui.QPushButton(self.tab_24) - icon93 = QtGui.QIcon() - icon93.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isRadius.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.button_isRadius.setIcon(icon93) + icon102 = QtGui.QIcon() + icon102.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_isRadius.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.button_isRadius.setIcon(icon102) self.button_isRadius.setIconSize(QtCore.QSize(32, 32)) self.button_isRadius.setObjectName(_fromUtf8("button_isRadius")) self.gridLayout_125.addWidget(self.button_isRadius, 8, 0, 1, 1) - icon94 = QtGui.QIcon() - icon94.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_check.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.tabWidget_7.addTab(self.tab_24, icon94, _fromUtf8("")) + icon103 = QtGui.QIcon() + icon103.addPixmap(QtGui.QPixmap(_fromUtf8("icons:WF_check.svg")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.tabWidget_7.addTab(self.tab_24, icon103, _fromUtf8("")) self.gridLayout_128.addWidget(self.tabWidget_7, 0, 0, 1, 1) self.scrollArea.setWidget(self.scrollAreaWidgetContents) self.gridLayout_34.addWidget(self.scrollArea, 0, 0, 1, 1) @@ -2332,17 +2446,20 @@ class Ui_Form(object): self.button_WF_quit = QtGui.QPushButton(Form) self.button_WF_quit.setObjectName(_fromUtf8("button_WF_quit")) self.horizontalLayout_43.addWidget(self.button_WF_quit) - spacerItem24 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_43.addItem(spacerItem24) + spacerItem26 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_43.addItem(spacerItem26) self.label_release = QtGui.QLabel(Form) self.label_release.setObjectName(_fromUtf8("label_release")) self.horizontalLayout_43.addWidget(self.label_release) self.gridLayout_34.addLayout(self.horizontalLayout_43, 1, 0, 1, 1) self.retranslateUi(Form) - self.tabWidget_7.setCurrentIndex(7) + self.tabWidget_7.setCurrentIndex(0) + self.tabWidget.setCurrentIndex(2) + self.tabWidget_2.setCurrentIndex(2) self.point_loc_comboBox.setCurrentIndex(1) self.tabWidget_8.setCurrentIndex(0) + self.tabWidget_3.setCurrentIndex(1) self.transition_comboBox.setCurrentIndex(2) self.tabWidget_9.setCurrentIndex(0) self.tabWidget_10.setCurrentIndex(0) @@ -2390,29 +2507,6 @@ class Ui_Form(object): " are Coplanar?", None)) self.tolerance_edit.setText(_translate("Form", "1e-10", None)) self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Origin_Tab_2), _translate("Form", "Ori. Pref.", None)) - self.button_circle_center.setToolTip(_translate("Form", "Create a Point at center location of each selected Circle(s) or Arc(s).", None)) - self.button_circle_center.setText(_translate("Form", "Circle(s) Center", None)) - self.button_point_line_point.setToolTip(_translate("Form", "Point(s)=(Point(s),Line(s)):\n" -"Create projection(s) of Point(s) onto Line(s).\n" -"- First select one (or several) Point(s)\n" -"- Second select one or several) Line(s)\n" -"- Then push this button\n" -"\n" -"Plot the intersection point T on a Line given one Line and One Point C.\n" -"The Vector TC is perpendicular to the Line.\n" -"The symetric point Cprime is also created as TC=TCprime.", None)) - self.button_point_line_point.setText(_translate("Form", "Point(s)=(Pt(s),Line(s)) ", None)) - self.button_face_center.setToolTip(_translate("Form", "Create a Point at center location of each selected Face(s).", None)) - self.button_face_center.setText(_translate("Form", "Face(s) Center", None)) - self.button_line_center.setToolTip(_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)) - self.button_line_center.setText(_translate("Form", "Line(s) Center", None)) - self.spin_line_center.setToolTip(_translate("Form", "The number indicates in how many parts each selected Lines(s) will be cut (Max 100).", None)) - self.button_Npoints_center.setToolTip(_translate("Form", "Create a Point at mean location of all selected points.", None)) - self.button_Npoints_center.setText(_translate("Form", "Points Center", None)) - self.button_line_face_point.setToolTip(_translate("Form", "Create a point at the intersection of the Line and Plane selected.", None)) - self.button_line_face_point.setText(_translate("Form", "Point=(Line,Face) ", None)) self.button_object_center.setToolTip(_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" @@ -2428,8 +2522,24 @@ class Ui_Form(object): " This bounding box alway exists (especially for draft objects).\n" " Be aware this point is not necessary the center of Mass of all Objects!", None)) self.checkBox_object_center.setText(_translate("Form", "BBox", None)) + self.button_Npoints_center.setToolTip(_translate("Form", "Point=(N Points):\n" +"Create a Point at mean location of all selected points.\n" +"- First select several Points\n" +"- Then push this button", None)) + self.button_Npoints_center.setText(_translate("Form", "Points Center", None)) + self.button_line_center.setToolTip(_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)) + self.button_line_center.setText(_translate("Form", "Line(s) Center", None)) + self.spin_line_center.setToolTip(_translate("Form", "The number indicates in how many parts each selected Lines(s) will be cut (Max 100).", None)) self.button_line_extrema.setToolTip(_translate("Form", "Create Points at start and end location of each selected Line(s).", None)) self.button_line_extrema.setText(_translate("Form", "Line(s) Extrema", None)) + self.button_circle_center.setToolTip(_translate("Form", "Create a Point at center location of each selected Circle(s) or Arc(s).", None)) + self.button_circle_center.setText(_translate("Form", "Circle(s) Center", None)) + self.button_face_center.setToolTip(_translate("Form", "Create a Point at center location of each selected Face(s).", None)) + self.button_face_center.setText(_translate("Form", "Face(s) Center", None)) + self.button_line_face_point.setToolTip(_translate("Form", "Create a point at the intersection of the Line and Plane selected.", None)) + self.button_line_face_point.setText(_translate("Form", "Point=(Line,Face) ", None)) self.button_point_face_point.setToolTip(_translate("Form", "Point(s)=(Point(s),Face(s)):\n" "Create projection(s) of Point(s) onto Face(s).\n" "- First select one (or several) Point(s)\n" @@ -2439,8 +2549,18 @@ class Ui_Form(object): "Plot the intersection point T on a Plane given one Plane and One Point C.\n" "The Vector TC is perpendicular to the plane.", None)) self.button_point_face_point.setText(_translate("Form", "Point(s)=(Pt(s),Face(s))", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Point_Tab1_2), _translate("Form", "Point 1/2", None)) - self.tabWidget_7.setTabToolTip(self.tabWidget_7.indexOf(self.Point_Tab1_2), _translate("Form", "Point", None)) + self.button_point_line_point.setToolTip(_translate("Form", "Point(s)=(Point(s),Line(s)):\n" +"Create projection(s) of Point(s) onto Line(s).\n" +"- First select one (or several) Point(s)\n" +"- Second select one or several) Line(s)\n" +"- Then push this button\n" +"\n" +"Plot the intersection point T on a Line given one Line and One Point C.\n" +"The Vector TC is perpendicular to the Line.\n" +"The symetric point Cprime is also created as TC=TCprime.", None)) + self.button_point_line_point.setText(_translate("Form", "Point(s)=(Pt(s),Line(s)) ", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.Point_Tab1_3), _translate("Form", "Point 1/3", None)) + self.tabWidget.setTabToolTip(self.tabWidget.indexOf(self.Point_Tab1_3), _translate("Form", "Create Point(s)", None)) self.button_twolines_point.setToolTip(_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)) self.button_twolines_point.setText(_translate("Form", "Point=(Line,Line) ", None)) @@ -2480,33 +2600,90 @@ class Ui_Form(object): self.button_click_for_point.setToolTip(_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" +"\n" +"Use left mouse button (MB1) to generate Points. \n" +"MB2 and MB3 can still be used for view zoom and view rotation.\n" "", None)) self.button_click_for_point.setText(_translate("Form", "Click", None)) self.button_object_base_point.setToolTip(_translate("Form", "Create Base Point of all selected Object(s).", None)) self.button_object_base_point.setText(_translate("Form", "Object(s) Base Point", None)) + self.button_object_center_mass_point.setToolTip(_translate("Form", "Create Center of Mass Point of all selected Object(s).", None)) + self.button_object_center_mass_point.setText(_translate("Form", "Object(s) Mass Center Point", None)) + self.button_object_Npoint.setToolTip(_translate("Form", "Create a set of points from selected Objetcs:\n" +"- Select object(s)\n" +" to create points from these object(s) !\n" +" If you select an Edge : 2 points will be created;\n" +" if you select a Plane : 4 points will be created;\n" +" if you select an Object : many points will be created.\n" +"- Then click on this button.", None)) + self.button_object_Npoint.setText(_translate("Form", "Object(s) N Point(s)", None)) self.button_point_to_sketch.setToolTip(_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)) self.button_point_to_sketch.setText(_translate("Form", "Point(s) to Sketch", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Point_Tab2_2), _translate("Form", "Point 2/2", None)) - self.button_object_axis.setToolTip(_translate("Form", "Create 3 Axes at center location of all selected Object(s).", None)) - self.button_object_axis.setText(_translate("Form", "Object(s) X, Y, Z Axes", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.Point_Tab2_3), _translate("Form", "Point 2/3", None)) + self.tabWidget.setTabToolTip(self.tabWidget.indexOf(self.Point_Tab2_3), _translate("Form", "Create Point(s)", None)) + self.button_points_load.setToolTip(_translate("Form", "Load a set of points from an ASCII file:\n" +" ASCII format is 3 values by line seperated by blank as : \n" +" 15.3f 15.3f 15.3f\n" +" Values are read as float.\n" +" \n" +" Lines starting with characeter : # or / are considered as comment lines\n" +" ", None)) + self.button_points_load.setText(_translate("Form", "Load Points", None)) + self.button_points_save.setToolTip(_translate("Form", "Save a point or a set of points into an ASCII file:\n" +"One (x, y, z) triplet per line seperated by blank.\n" +"\n" +"- Select as much as Points as needed and/or select object(s)\n" +" to save points from these object(s) !\n" +" If you select an Edge : 2 points will be saved;\n" +" if you select a Plane : 4 points will be saved;\n" +" if you select an Object : many points will be saved.\n" +"- Then click on this button.", None)) + self.button_points_save.setText(_translate("Form", "Save Points", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.Point_Tab3_3), _translate("Form", "Point 3/3", None)) + self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Point_Tab), _translate("Form", "Point", None)) + self.tabWidget_7.setTabToolTip(self.tabWidget_7.indexOf(self.Point_Tab), _translate("Form", "Create Point(s)", None)) self.button_twopoints_axis.setToolTip(_translate("Form", "Create an Axis crossing 2 Points.", None)) self.button_twopoints_axis.setText(_translate("Form", "Two Points Axis", None)) self.extension_twopoints_axis.setToolTip(_translate("Form", "Distance for the extensions on extrema.\n" "Positive values will enlarge the Axis.\n" "Negative values will start to shrink it (then reverse when middle reached). ", None)) self.extension_twopoints_axis.setText(_translate("Form", "0.0", None)) - self.button_Npoints_axis.setToolTip(_translate("Form", "Axis=(Points):\n" -"Create a \"best fit\" line from a set of points using Singular Value Decomposition..\n" -"- First select several Points\n" + self.button_object_axis.setToolTip(_translate("Form", "Create 3 Axes at center location of all selected Object(s).", None)) + self.button_object_axis.setText(_translate("Form", "Object(s) X, Y, Z Axes", None)) + self.button_line_point_axis.setToolTip(_translate("Form", "Create an Axis Perpendicular to an Axis and crossing a Point\n" +"-Select one Axis and one (or several) Point(s) NOT on the previous Axis.", None)) + self.button_line_point_axis.setText(_translate("Form", "Axis=(Axis,Point)", None)) + self.extension_line_point_axis.setToolTip(_translate("Form", "Distance for the extensions on extrema.\n" +"Positive values will enlarge the Axis.\n" +"Negative values will start to shrink it (then reverse when middle reached). ", None)) + self.extension_line_point_axis.setText(_translate("Form", "0.0", None)) + self.button_Npoints_axis.setToolTip(_translate("Form", "Axis=(N Points):\n" +"Create a \"best fit\" Line from a set of points using Singular Value Decomposition.\n" +"- First select several Points (at least 2);\n" "- Then push this button\n" "\n" "The 3 eigenvectors are generated.\n" "Orange one is the best fit line.\n" "", None)) self.button_Npoints_axis.setText(_translate("Form", "Axis from Point(s)", None)) + self.button_point_line_axis.setToolTip(_translate("Form", "Create an Axis Parallel to an Axis (as Direction) and crossing a Point.\n" +"- Select one Axis and one (or several) Point(s) NOT on the previous Axis.\n" +"Define the length and the attach point if needed.\n" +"A Length of Zero means the length of already selected Axis will be used.", None)) + self.button_point_line_axis.setText(_translate("Form", "Axis=(Pt,Dir)", None)) + self.extension_line.setToolTip(_translate("Form", "Define the length of the Axis to create.\n" +"A Length of Zero means the length of already selected Axis will be used.", None)) + self.extension_line.setText(_translate("Form", "0.0", None)) + self.point_loc_comboBox.setToolTip(_translate("Form", "The Attach Point will be at :\n" +"Start of the Axis;\n" +"Mid of the Axis;\n" +"End of the Axis.", None)) + self.point_loc_comboBox.setItemText(0, _translate("Form", "Start", None)) + self.point_loc_comboBox.setItemText(1, _translate("Form", "Mid", None)) + self.point_loc_comboBox.setItemText(2, _translate("Form", "End", None)) self.button_cylinder_axis.setToolTip(_translate("Form", "Create the Axis of a Cylinder.", None)) self.button_cylinder_axis.setText(_translate("Form", "Cylinder(s) Axis", None)) self.button_plane_axis.setToolTip(_translate("Form", "Plane(s) Axes:\n" @@ -2543,35 +2720,13 @@ class Ui_Form(object): " Positive values will enlarge the Axis toward OUTSIDE of the Face Object;\n" " Negative values will enlarge the Axis toward INSIDE of the Face Object.", None)) self.extension_face_normal.setText(_translate("Form", "0.0", None)) - self.button_point_line_axis.setToolTip(_translate("Form", "Create an Axis Parallel to an Axis (as Direction) and crossing a Point.\n" -"- Select one Axis and one (or several) Point(s) NOT on the previous Axis.\n" -"Define the length and the attach point if needed.\n" -"A Length of Zero means the length of already selected Axis will be used.", None)) - self.button_point_line_axis.setText(_translate("Form", "Axis=(Pt,Dir)", None)) - self.extension_line.setToolTip(_translate("Form", "Define the length of the Axis to create.\n" -"A Length of Zero means the length of already selected Axis will be used.", None)) - self.extension_line.setText(_translate("Form", "0.0", None)) - self.point_loc_comboBox.setToolTip(_translate("Form", "The Attach Point will be at :\n" -"Start of the Axis;\n" -"Mid of the Axis;\n" -"End of the Axis.", None)) - self.point_loc_comboBox.setItemText(0, _translate("Form", "Start", None)) - self.point_loc_comboBox.setItemText(1, _translate("Form", "Mid", None)) - self.point_loc_comboBox.setItemText(2, _translate("Form", "End", None)) - self.button_line_point_axis.setToolTip(_translate("Form", "Create an Axis Perpendicular to an Axis and crossing a Point\n" -"-Select one Axis and one (or several) Point(s) NOT on the previous Axis.", None)) - self.button_line_point_axis.setText(_translate("Form", "Axis=(Axis,Point)", None)) - self.extension_line_point_axis.setToolTip(_translate("Form", "Distance for the extensions on extrema.\n" -"Positive values will enlarge the Axis.\n" -"Negative values will start to shrink it (then reverse when middle reached). ", None)) - self.extension_line_point_axis.setText(_translate("Form", "0.0", None)) self.button_twolines_axis.setToolTip(_translate("Form", "Create an Axis between two Axes.\n" "-Select two Axes.", None)) self.button_twolines_axis.setText(_translate("Form", "Axis=(Line,Line)", None)) + self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.Axis_Tab1_3), _translate("Form", "Axis 1/3", None)) self.button_plane_point_line_axis.setToolTip(_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)) self.button_plane_point_line_axis.setText(_translate("Form", "Axis=(Plane,Point,Axis)", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Axis_Tab1_2), _translate("Form", "Axis 1/2", None)) self.button_line_plane_axis.setToolTip(_translate("Form", "Axes=(Pl(s),Axes):\n" "Create projection(s) of Axes onto Plane(s).\n" "- First select one (or several) Line(s)\n" @@ -2667,95 +2822,38 @@ class Ui_Form(object): self.extension_axis.setText(_translate("Form", "50.0", None)) self.button_click_for_axis.setToolTip(_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)) +"- 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.\n" +"\n" +"\n" +"Use left mouse button (MB1) to generate Lines. \n" +"MB2 and MB3 can still be used for view zoom and view rotation.", None)) self.button_click_for_axis.setText(_translate("Form", "Click", None)) + self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.Axis_Tab2_3), _translate("Form", "Axis 2/3", None)) self.button_object_base_axes.setToolTip(_translate("Form", "Create 3 Axes at Base location of all selected Object(s).", None)) self.button_object_base_axes.setText(_translate("Form", "Object(s) Base Axes", None)) + self.button_object_Naxes.setToolTip(_translate("Form", "Create a set of axes from selected Objetcs:\n" +"- Select object(s)\n" +" to create axes from these object(s) !\n" +" if you select a Plane : 4 axes will be created;\n" +" if you select an Object : many axes will be created.\n" +"- Then click on this button.", None)) + self.button_object_Naxes.setText(_translate("Form", "Object(s) N Axes(s)", None)) + self.button_object_3axes.setToolTip(_translate("Form", "Create a set of 2 or 3 main axes from selected Objetcs:\n" +"The most representative axes will be selected from all axis.\n" +"The length of main axes will be the cumulative length of all axes with the same direction.\n" +"- Select object(s)\n" +" to create axes from these object(s) !\n" +" if you select a Plane : 2 axes will be created;\n" +" if you select an Object : 3 axes will be created.\n" +"- Then click on this button.", None)) + self.button_object_3axes.setText(_translate("Form", "Object(s) 3 Axes(s)", None)) self.button_line_to_sketch.setToolTip(_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)) self.button_line_to_sketch.setText(_translate("Form", "Axis(es) to Sketch", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Axis_Tab2_2), _translate("Form", "Axis 2/2", None)) - self.lineEdit.setText(_translate("Form", "Examples from http://www.mathcurve.com/", None)) - self.groupBox_14.setTitle(_translate("Form", "Equation :", None)) - self.label_y_3.setText(_translate("Form", "Y (a,b,t) ", None)) - self.ParCurve_a_2.setText(_translate("Form", "10 # Radius", None)) - self.label_b_3.setText(_translate("Form", "b (a, t) ", None)) - self.ParCurve_y_2.setText(_translate("Form", "b*sin(t)", None)) - self.checkBox_polar_2.setToolTip(_translate("Form", "Toggle for Polar coordinates:\n" -"then x is interpreted as radius\n" -" and y is interpreted as angle teta.", None)) - self.checkBox_polar_2.setText(_translate("Form", " Polar coord.", None)) - self.label_x_3.setText(_translate("Form", "X (a,b,t) ", None)) - self.ParCurve_x_2.setText(_translate("Form", "a*cos(t)", None)) - self.label_a_3.setText(_translate("Form", "a (t) ", None)) - self.ParCurve_b_2.setText(_translate("Form", "a", None)) - self.ParCurve_comboBox_2.setToolTip(_translate("Form", "Choose another curve from the list.", None)) - self.ParCurve_button_edit_2.setToolTip(_translate("Form", "Click to access to a table where you can edit all parameters of all curves and \n" -"save your custom curves.", None)) - self.ParCurve_button_edit_2.setText(_translate("Form", "Edit", None)) - self.checkBox_close_2.setText(_translate("Form", "Closed curve", None)) - self.checkBox_face_2.setText(_translate("Form", "Create Face", None)) - self.label_name_2.setText(_translate("Form", "Name", None)) - self.ParCurve_name_2.setText(_translate("Form", "Circle", None)) - self.groupBox_15.setTitle(_translate("Form", "Parameters", None)) - self.label_tmin_3.setText(_translate("Form", "t min", None)) - self.ParCurve_tmin_2.setText(_translate("Form", "0", None)) - self.label_tmax_3.setText(_translate("Form", "t max", None)) - self.ParCurve_tmax_2.setText(_translate("Form", "2*pi", None)) - self.label_tstep_3.setText(_translate("Form", "step", None)) - self.ParCurve_tstep_2.setText(_translate("Form", "0.01", None)) - self.groupBox_16.setTitle(_translate("Form", "Type of 2D Curve", None)) - self.checkBox_points_2.setText(_translate("Form", "Points", None)) - self.checkBox_polyline_2.setText(_translate("Form", "Polyline", None)) - self.checkBox_bspline_2.setText(_translate("Form", "Bspline", None)) - self.checkBox_bezier_2.setText(_translate("Form", "Bezier", None)) - self.ParCurve_button_store_2.setToolTip(_translate("Form", "Click to store the current edited curve into the table.\n" -"To save your curve you need to go to \"Edit\".", None)) - self.ParCurve_button_store_2.setText(_translate("Form", "Store", None)) - self.ParCurve_button_apply_2.setToolTip(_translate("Form", "Click to visualize the curve.", None)) - self.ParCurve_button_apply_2.setText(_translate("Form", "Apply", None)) - self.tabWidget_8.setTabText(self.tabWidget_8.indexOf(self.tab_14), _translate("Form", "Parametric 2D", None)) - self.ParCurve_comboBox_3.setToolTip(_translate("Form", "Choose another curve from the list.", None)) - self.ParCurve_button_edit_3.setToolTip(_translate("Form", "Click to access to a table where you can edit all parameters of all curves and \n" -"save your custom curves.", None)) - self.ParCurve_button_edit_3.setText(_translate("Form", "Edit", None)) - self.label_name_3.setText(_translate("Form", "Name", None)) - self.ParCurve_name_3.setText(_translate("Form", "Cylindrical helix", None)) - self.groupBox_17.setTitle(_translate("Form", "Equation :", None)) - self.label_a_4.setText(_translate("Form", "a (t) ", None)) - self.ParCurve_a_3.setText(_translate("Form", "10*0.05 #Vert. step", None)) - self.label_b_4.setText(_translate("Form", "b (a, t) ", None)) - self.ParCurve_b_3.setText(_translate("Form", "1", None)) - self.label_c_2.setText(_translate("Form", "c (a, b, t) ", None)) - self.ParCurve_c_3.setText(_translate("Form", "10 # Radius", None)) - self.label_x_4.setText(_translate("Form", "X (a,b,c,t) ", None)) - self.ParCurve_x_3.setText(_translate("Form", "c*sin(t)", None)) - self.label_y_4.setText(_translate("Form", "Y (a,b,c,t) ", None)) - self.label_z_2.setText(_translate("Form", "Z (a,b,c,t) ", None)) - self.ParCurve_z_3.setText(_translate("Form", "a*t", None)) - self.ParCurve_y_3.setText(_translate("Form", "c*cos(t)", None)) - self.groupBox_18.setTitle(_translate("Form", "Parameters", None)) - self.label_tmin_4.setText(_translate("Form", "t min", None)) - self.label_tmax_4.setText(_translate("Form", "t max", None)) - self.ParCurve_tmax_3.setText(_translate("Form", "5*2*pi #5 circles", None)) - self.label_tstep_4.setText(_translate("Form", "step", None)) - self.ParCurve_tstep_3.setText(_translate("Form", "0.01", None)) - self.ParCurve_tmin_3.setText(_translate("Form", "0", None)) - self.groupBox_19.setTitle(_translate("Form", "Type of 3D Curve", None)) - self.checkBox_points_3.setText(_translate("Form", "Points", None)) - self.checkBox_polyline_3.setText(_translate("Form", "Polyline", None)) - self.checkBox_bspline_3.setText(_translate("Form", "Bspline", None)) - self.checkBox_bezier_3.setText(_translate("Form", "Bezier", None)) - self.checkBox_close_3.setText(_translate("Form", "Closed curve", None)) - self.ParCurve_button_store_3.setToolTip(_translate("Form", "Click to store the current edited curve into the table.\n" -"To save your curve you need to go to \"Edit\".", None)) - self.ParCurve_button_store_3.setText(_translate("Form", "Store", None)) - self.ParCurve_button_apply_3.setToolTip(_translate("Form", "Click to visualize the curve.", None)) - self.ParCurve_button_apply_3.setText(_translate("Form", "Apply", None)) - self.tabWidget_8.setTabText(self.tabWidget_8.indexOf(self.tab_15), _translate("Form", "Parametric 3D", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Wire_Tab_2), _translate("Form", "Wire", None)) + self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.Axis_Tab31_3), _translate("Form", "Axis 3/3", None)) + self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Axis_Tab), _translate("Form", "Axis", None)) self.button_linecenter_circle.setToolTip(_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)) @@ -2786,6 +2884,196 @@ class Ui_Form(object): "Then click on this button.", None)) self.button_circle_to_sketch.setText(_translate("Form", "Circle(s) to Sketch", None)) self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.tab_16), _translate("Form", "Circle", None)) + self.lineEdit.setText(_translate("Form", "Examples from http://www.mathcurve.com/", None)) + self.groupBox_14.setTitle(_translate("Form", "Equation :", None)) + self.label_y_3.setText(_translate("Form", "Y (a,b,t) ", None)) + self.ParCurve_a_2.setText(_translate("Form", "10 # Radius", None)) + self.label_b_3.setText(_translate("Form", "b (a, t) ", None)) + self.ParCurve_y_2.setText(_translate("Form", "b*sin(t)", None)) + self.checkBox_polar_2.setToolTip(_translate("Form", "Toggle for Polar coordinates:\n" +"then x is interpreted as radius\n" +" and y is interpreted as angle teta.", None)) + self.checkBox_polar_2.setText(_translate("Form", " Polar coord.", None)) + self.label_x_3.setText(_translate("Form", "X (a,b,t) ", None)) + self.ParCurve_x_2.setText(_translate("Form", "a*cos(t)", None)) + self.label_a_3.setText(_translate("Form", "a (t) ", None)) + self.ParCurve_b_2.setText(_translate("Form", "a", None)) + self.ParCurve_comboBox_2.setToolTip(_translate("Form", "Choose another curve from the list.", None)) + self.ParCurve_button_edit_2.setToolTip(_translate("Form", "Click to access to a table where you can edit all parameters of all curves and \n" +"save your custom curves.", None)) + self.ParCurve_button_edit_2.setText(_translate("Form", "Edit", None)) + self.checkBox_close_2.setText(_translate("Form", "Closed curve", None)) + self.checkBox_face_2.setText(_translate("Form", "Create Face", None)) + self.label_name_2.setText(_translate("Form", "Name", None)) + self.ParCurve_name_2.setText(_translate("Form", "Circle", None)) + self.groupBox_15.setTitle(_translate("Form", "Parameter :", None)) + self.label_tmin_3.setText(_translate("Form", "t min", None)) + self.ParCurve_tmin_2.setText(_translate("Form", "0", None)) + self.label_tmax_3.setText(_translate("Form", "t max", None)) + self.ParCurve_tmax_2.setText(_translate("Form", "2*pi", None)) + self.label_tstep_3.setText(_translate("Form", "step", None)) + self.ParCurve_tstep_2.setText(_translate("Form", "0.01", None)) + self.groupBox_16.setTitle(_translate("Form", "Type of 2D Curve :", None)) + self.checkBox_points_2.setText(_translate("Form", "Points", None)) + self.checkBox_polyline_2.setText(_translate("Form", "Polyline", None)) + self.checkBox_bezier_2.setText(_translate("Form", "Bezier", None)) + self.checkBox_bspline_2.setText(_translate("Form", "Bspline", None)) + self.ParCurve_button_store_2.setToolTip(_translate("Form", "Click to store the current edited curve into the table.\n" +"To save your curve you need to go to \"Edit\".", None)) + self.ParCurve_button_store_2.setText(_translate("Form", "Store", None)) + self.ParCurve_button_apply_2.setToolTip(_translate("Form", "Click to visualize the curve.", None)) + self.ParCurve_button_apply_2.setText(_translate("Form", "Apply", None)) + self.tabWidget_8.setTabText(self.tabWidget_8.indexOf(self.tab_14), _translate("Form", "Parametric 2D", None)) + self.ParCurve_comboBox_3.setToolTip(_translate("Form", "Choose another curve from the list.", None)) + self.ParCurve_button_edit_3.setToolTip(_translate("Form", "Click to access to a table where you can edit all parameters of all curves and \n" +"save your custom curves.", None)) + self.ParCurve_button_edit_3.setText(_translate("Form", "Edit", None)) + self.label_name_3.setText(_translate("Form", "Name", None)) + self.ParCurve_name_3.setText(_translate("Form", "Cylindrical helix", None)) + self.groupBox_17.setTitle(_translate("Form", "Equation :", None)) + self.label_a_4.setText(_translate("Form", "a (t) ", None)) + self.ParCurve_a_3.setText(_translate("Form", "10*0.05 #Vert. step", None)) + self.label_b_4.setText(_translate("Form", "b (a, t) ", None)) + self.ParCurve_b_3.setText(_translate("Form", "1", None)) + self.label_c_2.setText(_translate("Form", "c (a, b, t) ", None)) + self.ParCurve_c_3.setText(_translate("Form", "10 # Radius", None)) + self.label_x_4.setText(_translate("Form", "X (a,b,c,t) ", None)) + self.ParCurve_x_3.setText(_translate("Form", "c*sin(t)", None)) + self.label_y_4.setText(_translate("Form", "Y (a,b,c,t) ", None)) + self.label_z_2.setText(_translate("Form", "Z (a,b,c,t) ", None)) + self.ParCurve_z_3.setText(_translate("Form", "a*t", None)) + self.ParCurve_y_3.setText(_translate("Form", "c*cos(t)", None)) + self.groupBox_18.setTitle(_translate("Form", "Parameter :", None)) + self.label_tmin_4.setText(_translate("Form", "t min", None)) + self.label_tmax_4.setText(_translate("Form", "t max", None)) + self.ParCurve_tmax_3.setText(_translate("Form", "5*2*pi #5 circles", None)) + self.label_tstep_4.setText(_translate("Form", "step", None)) + self.ParCurve_tstep_3.setText(_translate("Form", "0.01", None)) + self.ParCurve_tmin_3.setText(_translate("Form", "0", None)) + self.checkBox_close_3.setText(_translate("Form", "Closed curve", None)) + self.ParCurve_button_store_3.setToolTip(_translate("Form", "Click to store the current edited curve into the table.\n" +"To save your curve you need to go to \"Edit\".", None)) + self.ParCurve_button_store_3.setText(_translate("Form", "Store", None)) + self.ParCurve_button_apply_3.setToolTip(_translate("Form", "Click to visualize the curve.", None)) + self.ParCurve_button_apply_3.setText(_translate("Form", "Apply", None)) + self.groupBox_19.setTitle(_translate("Form", "Type of 3D Curve :", None)) + self.checkBox_points_3.setText(_translate("Form", "Points", None)) + self.checkBox_polyline_3.setText(_translate("Form", "Polyline", None)) + self.checkBox_bspline_3.setText(_translate("Form", "Bspline", None)) + self.checkBox_bezier_3.setText(_translate("Form", "Bezier", None)) + self.tabWidget_8.setTabText(self.tabWidget_8.indexOf(self.tab_15), _translate("Form", "Parametric 3D", None)) + self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Wire_Tab_2), _translate("Form", "Wire", None)) + self.button_threepoints_plane.setToolTip(_translate("Form", "Plane=(3 Points):\n" +"Create a Plane crossing 3 Points.\n" +"- First select 3 different points\n" +"- Second push this button", None)) + self.button_threepoints_plane.setText(_translate("Form", "Plane=(3 Points)", None)) + self.button_twopoints_plane.setToolTip(_translate("Form", "Plane=(2 Points):\n" +"Create a Plane in the middle of 2 points.\n" +"PLANE is perpendicular to line (P1 P2) and contains the midpoint of P1 and P2.\n" +"The direction of the normal of PLANE is the same as the vector from P1 to P2.\n" +"- First select 2 different points\n" +"- Second push this button", None)) + self.button_twopoints_plane.setText(_translate("Form", "Plane=(2 Points)", None)) + self.button_Npoints_plane.setToolTip(_translate("Form", "Plane=(N Points):\n" +"Create a \"best fit\" Plane from a set of points using Singular Value Decomposition.\n" +"- First select several Points (at least 3);\n" +"- Then push this button", None)) + self.button_Npoints_plane.setText(_translate("Form", "Plane=(N Points)", None)) + self.button_axisandpoint_plane.setToolTip(_translate("Form", "Plane=(Point, Axis):\n" +"Create a plane crossing a Line and a Point.\n" +"- First select a line and a point NOT on the previous line\n" +"- Second push this button", None)) + self.button_axisandpoint_plane.setText(_translate("Form", "Plane=(Point, Axis)", None)) + self.button_axis_point_plane.setToolTip(_translate("Form", "Plane=(Point, _|Axis):\n" +"Create a plane perpendicular to a Line and crossing a Point.\n" +"- First select a line and a point NOT on the previous line\n" +"- Second push this button", None)) + self.button_axis_point_plane.setText(_translate("Form", "Plane=(Point, _|Axis)", None)) + self.button_planeandpoint_plane.setToolTip(_translate("Form", "Plane=(Point, Plane):\n" +"Create a plane crossing a Point and parallel to a Plane.\n" +"- First select a plane and a point NOT on the previous plane\n" +"- Second push this button\n" +"\n" +"NB: you can enlarge the created new plane by setting first an extension length.", None)) + self.button_planeandpoint_plane.setText(_translate("Form", "Plane=(Point, Plane)", None)) + self.extension_planePointPlane.setToolTip(_translate("Form", "Length for the extensions of the new Plane compared to initial one.", None)) + self.extension_planePointPlane.setText(_translate("Form", "0.0", None)) + self.button_planeandaxis_plane.setToolTip(_translate("Form", "Plane=(Plane, Axis):\n" +"Create a Plane crossing a Line and perpendicular to a Plane.\n" +"- First select a plane and a line NOT on the previous plane\n" +"- Second push this button\n" +"\n" +"NB: The plane created can be rotated if a none null angle is defined first.", None)) + self.button_planeandaxis_plane.setText(_translate("Form", "Plane=(Plane, Axis)", None)) + self.angle_planeandaxis_plane.setToolTip(_translate("Form", "Angle of rotation of the created Plane (in degrees).", None)) + self.angle_planeandaxis_plane.setText(_translate("Form", "0.0", None)) + self.button_distPlane.setToolTip(_translate("Form", "Plane=(Plane,dist):\n" +"Create a Plane parallel to a Plane at a given distance.\n" +"- First select a plane or several Planes\n" +"- Second push this button\n" +"\n" +"NB: \n" +" - The distance to the plane created can be defined first.\n" +"Positive number in one direction and negative in the other one.\n" +"The second number indicates the number of planes to create.\n" +"With option \"Object copy\" in \"Ori. Pref.\" TAB\n" +" - If a Face of a Cube is selected the Cube is duplicate with the \n" +"corresponding Face at the defined distance from the original.\n" +"Several Faces of the cube can be selected.", None)) + self.button_distPlane.setText(_translate("Form", "Plane=(Plane,dist)", None)) + self.dist_plane.setToolTip(_translate("Form", "Distance to the new plane.\n" +"Can be negative for the reverse direction!", None)) + self.dist_plane.setText(_translate("Form", "10.0", None)) + self.spin_dist_plane.setToolTip(_translate("Form", "The number of copies (Max 100).", None)) + self.button_face_tangent.setToolTip(_translate("Form", "Face Tangent:\n" +"Create a tanget Plane at click location of a Face.\n" +"- First click in the view to select and object,\n" +"- Second push this button\n" +"-Third click on a location on the selected object.\n" +"\n" +"NB: The plane width and length can be defined first.", None)) + self.button_face_tangent.setText(_translate("Form", "Face Tangent", None)) + self.length_plane_2.setToolTip(_translate("Form", "Length of the Plane.", None)) + self.length_plane_2.setText(_translate("Form", "10.0", None)) + self.width_plane_2.setToolTip(_translate("Form", "Width of the Plane.", None)) + self.width_plane_2.setText(_translate("Form", "10.0", None)) + self.tabWidget_3.setTabText(self.tabWidget_3.indexOf(self.Plane_Tab1_2), _translate("Form", "Plane 1/2", None)) + self.button_click_for_plane.setToolTip(_translate("Form", "Click:\n" +"Create a rectangular Plane perpendicular to the view at location of one mouse click.\n" +"Define the width and the length of the Plane if needed.\n" +"- Click first on the Button then click once on the View.\n" +"- Click first on the Button then click once on top of one object of the View\n" +" to attach the plane at this object.\n" +"- You can also select an already existing point first and click the button to attach the plane.\n" +"\n" +"NB: The plane width and length can be defined first.\n" +"\n" +"Use left mouse button (MB1) to generate Planes. \n" +"MB2 and MB3 can still be used for view zoom and view rotation.\n" +"", None)) + self.button_click_for_plane.setText(_translate("Form", "Click", None)) + self.length_plane.setToolTip(_translate("Form", "Length of the Plane.", None)) + self.length_plane.setText(_translate("Form", "10.0", None)) + self.width_plane.setToolTip(_translate("Form", "Width of the Plane.", None)) + self.width_plane.setText(_translate("Form", "10.0", None)) + self.button_extension_plane.setToolTip(_translate("Form", "Enlarge(Plane):\n" +"Extend a Plane in each dimension.\n" +"- First select a Plane (or several Planes) \n" +"- Second push this button\n" +"\n" +"NB: \n" +" - The percentage of the extension can be defined first.", None)) + self.button_extension_plane.setText(_translate("Form", "Enlarge(Plane)", None)) + self.extension_plane.setToolTip(_translate("Form", "Extension of the Plane in each dimension in percentage.", None)) + self.extension_plane.setText(_translate("Form", "50.0", None)) + self.button_object_center_planes.setToolTip(_translate("Form", "Object(s) Center Planes:\n" +"Create 3 Planes (XY, XZ and YZ) at center location of all selected Object(s).\n" +"- First select one or severl objects\n" +"- Second push this button", None)) + self.button_object_center_planes.setText(_translate("Form", "Object(s) Center Planes", None)) + self.tabWidget_3.setTabText(self.tabWidget_3.indexOf(self.Plane_Tab2_2), _translate("Form", "Plane 1/2", None)) + self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Plane_Tab), _translate("Form", "Plane", None)) self.checkBox_allsubselect.setToolTip(_translate("Form", "if \"All\" is toggled:\n" " All the wires of the Trajectory selected will be considered.\n" "\n" @@ -2835,102 +3123,7 @@ class Ui_Form(object): "- Then push this button\n" "", None)) self.button_beam.setText(_translate("Form", "Beam", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.tab_17), _translate("Form", "Sweeping", None)) - self.button_click_for_plane.setToolTip(_translate("Form", "Click:\n" -"Create a rectangular Plane perpendicular to the view at location of one mouse click.\n" -"Define the width and the length of the Plane if needed.\n" -"- Click first on the Button then click once on the View.\n" -"- Click first on the Button then click once on top of one object of the View\n" -" to attach the plane at this object.\n" -"- You can also select an already existing point first and click the button to attach the plane.\n" -"\n" -"NB: The plane width and length can be defined first.\n" -"", None)) - self.button_click_for_plane.setText(_translate("Form", "Click", None)) - self.length_plane.setToolTip(_translate("Form", "Length of the Plane.", None)) - self.length_plane.setText(_translate("Form", "10.0", None)) - self.width_plane.setToolTip(_translate("Form", "Width of the Plane.", None)) - self.width_plane.setText(_translate("Form", "10.0", None)) - self.button_planeandaxis_plane.setToolTip(_translate("Form", "Plane=(Plane, Axis):\n" -"Create a Plane crossing a Line and perpendicular to a Plane.\n" -"- First select a plane and a line NOT on the previous plane\n" -"- Second push this button\n" -"\n" -"NB: The plane created can be rotated if a none null angle is defined first.", None)) - self.button_planeandaxis_plane.setText(_translate("Form", "Plane=(Plane, Axis)", None)) - self.angle_planeandaxis_plane.setToolTip(_translate("Form", "Angle of rotation of the created Plane (in degrees).", None)) - self.angle_planeandaxis_plane.setText(_translate("Form", "0.0", None)) - self.button_axisandpoint_plane.setToolTip(_translate("Form", "Plane=(Point, Axis):\n" -"Create a plane crossing a Line and a Point.\n" -"- First select a line and a point NOT on the previous line\n" -"- Second push this button", None)) - self.button_axisandpoint_plane.setText(_translate("Form", "Plane=(Point, Axis)", None)) - self.button_axis_point_plane.setToolTip(_translate("Form", "Plane=(Point, _|Axis):\n" -"Create a plane perpendicular to a Line and crossing a Point.\n" -"- First select a line and a point NOT on the previous line\n" -"- Second push this button", None)) - self.button_axis_point_plane.setText(_translate("Form", "Plane=(Point, _|Axis)", None)) - self.button_face_tangent.setToolTip(_translate("Form", "Face Tangent:\n" -"Create a tanget Plane at click location of a Face.\n" -"- First click in the view to select and object,\n" -"- Second push this button\n" -"-Third click on a location on the selected object.\n" -"\n" -"NB: The plane width and length can be defined first.", None)) - self.button_face_tangent.setText(_translate("Form", "Face Tangent", None)) - self.length_plane_2.setToolTip(_translate("Form", "Length of the Plane.", None)) - self.length_plane_2.setText(_translate("Form", "10.0", None)) - self.width_plane_2.setToolTip(_translate("Form", "Width of the Plane.", None)) - self.width_plane_2.setText(_translate("Form", "10.0", None)) - self.button_threepoints_plane.setToolTip(_translate("Form", "Plane=(3 Points):\n" -"Create a Plane crossing 3 Points.\n" -"- First select 3 different points\n" -"- Second push this button", None)) - self.button_threepoints_plane.setText(_translate("Form", "Plane=(3 Points)", None)) - self.button_distPlane.setToolTip(_translate("Form", "Plane=(Plane,dist):\n" -"Create a Plane parallel to a Plane at a given distance.\n" -"- First select a plane or several Planes\n" -"- Second push this button\n" -"\n" -"NB: \n" -" - The distance to the plane created can be defined first.\n" -"Positive number in one direction and negative in the other one.\n" -"The second number indicates the number of planes to create.\n" -"With option \"Object copy\" in \"Ori. Pref.\" TAB\n" -" - If a Face of a Cube is selected the Cube is duplicate with the \n" -"corresponding Face at the defined distance from the original.\n" -"Several Faces of the cube can be selected.", None)) - self.button_distPlane.setText(_translate("Form", "Plane=(Plane,dist)", None)) - self.dist_plane.setToolTip(_translate("Form", "Distance to the new plane.\n" -"Can be negative for the reverse direction!", None)) - self.dist_plane.setText(_translate("Form", "10.0", None)) - self.spin_dist_plane.setToolTip(_translate("Form", "The number of copies (Max 100).", None)) - self.button_planeandpoint_plane.setToolTip(_translate("Form", "Plane=(Point, Plane):\n" -"Create a plane crossing a Point and parallel to a Plane.\n" -"- First select a plane and a point NOT on the previous plane\n" -"- Second push this button\n" -"\n" -"NB: you can enlarge the created new plane by setting first an extension length.", None)) - self.button_planeandpoint_plane.setText(_translate("Form", "Plane=(Point, Plane)", None)) - self.extension_planePointPlane.setToolTip(_translate("Form", "Length for the extensions of the new Plane compared to initial one.", None)) - self.extension_planePointPlane.setText(_translate("Form", "0.0", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Plane_Tab1_3), _translate("Form", "Plane 1/2", None)) - self.button_object_center_planes.setToolTip(_translate("Form", "Object(s) Center Planes:\n" -"Create 3 Planes (XY, XZ and YZ) at center location of all selected Object(s).\n" -"- First select one or severl objects\n" -"- Second push this button", None)) - self.button_object_center_planes.setText(_translate("Form", "Object(s) Center Planes", None)) - self.button_extension_plane.setToolTip(_translate("Form", "Enlarge(Plane):\n" -"Extend a Plane in each dimension.\n" -"- First select a Plane (or several Planes) \n" -"- Second push this button\n" -"\n" -"NB: \n" -" - The percentage of the extension can be defined first.", None)) - self.button_extension_plane.setText(_translate("Form", "Enlarge(Plane)", None)) - self.extension_plane.setToolTip(_translate("Form", "Extension of the Plane in each dimension in percentage.", None)) - self.extension_plane.setText(_translate("Form", "50.0", None)) - self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.Plane_Tab1_4), _translate("Form", "Plane 2/2", None)) + self.tabWidget_7.setTabText(self.tabWidget_7.indexOf(self.tab_17), _translate("Form", "Sweep", None)) self.button_boundingboxes.setToolTip(_translate("Form", "Create bounding boxes around each of selected object(s).\n" "6 rectangles at the limits of each bounding boxes will be created.", None)) self.button_boundingboxes.setText(_translate("Form", "Bounding Box(es)", None)) @@ -3100,6 +3293,28 @@ class Ui_Form(object): self.button_align_edges.setText(_translate("Form", "Align Edges", None)) self.angle_align_edges.setToolTip(_translate("Form", "This Angle (in degrees) will be added to the angle needed to align Edges.", None)) self.angle_align_edges.setText(_translate("Form", "0.0", None)) + self.button_align_main_axis.setToolTip(_translate("Form", "Align the main Axis (first of the 2 axis set) from selected object(s) to the last Edge (or 2 main Axis from an object) selected.\n" +" - Click first to select at least one object! \n" +"This or These first object(s) will be rotated.\n" +" - Click last to select an Edge (or an Object) to align to (this last object is fixed and will never move).\n" +"Then Click the button.\n" +"\n" +"NB:\n" +" The 2 main first axis are calculated using scan and sort from all axis of the object.\n" +" The center of rotation is at center mass location of each selected object.\n" +"\n" +" In case of several objects selection : \n" +" The 2 main Axis of the first object(s) will be aligned on the 2 main Axis of the last one.\n" +" In case of several objects selection plus one Edge :\n" +" The first main Axis of the object(s) will be aligned on the Edge.\n" +" \n" +" - One click will align first main Axes.\n" +" - Second click will also align the second main Axes if exists on last object or\n" +" will rotate by 180 deg the moving objects on first main axes.\n" +" - Third and following clicks will rotate by 180 deg the moving objects on first main axes.", None)) + self.button_align_main_axis.setText(_translate("Form", "Align Main Axis", None)) + self.angle_align_main_axis.setToolTip(_translate("Form", "This Angle (in degrees) will be added to the angle needed to align Edges.", None)) + self.angle_align_main_axis.setText(_translate("Form", "0.0", None)) self.button_joint_points.setToolTip(_translate("Form", "Joint Point(s) from selected object(s) to the last Point selected.\n" " - Click first to select a Point of an object or several Points from several objects.\n" "These objects will be moved. \n" @@ -3258,10 +3473,13 @@ class Ui_Form(object): self.ObjTrans_comboBox_start.setItemText(4, _translate("Form", "To define", None)) self.ObjTrans_button_select_start.setText(_translate("Form", "Select", None)) self.label_11.setText(_translate("Form", "X :", None)) + self.ObjTrans_start_x.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_start_x.setText(_translate("Form", "0.0", None)) self.label_12.setText(_translate("Form", "Y :", None)) + self.ObjTrans_start_y.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_start_y.setText(_translate("Form", "0.0", None)) self.label_13.setText(_translate("Form", "Z :", None)) + self.ObjTrans_start_z.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_start_z.setText(_translate("Form", "0.0", None)) self.tabWidget_12.setTabText(self.tabWidget_12.indexOf(self.tab_22), _translate("Form", "Start", None)) self.groupBox_23.setTitle(_translate("Form", "Ending Point :", None)) @@ -3273,10 +3491,13 @@ class Ui_Form(object): self.ObjTrans_comboBox_end.setItemText(5, _translate("Form", "Relative", None)) self.ObjTrans_button_select_end.setText(_translate("Form", "Select", None)) self.label_14.setText(_translate("Form", "Z :", None)) + self.ObjTrans_end_z.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_end_z.setText(_translate("Form", "0.0", None)) self.label_15.setText(_translate("Form", "Y :", None)) + self.ObjTrans_end_y.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_end_y.setText(_translate("Form", "0.0", None)) self.label_16.setText(_translate("Form", "X :", None)) + self.ObjTrans_end_x.setToolTip(_translate("Form", "Please Enter a new coordinate and type RETURN to validate!", None)) self.ObjTrans_end_x.setText(_translate("Form", "0.0", None)) self.tabWidget_12.setTabText(self.tabWidget_12.indexOf(self.tab_23), _translate("Form", "End", None)) self.ObjTrans_button_reset.setText(_translate("Form", "Reset", None)) diff --git a/WorkFeature/WF_2015.py b/WorkFeature/WF_2015.py index 3689398..9c1d2c8 100644 --- a/WorkFeature/WF_2015.py +++ b/WorkFeature/WF_2015.py @@ -54,6 +54,7 @@ """ # First two lines to be able to launch with python import sys + from WorkFeature import WF_ObjParCurve_2015 # Change this by your own FreeCAD lib path to import FreeCAD if not sys.path.__contains__("/usr/lib/freecad/lib"): @@ -65,7 +66,7 @@ from WF_Utils_2015 import * from WF_ObjParCurve_2015 import * global myRelease -myRelease = "2015_12_16" +myRelease = "2016_03_29" import os.path import time @@ -149,6 +150,7 @@ m_distLine = 10.0 m_angleLine = 45.0 m_angleAlignFaces = 0.0 m_angleAlignEdges = 0.0 +m_angleAlignMainAxis = 0.0 m_angleRevolve = 360.0 m_distPoint = 10.0 m_diameterCylinder = 2.0 @@ -202,6 +204,7 @@ def gui_errorDialog(msg): diag.setWindowModality(QtCore.Qt.ApplicationModal) diag.exec_() + #Print a message on console. def print_msg(message): """ Print a message on console. @@ -236,10 +239,14 @@ def printError_msg(message): raise(Exception(message)) +def print_not_yet(): + printError_msg(error_msg_not_yet) + + #Print x,y and z of a point:vector. def print_point(point, msg=""): """ Print x,y and z of a point:vector. - """ + """ if point.__class__.__name__ != "Vector": print_msg("Not a Vector to print !") return @@ -309,7 +316,6 @@ def copy_toggled(flag): print_msg("Object copy flag is : " + str(objCopy)) - def init_min_max(): """ Return min and max values from System. min_val, max_val = init_min_max @@ -350,7 +356,7 @@ def createFolders(folder=None): App.ActiveDocument.addObject("App::DocumentObjectGroup","WorkFeatures") except: printError_msg("Could not Create 'WorkFeatures' Objects Group!") - m_list_dirs = ['Origin','WorkPoints','WorkAxis','WorkPlanes','WorkCircles','WorkBoxes','WorkObjects','Rot_Trans'] + m_list_dirs = ['Origin','WorkPoints','WorkAxis','WorkPlanes','WorkCircles','WorkBoxes','WorkWires','WorkObjects','Rot_Trans'] for m_dir in m_list_dirs: if folder == m_dir: if not(App.ActiveDocument.getObject(str(m_dir))): @@ -445,6 +451,7 @@ def get_InfoObjects(info=0, printError=True): ", m_objNames=" + str(m_objNames)) return m_num, m_selEx, m_objs, m_objNames + def reset_SelectedObjects(Selection, info=0): """ Reset the selection changed by Draft.rotate for example Selection is the original selection you want to reset. Must be saved before any @@ -455,12 +462,18 @@ def reset_SelectedObjects(Selection, info=0): m_DocumentName = Sel_i_Object.DocumentName m_ObjectName = Sel_i_Object.ObjectName m_Object = Sel_i_Object.Object - print_msg(str(m_Object)) - for m_SubElementName in Sel_i_Object.SubElementNames: + if info != 0: + print_msg(str(m_Object)) + if len(Sel_i_Object.SubElementNames) == 0 : if info != 0: - m_finalName = str(m_DocumentName)+"."+str(m_ObjectName)+"."+str(m_SubElementName) - print_msg(m_finalName) - Gui.Selection.addSelection(m_Object,str(m_SubElementName)) + print_msg(Sel_i_Object.ObjectName) + Gui.Selection.addSelection(m_Object) + else: + for m_SubElementName in Sel_i_Object.SubElementNames: + if info != 0: + m_finalName = str(m_DocumentName)+"."+str(m_ObjectName)+"."+str(m_SubElementName) + print_msg(m_finalName) + Gui.Selection.addSelection(m_Object,str(m_SubElementName)) def get_SelectedObjectsWithParent(info=0, printError=True): @@ -515,6 +528,7 @@ def get_SelectedObjectsWithParent(info=0, printError=True): printError_msg("No active document !") return + def get_SelectedObjects(info=0, printError=True): """ Return selected objects as Selection = (Number_of_Points, Number_of_Edges, Number_of_Planes, @@ -523,10 +537,14 @@ def get_SelectedObjects(info=0, printError=True): def storeShapeType(Object, Selected_Points, Selected_Edges, Selected_Planes): if Object.ShapeType == "Vertex": Selected_Points.append(Object) + return True if Object.ShapeType == "Edge": - Selected_Edges.append(Object) + Selected_Edges.append(Object) + return True if Object.ShapeType == "Face": Selected_Planes.append(Object) + return True + return False m_actDoc=get_ActiveDocument(info=0) @@ -544,6 +562,7 @@ def get_SelectedObjects(info=0, printError=True): Selected_Points = [] Selected_Edges = [] Selected_Planes = [] + Selected_Objects = [] for Sel_i_Object in m_selEx: if info != 0: print_msg("Processing : " + str(Sel_i_Object.ObjectName)) @@ -554,19 +573,28 @@ def get_SelectedObjects(info=0, printError=True): print_msg("SubObject : " + str(Object)) if hasattr(Object, 'ShapeType'): storeShapeType(Object, Selected_Points, Selected_Edges, Selected_Planes) + if hasattr(Object, 'Shape'): + Selected_Objects.append(Object) else: - storeShapeType(Sel_i_Object.Object.Shape, Selected_Points, Selected_Edges, Selected_Planes) - + if info != 0: + print_msg("Object : " + str(Sel_i_Object)) + if hasattr(Sel_i_Object, 'Object'): + if hasattr(Sel_i_Object.Object, 'ShapeType'): + storeShapeType(Sel_i_Object.Object, Selected_Points, Selected_Edges, Selected_Planes) + if hasattr(Sel_i_Object.Object, 'Shape'): + if hasattr(Sel_i_Object.Object.Shape, 'ShapeType'): + if not storeShapeType(Sel_i_Object.Object.Shape, Selected_Points, Selected_Edges, Selected_Planes): + Selected_Objects.append(Sel_i_Object.Object) Number_of_Points = len(Selected_Points) Number_of_Edges = len(Selected_Edges) Number_of_Planes = len(Selected_Planes) Selection = (Number_of_Points, Number_of_Edges, Number_of_Planes, - Selected_Points, Selected_Edges, Selected_Planes) + Selected_Points, Selected_Edges, Selected_Planes, Selected_Objects) if info != 0: print_msg("Number_of_Points, Number_of_Edges, Number_of_Planes," + - "Selected_Points, Selected_Edges, Selected_Planes = " + str(Selection)) + "Selected_Points, Selected_Edges, Selected_Planes , Selected_Objects = " + str(Selection)) return Selection else: if info != 0: @@ -631,6 +659,74 @@ def get_SelectedObjects_old(info=0, printError=True): printError_msg("No active document !") return +def get_axesFromSelectedObjects(info=0, printError=True): + """ Return Selected_Axes as + list of Edges + """ + SelectedObjects = get_SelectedObjects(info=info, printError=False) + Selected_Axes = [] + + Number_of_Edges = SelectedObjects[1] + Number_of_Faces = SelectedObjects[2] + Number_of_Objects = len(SelectedObjects[6]) + + if Number_of_Edges > 0: + Edge_List = SelectedObjects[4] + for m_edge in Edge_List: + Selected_Axes.append(m_edge) + + if Number_of_Faces > 0: + Face_List = SelectedObjects[5] + for m_face in Face_List: + Edge_List = m_face.Edges + for m_edge in Edge_List: + Selected_Axes.append(m_edge) + + if Number_of_Objects > 0: + Object_List = SelectedObjects[6] + for m_object in Object_List: + for m_edge in m_object.Shape.Edges: + Selected_Axes.append(m_edge) + + return Selected_Axes + + +def get_pointsFromSelectedObjects(info=0, printError=True): + """ Return Selected_Points as + list of Vertexes + """ + SelectedObjects = get_SelectedObjects(info=info, printError=False) + Selected_Points = [] + Number_of_Points = SelectedObjects[0] + Number_of_Edges = SelectedObjects[1] + Number_of_Faces = SelectedObjects[2] + Number_of_Objects = len(SelectedObjects[6]) + + if Number_of_Points > 0: + Point_List = SelectedObjects[3] + for m_point in Point_List: + Selected_Points.append(m_point) + if Number_of_Edges > 0: + Edge_List = SelectedObjects[4] + for m_edge in Edge_List: + Selected_Points.append(m_edge.Vertexes[0]) + Selected_Points.append(m_edge.Vertexes[-1]) + if Number_of_Faces > 0: + Face_List = SelectedObjects[5] + for m_face in Face_List: + Edge_List = m_face.Edges + for m_edge in Edge_List: + Selected_Points.append(m_edge.Vertexes[0]) + Selected_Points.append(m_edge.Vertexes[-1]) + + if Number_of_Objects > 0: + Object_List = SelectedObjects[6] + for m_object in Object_List: + for m_vertex in m_object.Shape.Vertexes: + Selected_Points.append(m_vertex) + + return Selected_Points + def get_wireListFromObjectName(objName, subSelection=True, msg=1): """ Return a list of wires from a selected object. @@ -640,7 +736,7 @@ def get_wireListFromObjectName(objName, subSelection=True, msg=1): All wires belonging to this object (False) """ if (None in [objName]) : - return None + return None m_wires = [] m_name = objName @@ -691,6 +787,79 @@ def get_wireListFromObjectName(objName, subSelection=True, msg=1): #m_wires.append(Part.Wire([o.Object.Shape])) return m_wires + +def get_mainAxesFromSelectedAxes(Selected_Axes, info=0): + """Return a set of soretd main axes from selected list of axes. + for new Input Axes : if an already existing axis with same direction exists, + then the length of the input axis to be stored is only added to the existing one. + If the input axis has a new direction then the axis with its length are stored. + The list of axes is then sorted regarding their increasing length and returned. + The list of points (extrema of axes) is also returned + """ + m_axes = Selected_Axes + Number_of_Axes = len(m_axes) + if info != 0: + print_msg("Number_of_Axes = " + str(Number_of_Axes)) + if Number_of_Axes >= 1 : + Selected_AxesWithLength = [] + Selected_Points = [] + # Generate list of (Axes, lengthOfAxes) + for m_axis in m_axes: + if info != 0: + print_msg("m_axis.Vertexes[0] = " + str(m_axis.Vertexes[0])) + print_msg("m_axis.Vertexes[-1] = " + str(m_axis.Vertexes[-1])) + m_start = m_axis.Vertexes[0].Point + m_end = m_axis.Vertexes[-1].Point + m_diff = m_end.sub(m_start) + # Check if the current m_axis is of Null length + if abs(m_diff.x) <= tolerance and abs(m_diff.y) <= tolerance and abs(m_diff.z) <= tolerance: + continue + Selected_Points.append(m_start) + Selected_Points.append(m_end) + # Get the distance between the 2 points + m_length = distanceBetween(m_start, m_end) + m_A = (m_axis.Vertexes[-1].Point).sub(m_axis.Vertexes[0].Point).normalize() + m_B = Base.Vector(0, 0, 0) + m_dim = len(Selected_AxesWithLength) + if info != 0: + print_msg("m_length = " + str(m_length)) + print_msg("len(Selected_AxesWithLength) = " + str(m_dim)) + + # Store the first axis with its length + if m_dim == 0: + Selected_AxesWithLength.append([m_axis, m_length]) + if info != 0: + print_msg("Selected_AxesWithLength = " + str(Selected_AxesWithLength)) + # Else look for existing axes to find if any already exist with the same direction + else: + m_found = False + if info != 0: + print_msg("Selected_AxesWithLength = " + str(Selected_AxesWithLength)) + for m_axiswithlength in Selected_AxesWithLength: + m_C = (m_axiswithlength[0].Vertexes[-1].Point).sub(m_axiswithlength[0].Vertexes[0].Point).normalize() + # Look for colinear vectors + if abs((m_A.cross(m_C)).Length) <= 1e-10: + m_found = True + if info != 0: + print_msg("m_found = " + str(m_found)) + m_axiswithlength[1] += m_length + # Store the axis with its length in caseof new axis + if not m_found: + Selected_AxesWithLength.append([m_axis, m_length]) + + m_new_dim = len(Selected_AxesWithLength) + if info != 0: + print_msg("len(Selected_AxesWithLength) = " + str(m_new_dim)) + print_msg("before sort : Selected_AxesWithLength = " + str(Selected_AxesWithLength)) + # Sort stored axes by length + Selected_AxesWithLength.sort(key=lambda x: x[1]) + if info != 0: + print_msg("after sort : Selected_AxesWithLength = " + str(Selected_AxesWithLength)) + + return Selected_AxesWithLength, Selected_Points + + return None, None + def getType(objs): if isinstance(objs,list): @@ -715,6 +884,7 @@ def getEdgeType(edge): return "Unknown" except: return "Unknown" + def getShapeType(subObject): try: @@ -731,6 +901,7 @@ def getShapeType(subObject): except: return "Unknown" + def definePropOfActiveObj(): Gui.activeDocument().activeObject().LineColor = (1.00,0.67,0.00) Gui.activeDocument().activeObject().ShapeColor = (0.33,1.00,1.00) @@ -743,6 +914,7 @@ def addObjectToGrp(obj,grp,info=0): m_grp.addObject(m_obj) # adds object to the group if info != 0: print_msg("Object " + str(m_obj) + " added to Group : " + str(m_grp)) + def addObjectToGrp2(obj,grp,info=0): m_obj = obj @@ -777,7 +949,7 @@ def minMaxVectorsLimits(vertx,info=0): #print_msg(str(xmin)) #print_msg(str(xmax)) if info != 0: - print_msg("Vectors = " +str(m_vertx)) + print_msg("Vectors = " +str(m_vertx)) for m_vert in m_vertx: xmax = max(xmax, m_vert.x) xmin = min(xmin, m_vert.x) @@ -907,7 +1079,6 @@ def minMaxObjectsLimits(objs,info=0): return xmax, xmin, ymax, ymin, zmax, zmin - def baseObjectPoint(obj,info=0): """ Return the base point of selected Object. """ @@ -918,6 +1089,7 @@ def baseObjectPoint(obj,info=0): print_point(base,"Base of object selected is :") return base + def meanVectorsPoint(vertx,info=0): """ Return the mean point of all selected Vectors. """ @@ -950,7 +1122,8 @@ def meanVectorsPoint(vertx,info=0): if info != 0: print_point(mean,"Mean of all vectors selected is : ") return mean - + + def centerBBVectorsPoint(vertx,info=0): """ Return the center point of the bounding box of all selected Vectors. """ @@ -1031,6 +1204,7 @@ def distanceBetween(A, B): return edge.Length except Part.OCCError: return 0.0 + def angleBetween(e1, e2): """ Return the angle (in degrees) between 2 edges. @@ -1073,6 +1247,7 @@ def edgeToVector(edge): elif isinstance(edge,Part.Line): return edge.EndPoint.sub(edge.StartPoint) else: + print_msg("Error in edgeToVector(edge) : not a good type of input" + str(type(edge))) return None @@ -1080,8 +1255,12 @@ def colinearEdges(edge1, edge2, info=0, tolerance=1e-12): """ Return true if 2 edges are colinear. """ if not isinstance(edge1.Curve,Part.Line): + if info != 0: + print_msg("colinearEdges : edge1 not instance of Part.Line !") return False if not isinstance(edge2.Curve,Part.Line): + if info != 0: + print_msg("colinearEdges : edge2 not instance of Part.Line !") return False A = edgeToVector(edge1) B = Base.Vector(0, 0, 0) @@ -1146,6 +1325,7 @@ def intersecPoints(shape1, shape2, info=0): return None return + def findNormal(wire, forceDiscretize=False, msg=1): """Look for the Normal for wire. """ @@ -1186,11 +1366,13 @@ def findNormal(wire, forceDiscretize=False, msg=1): wire_normal.normalize() return wire_normal, wire_points + def getClickedPoint(info): global verbose msg=verbose view = Gui.ActiveDocument.ActiveView - down = (info["State"] == "DOWN") + #down = (info["State"] == "DOWN") + down = (info["Button"] == "BUTTON1") and (info["State"] == "DOWN") pos = info["Position"] global m_stack global m_callback @@ -1216,7 +1398,8 @@ def getClickedNormal(info): import Mesh msg=0 view = Gui.ActiveDocument.ActiveView - down = (info["State"] == "DOWN") + #down = (info["State"] == "DOWN") + down = (info["Button"] == "BUTTON1") and (info["State"] == "DOWN") pos = info["Position"] if msg != 0: @@ -1298,7 +1481,8 @@ def getClickedNormal(info): def getClickedTangent(info): msg=0 view = Gui.ActiveDocument.ActiveView - down = (info["State"] == "DOWN") + #down = (info["State"] == "DOWN") + down = (info["Button"] == "BUTTON1") and (info["State"] == "DOWN") pos = info["Position"] if msg != 0: print_msg("info['Position'] : " + str(pos)) @@ -1339,12 +1523,14 @@ def getClickedTangent(info): name = "Point" plot_point(m_p1, part, name) view.removeEventCallback("SoMouseButtonEvent",m_callback) + def getClickedAxis2(info): global verbose msg=verbose view = Gui.ActiveDocument.ActiveView - down = (info["State"] == "DOWN") + #down = (info["State"] == "DOWN") + down = (info["Button"] == "BUTTON1") and (info["State"] == "DOWN") pos = info["Position"] global m_stack global m_callback @@ -1364,8 +1550,7 @@ def getClickedAxis2(info): Axis_User_Name, axis = plot_axis(m_stack[-2], m_stack[-1], part, name) print_point(m_stack[-1],"Click point at :") - - + def getClickedAxis(event_cb): event = event_cb.getEvent() view = Gui.ActiveDocument.ActiveView @@ -1382,9 +1567,11 @@ def getClickedAxis(event_cb): view.removeEventCallbackPivy(SoMouseButtonEvent.getClassTypeId(),m_callback) del m_stack[:] + def getClickedPlane2(info): view = Gui.ActiveDocument.ActiveView - down = (info["State"] == "DOWN") + #down = (info["State"] == "DOWN") + down = (info["Button"] == "BUTTON1") and (info["State"] == "DOWN") pos = info["Position"] global m_stack global m_callback @@ -1630,6 +1817,7 @@ def attachPoint(*argc): if msg != 0: print_msg("argc is " + str(*argc) + " and Attach point " + str(m_attach_point) + " selected !") + def intersecPlanePlane(Plane_Normal1, Plane_Point1, Plane_Normal2, Plane_Point2, info=0): """ Return the intersection Line between two Planes. """ @@ -1741,6 +1929,7 @@ def properties_line(Line_User_Name, color=(1.00,0.67,0.00)): return + def properties_plane(Plane_User_Name): """ Define the properties of a Work feature Plane. PointColor @@ -1791,6 +1980,9 @@ def plot_point(Vector_point, part="Part::Feature", name="Point", grp="WorkPoints def plot_axis(Vector_A, Vector_B, part="Part::Feature", name="Axis", grp="WorkAxis", color=(1.00,0.67,0.00)): + m_diff = Vector_B.sub(Vector_A) + if abs(m_diff.x) <= tolerance and abs(m_diff.y) <= tolerance and abs(m_diff.z) <= tolerance: + return None if not(App.ActiveDocument.getObject( grp )): App.ActiveDocument.addObject("App::DocumentObjectGroup", grp) axis = App.ActiveDocument.addObject(part, name) @@ -1900,6 +2092,7 @@ def plot_plane(Edge_Length1, Edge_Length2, Plane_Point, Plane_Normal, part, name return plane_User_Name, plane + def plot_cube(length, width, height, point, axis, part, name, grp="WorkObjects"): """ Creating a Cube in the view. One of the Cube's extremities will be at the given point location. @@ -2064,9 +2257,11 @@ def bounding_box(grp,ori_X,ori_Y,ori_Z,length_X,length_Y,length_Z,createVol=Fals try: m_pl_0 = App.Placement(App.Vector(m_o_X,m_o_Y,m_o_Z), App.Rotation(0.0,0.0,0.0)) + print_msg("m_pl_0 :" + str(m_pl_0)) m_rect = Draft.makeRectangle(length=m_l_X,height=m_l_Y, placement=m_pl_0,face=flag_for_face,support=None) - addObjectToGrp(m_rect,m_grp,info=info) + print_msg("m_rect :" + str(m_rect)) + addObjectToGrp(m_rect,m_grp,info=1) definePropOfActiveObj() if flag_for_volume: Gui.ActiveDocument.getObject(m_rect.Label).Visibility=False @@ -2408,7 +2603,7 @@ def plot_NpointsPoint(): points.append(m_point.Point) if msg != 0: print_point(m_point.Point, msg="Point : ") - Vector_Center = meanVectorsPoint(points,info=1) + Vector_Center = meanVectorsPoint(points,info=msg) Center_User_Name = plot_point(Vector_Center, part, name) print_point(Vector_Center,str(Center_User_Name) + result_msg + " at :") @@ -3048,8 +3243,8 @@ def plot_distPoint(): printError_msg(error_msg) except: printError_msg(error_msg) - + def numberPointCutWire(value): """ Respond to the change in number of cut value from the spin box. """ @@ -3184,8 +3379,8 @@ def cutWire(numberOfPoints, createPoint=1, createLine=0): printError_msg(error_msg) return - + def plot_cutWirePoint(): createFolders('WorkPoints') global m_numberPointCutWire @@ -3220,7 +3415,8 @@ def plot_clickForPoint(): def plot_baseObjectPoint(): """ Plot base point of all selected objects. """ - msg=0 + msg=verbose + createFolders('WorkPoints') error_msg = "Unable to create Base point of Object(s): \nSelect at least one Object !" result_msg = " : Base point of Object(s) created !" @@ -3241,10 +3437,123 @@ def plot_baseObjectPoint(): if m_base != None: Center_User_Name = plot_point(m_base, part, name) print_point(m_base,str(Center_User_Name) + result_msg + " at :") + else: + printError_msg(error_msg) else: printError_msg(error_msg) +def plot_centerMassObjectPoint(): + """ Plot Center of Mass Point of all selected Object(s). + """ + msg=verbose + msg=1 + + createFolders('WorkPoints') + error_msg = "Unable to create Center of Mass point of Object(s): \nSelect at least one Object !" + result_msg = " : Center of Mass point of Object(s) created !" + name = "CenterMassPoint" + part = "Part::Feature" + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc.Name == None: + return None + + # Return a list of selected objects for a given document name. + SelectedObjects = get_SelectedObjects(info=msg, printError=False) + + Number_of_Objects = len(SelectedObjects[6]) + if Number_of_Objects >= 1: + for m_object in SelectedObjects[6]: + + m_center = m_object.Shape.CenterOfMass + if m_center != None: + Center_User_Name = plot_point(m_center, part, name) + print_point(m_center,str(Center_User_Name) + result_msg + " at :") + else: + printError_msg(error_msg) + else: + printError_msg(error_msg) + + +def plot_objectNPoints(): + """Create a set of points from selected Objetcs: + - Select object(s) + to create points from these object(s) ! + If you select an Edge : 2 points will be created; + if you select a Plane : 4 points will be created; + if you select an Object : many points will be created. + """ + msg=verbose + + error_msg = "Create a set of points from selected Objetcs : \n" +\ + "Select object(s) \n" +\ + "to create points from these object(s) !\n" +\ + "If you select an Edge : 2 points will be created;\n" +\ + "if you select a Plane : 4 points will be created;\n" +\ + "if you select an Object : many points will be created.\n" + + createFolders('WorkPoints') + m_dir = 'Object' + name = "Point" + part = "Part::Feature" + try: + m_r = App.ActiveDocument.getObject("WorkPoints").newObject("App::DocumentObjectGroup", str(m_dir)) + except: + printError_msg("Could not Create '"+ str(m_dir) +"' Objects Group!") + m_dir = m_r.Name + result_msg = " Point(s) created into : WorkPoints/"+ str(m_dir) + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc == None: + return None + + SelectedObjects = get_SelectedObjects(info=msg, printError=False) + + try: + Selected_Points = [] + + Number_of_Edges = SelectedObjects[1] + Number_of_Faces = SelectedObjects[2] + Number_of_Objects = len(SelectedObjects[6]) + if msg != 0: + print_msg("Number_of_Edges = " + str(Number_of_Edges)) + print_msg("Number_of_Faces = " + str(Number_of_Faces)) + print_msg("Number_of_Objects = " + str(Number_of_Objects)) + if Number_of_Edges > 0: + Edge_List = SelectedObjects[4] + for m_edge in Edge_List: + Selected_Points.append(m_edge.Vertexes[0]) + Selected_Points.append(m_edge.Vertexes[-1]) + + if Number_of_Faces > 0: + Face_List = SelectedObjects[5] + for m_face in Face_List: + Edge_List = m_face.Edges + for m_edge in Edge_List: + Selected_Points.append(m_edge.Vertexes[0]) + Selected_Points.append(m_edge.Vertexes[-1]) + + if Number_of_Objects > 0: + Object_List = SelectedObjects[6] + for m_object in Object_List: + for m_vertex in m_object.Shape.Vertexes: + Selected_Points.append(m_vertex) + m_points = Selected_Points + Number_of_Points = len(m_points) + if msg != 0: + print_msg("Number_of_Points = " + str(Number_of_Points)) + if Number_of_Points >= 1 : + for m_point in m_points: + if msg != 0: + print_point(FreeCAD.Vector(m_point.Point)) + plot_point(m_point.Point, part, name, str(m_dir)) + + print_msg(str(m_dir) + " : " + str(Number_of_Points) + result_msg) + except: + printError_msg(error_msg) + + def point_toSketch(): """ Transform Point(s) in Sketch's Point(s) by projection onto the Sketch's Plane: - First select an existing Sketch; @@ -3322,7 +3631,122 @@ def point_toSketch(): printError_msg(error_msg) return + +def point_toLoad(): + """Load a set of points from an ASCII file: + ASCII format is 3 values by line seperated by blank as : + <15.3f <15.3f <15.3f + Values are read as float. + + Lines starting with characeter : # or / are considered as comment lines + """ + msg=verbose + + error_msg = "Unable to load Point(s) !" + result_msg = " Point(s) loaded from " + createFolders('WorkPoints') + m_dir = 'Load' + name = "Point" + part = "Part::Feature" + + try: + m_r = App.ActiveDocument.getObject("WorkPoints").newObject("App::DocumentObjectGroup", str(m_dir)) + except: + printError_msg("Could not Create '"+ str(m_dir) +"' Objects Group!") + m_dir = m_r.Name + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc == None: + return None + + try: + import Utils.WF_points_set as WFps + except: + printError_msg("Unable to import Utils.WF_points_set !") + + fname, _ = QtGui.QFileDialog.getOpenFileName(None, 'Select a file',os.environ['HOME'],"Text Files (*.txt *.asc *.dat)") + + try: + m_pts = WFps.points_set([],str(fname)) + m_points = m_pts.load() + Number_of_Points = len(m_points) + if Number_of_Points >= 1 : + for m_point in m_points: + if msg != 0: + print_point(FreeCAD.Vector(m_point)) + plot_point(m_point, part, name, str(m_dir)) + + print_msg(str(m_dir) + " : " + str(Number_of_Points) + result_msg + str(fname)) + else: + printError_msg(error_msg) + except: + printError_msg(error_msg) + + +def point_toSave(): + """Save a point or a set of points into an ASCII file. + One (x, y, z) triplet per line seperated by blank. + - Select as much as Points as needed and/or select object(s) + to save points from these object(s) ! + If you select an Edge : 2 points will be saved; + if you select a Plane : 4 points will be saved; + if you select an Object : many points will be saved. + Then click on this button. + """ + msg=verbose + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc == None: + return None + + error_msg = "Save a point or a set of points into an ASCII file : \n" +\ + "Select point(s) and/or select object(s) \n" +\ + "to save points from these object(s) !" + result_msg = " Point(s) saved into : " + + # Return a list of Points selected for a given document name. + Selection = get_pointsFromSelectedObjects(info=0, printError=True) + + try: + import Utils.WF_points_set as WFps + except: + printError_msg("Unable to import Utils.WF_points_set !") + + try: + SelectedPoints = Selection + Number_of_Points = len(SelectedPoints) + if msg != 0: + print_msg("Number_of_Points=" + str(Number_of_Points)) + print_msg("Point_List=" + str(SelectedPoints)) + m_points = [] + if Number_of_Points >= 1 : + Point_List = SelectedPoints + for m_point in Point_List: + if msg != 0: + print_point(FreeCAD.Vector(m_point.Point)) + m_x = m_point.Point.x + m_y = m_point.Point.y + m_z = m_point.Point.z + m_points.append((m_x,m_y,m_z)) + + if msg != 0: + print_msg(str(m_points)) + + m_pts = WFps.points_set(m_points) + + fname, _ = QtGui.QFileDialog.getSaveFileName(None, 'Select a file',os.environ['HOME']) + + if m_pts.save(str(fname)): + print_msg(str(Number_of_Points) + result_msg + str(fname) ) + else: + printError_msg("Not able to save the requested Point(s)!") + else: + printError_msg(error_msg) + except: + printError_msg(error_msg) + + def plot_centerObjectAxes(): """ Create 3 Axes XY, and Z at center point of all selected objects. """ @@ -3426,6 +3850,7 @@ def plot_2PointsAxis(): result_msg = " : Axis created !" name = "Line from 2 Points" part = "Part::Feature" + Selection = get_SelectedObjects(info=msg, printError=False) try: SelectedObjects = Selection @@ -3457,12 +3882,22 @@ def plot_2PointsAxis(): except: printError_msg(error_msg) -def plot_NPoints_axis(): - """ Create an Axis based on a linear regression from a set of Points. + +def plot_NPointsAxis(): + """ Create a "best fit" line from a set of points using Singular Value Decomposition. + - First select several Points + + The 3 eigenvectors are generated. + Orange one is the best fit line. """ - global verbose msg=verbose - import numpy as np + + try: + import numpy as np + except: + error_msg = "Unable to import numpy !\n" +\ + "You MUSt install numpy to use this function !" + printError_msg(error_msg) m_actDoc = get_ActiveDocument(info=msg) if m_actDoc == None: @@ -3471,7 +3906,7 @@ def plot_NPoints_axis(): createFolders('WorkAxis') error_msg = "Unable to create Axis : \nSelect at least two points!" result_msg = " : Axis created !" - name = "Line from N Points" + name = "Line_from_N_Points" part = "Part::Feature" grp = "WorkAxis" @@ -3541,6 +3976,7 @@ def plot_NPoints_axis(): printError_msg(error_msg) except: printError_msg(error_msg) + def plot_cylinderAxis(): global verbose @@ -4483,7 +4919,243 @@ def plot_clickForAxis(): view.removeEventCallback("SoMouseButtonEvent",m_callback) m_clickForAxis = not m_clickForAxis - + +def plot_objectNAxes(): + """Create a set of axes from selected Objetcs: + - Select object(s) + to create axes from these object(s) ! + if you select a Plane : 4 axes will be created; + if you select an Object : many axes will be created. + """ + msg=verbose + + error_msg = "Create a set of axes from selected Objetcs : \n" +\ + "Select object(s) \n" +\ + "to create axes from these object(s) !\n" +\ + "if you select a Plane : 4 axes will be created;\n" +\ + "if you select an Object : many axes will be created.\n" + + createFolders('WorkAxis') + m_dir = 'Object' + name = "Axis" + part = "Part::Feature" + try: + m_r = App.ActiveDocument.getObject("WorkAxis").newObject("App::DocumentObjectGroup", str(m_dir)) + except: + printError_msg("Could not Create '"+ str(m_dir) +"' Objects Group!") + m_dir = m_r.Name + result_msg = " Axes created into : WorkAxis/"+ str(m_dir) + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc == None: + return None + + SelectedObjects = get_SelectedObjects(info=msg, printError=False) + + try: + Selected_Axes = [] + + Number_of_Faces = SelectedObjects[2] + Number_of_Objects = len(SelectedObjects[6]) + if msg != 0: + print_msg("Number_of_Faces = " + str(Number_of_Faces)) + print_msg("Number_of_Objects = " + str(Number_of_Objects)) + + if Number_of_Faces > 0: + Face_List = SelectedObjects[5] + for m_face in Face_List: + Edge_List = m_face.Edges + for m_edge in Edge_List: + Selected_Axes.append(m_edge) + + if Number_of_Objects > 0: + Object_List = SelectedObjects[6] + for m_object in Object_List: + for m_edge in m_object.Shape.Edges: + Selected_Axes.append(m_edge) + + m_axes = Selected_Axes + Number_of_Axes = len(m_axes) + if msg != 0: + print_msg("Number_of_Axes = " + str(Number_of_Axes)) + if Number_of_Axes >= 1 : + for m_axis in m_axes: + if msg != 0: + print_msg("m_axis.Vertexes[0] = " + str(m_axis.Vertexes[0])) + print_msg("m_axis.Vertexes[-1] = " + str(m_axis.Vertexes[-1])) + Vector_A = m_axis.Vertexes[0].Point + Vector_B = m_axis.Vertexes[-1].Point + + plot_axis(Vector_A, Vector_B, part, name, str(m_dir)) + + print_msg(str(m_dir) + " : " + str(Number_of_Axes) + result_msg) + else: + printError_msg(error_msg) + except: + printError_msg(error_msg) + + +def plot_object3Axes(): + """Create a set of 2 or 3 axes from selected Objetcs: + The most representative axes will be selected from all axis. + The length of main axes will be the cumulative length of all axes with the same direction. + - Select object(s) + to create axes from these object(s) ! + if you select a Plane : 2 axes will be created; + if you select an Object : 3 axes will be created. + """ + msg=verbose + + error_msg = "Create a set of 2 or 3 axes from selected Objetcs : \n" +\ + "The most representative axes will be selected from all axis.\n" +\ + "The length of main axes will be the cumulative length of all axes with the same direction.\n" +\ + "Select object(s) \n" +\ + "to create axes from these object(s) !\n" +\ + "if you select a Plane : 2 axes will be created;\n" +\ + "if you select an Object : 3 axes will be created.\n" + + createFolders('WorkAxis') + m_dir = 'Object' + name = "Axis" + part = "Part::Feature" + try: + m_r = App.ActiveDocument.getObject("WorkAxis").newObject("App::DocumentObjectGroup", str(m_dir)) + except: + printError_msg("Could not Create '"+ str(m_dir) +"' Objects Group!") + m_dir = m_r.Name + result_msg = " Axes created into : WorkAxis/"+ str(m_dir) + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc == None: + return None + + SelectedObjects = get_SelectedObjects(info=msg, printError=False) + + try: + Selected_Axes = [] + + Number_of_Faces = SelectedObjects[2] + Number_of_Objects = len(SelectedObjects[6]) + if msg != 0: + print_msg("Number_of_Faces = " + str(Number_of_Faces)) + print_msg("Number_of_Objects = " + str(Number_of_Objects)) + + if Number_of_Faces > 0: + Face_List = SelectedObjects[5] + for m_face in Face_List: + Edge_List = m_face.Edges + for m_edge in Edge_List: + Selected_Axes.append(m_edge) + + if Number_of_Objects > 0: + Object_List = SelectedObjects[6] + for m_object in Object_List: + for m_edge in m_object.Shape.Edges: + Selected_Axes.append(m_edge) + + #======================================================================= + # m_axes = Selected_Axes + # Number_of_Axes = len(m_axes) + # if msg != 0: + # print_msg("Number_of_Axes = " + str(Number_of_Axes)) + # if Number_of_Axes >= 1 : + # Selected_AxesWithLength = [] + # Selected_Points = [] + # # Generate list of (Axes, lengthOfAxes) + # for m_axis in m_axes: + # if msg != 0: + # print_msg("m_axis.Vertexes[0] = " + str(m_axis.Vertexes[0])) + # print_msg("m_axis.Vertexes[-1] = " + str(m_axis.Vertexes[-1])) + # m_start = m_axis.Vertexes[0].Point + # m_end = m_axis.Vertexes[-1].Point + # m_diff = m_end.sub(m_start) + # if abs(m_diff.x) <= tolerance and abs(m_diff.y) <= tolerance and abs(m_diff.z) <= tolerance: + # continue + # Selected_Points.append(m_start) + # Selected_Points.append(m_end) + # m_length = distanceBetween(m_start, m_end) + # #m_A = (m_axis.Curve.EndPoint - m_axis.Curve.StartPoint).normalize() + # m_A = (m_axis.Vertexes[-1].Point).sub(m_axis.Vertexes[0].Point).normalize() + # m_B = Base.Vector(0, 0, 0) + # m_dim = len(Selected_AxesWithLength) + # if msg != 0: + # print_msg("m_length = " + str(m_length)) + # print_msg("len(Selected_AxesWithLength) = " + str(m_dim)) + # + # if m_dim == 0: + # Selected_AxesWithLength.append([m_axis, m_length]) + # if msg != 0: + # print_msg("Selected_AxesWithLength = " + str(Selected_AxesWithLength)) + # else: + # m_found = False + # if msg != 0: + # print_msg("Selected_AxesWithLength = " + str(Selected_AxesWithLength)) + # for m_axiswithlength in Selected_AxesWithLength: + # m_C = (m_axiswithlength[0].Vertexes[-1].Point).sub(m_axiswithlength[0].Vertexes[0].Point).normalize() + # #m_C = (m_axiswithlength[0].Curve.EndPoint - m_axiswithlength[0].Curve.StartPoint).normalize() + # #m_found = colinearVectors(m_A, m_B, m_C, info=msg, tolerance=1e-10) + # if abs((m_A.cross(m_C)).Length) <= 1e-10: + # m_found = True + # if msg != 0: + # print_msg("m_found = " + str(m_found)) + # m_axiswithlength[1] += m_length + # + # if not m_found: + # Selected_AxesWithLength.append([m_axis, m_length]) + # m_new_dim = len(Selected_AxesWithLength) + # if msg != 0: + # print_msg("len(Selected_AxesWithLength) = " + str(m_new_dim)) + # print_msg("before sort : Selected_AxesWithLength = " + str(Selected_AxesWithLength)) + # # sort by length + # # sorted(l, key=lambda x: x[2]) + # # sorted(Selected_AxesWithLength, key=lambda AxesWithLength: AxesWithLength[1]) + # Selected_AxesWithLength.sort(key=lambda x: x[1]) + # if msg != 0: + # print_msg("after sort : Selected_AxesWithLength = " + str(Selected_AxesWithLength)) + #======================================================================= + Number_of_Axes = len(Selected_Axes) + if Number_of_Axes == 0 : + printError_msg(error_msg) + return + + Selected_AxesWithLength, Selected_Points = get_mainAxesFromSelectedAxes(Selected_Axes, info=msg) + if Selected_AxesWithLength: + m_new_dim = len(Selected_AxesWithLength) + Vector_Center = meanVectorsPoint(Selected_Points,info=0) + if m_new_dim >= 3 : + m_limit = -4 + elif m_new_dim == 2 : + m_limit = -3 + elif m_new_dim ==1: + m_limit = -2 + else: + printError_msg(error_msg) + return + m_color = [] + m_color.append((1.00,0.00,0.00)) + m_color.append((0.00,0.67,0.00)) + m_color.append((0.33,0.00,1.00)) + + for i in range(-1,m_limit,-1): + m_axiswithlength = Selected_AxesWithLength[i] + m_p1 = m_axiswithlength[0].Vertexes[0].Point + m_p2 = m_axiswithlength[0].Vertexes[-1].Point + m_c = centerLinePoint(m_axiswithlength[0]) + m_mv = Vector_Center.sub(m_c) + Vector = m_p2.sub(m_p1).normalize().multiply(m_axiswithlength[1]/2) + #Axis_User_Name, _ = plot_axis(m_p1, m_p2, part, name, m_dir) + #Axis_User_Name, _ = plot_axis(m_c.add(Vector), m_c.add(Vector.multiply(-1)), part, name, m_dir) + + Axis_User_Name, _ = plot_axis(m_c.add(Vector).add(m_mv), m_c.add(Vector.multiply(-1)).add(m_mv), part, name, m_dir, m_color[i] ) + print_msg(str(Axis_User_Name) + result_msg ) + + print_msg(str(m_dir) + " : " + str(abs(i)) + result_msg) + else: + printError_msg(error_msg) + except: + printError_msg(error_msg) + + def plot_2PlanesAxis(): """ Plot the intersection Axis between two planes. """ @@ -5161,6 +5833,7 @@ def faceToSketch(m_obj): print_gui_msg("Faces are not yet supported for external geometry of sketches !") return + def errorToSketch(m_obj): print_gui_msg("Unknown type of geometry !") return @@ -5712,7 +6385,7 @@ def plot_cutCircle(): print_msg("Object is Cylinder") pivot0 = float(piece.Angle/m_numberCircleCut) - printError_msg(error_msg_not_yet) + printError_msg(error_msg_print_not_yet) elif label[:3] == "Arc": if msg != 0: @@ -5864,7 +6537,149 @@ def plot_3PointsPlane(): except: printError_msg(error_msg) + +def plot_2PointsPlane(): + """ Create a Plane from 2 Points. + """ + msg=0 + createFolders('WorkPlanes') + error_msg = "Unable to create Plane : \nSelect two points only !" + result_msg = " : Plane created !" + name = "WorkPlane" + part = "Part::Feature" + Selection = get_SelectedObjects(info=msg, printError=False) + try: + SelectedObjects = Selection + Number_of_Points = SelectedObjects[0] + if msg != 0: + print_msg("Number_of_Points=" + str(Number_of_Points)) + points = [] + if Number_of_Points == 2 : + Point_List = SelectedObjects[3] + if msg != 0: + print_msg(str(Points_List)) + + Point_A = Point_List[0].Point + points.append(Point_A) + Point_B = Point_List[1].Point + points.append(Point_B) + if msg != 0: + print_point(Point_A, msg="Point_A : ") + print_point(Point_B, msg="Point_B : ") + + Vector_Center = meanVectorsPoint(points,info=msg) + #Vector_Center = centerBBVectorsPoint(points, info=0) + xmax, xmin, ymax, ymin, zmax, zmin = minMaxVectorsLimits(points,info=0) + #print_point(Vector_Center, msg="Center of A, B and C : ") + + length = xmax - xmin + if (ymax - ymin) > length: + length = ymax - ymin + if (zmax - zmin) > length: + length = zmax - zmin + print_msg("length = " +str(length)) + + Edge_Vector = Point_B - Point_A + #Edge_Length = Edge_Vector.Length + Edge_Length = length * 1.5 + Plane_Point = Vector_Center + Plane_Normal = Edge_Vector + + Plane_User_Name, plane = plot_plane(Edge_Length, Edge_Length, Plane_Point, Plane_Normal, part, name) + print_msg(str(Plane_User_Name) + result_msg ) + except: + printError_msg(error_msg) + +def plot_NPointsPlane(): + """Create a "best fit" Plane from a set of points using Singular Value Decomposition. + - First select several Points (at least 3). + """ + msg=verbose + msg=1 + + try: + import numpy as np + except: + error_msg = "Unable to import numpy !\n" +\ + "You MUSt install numpy to use this function !" + printError_msg(error_msg) + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc == None: + return None + + createFolders('WorkPlanes') + error_msg = "Unable to create Plane : \nSelect at least three points!" + result_msg = " : Plane created !" + name = "Plane_from_N_Points" + part = "Part::Feature" + grp = "WorkPlanes" + + Selection = get_SelectedObjects(info=msg, printError=False) + + try: + SelectedObjects = Selection + Number_of_Points = SelectedObjects[0] + if msg != 0: + print_msg("Number_of_Points=" + str(Number_of_Points)) + if Number_of_Points > 2: + m_x = [] + m_y = [] + m_z = [] + Point_List = SelectedObjects[3] + if msg != 0: + print_msg("Point_List=" + str(Point_List)) + for Selected_Point in Point_List: + m_point = Selected_Point.Point + if msg != 0: + print_point(m_point,"Point selected :") + m_x.append(m_point.x) + m_y.append(m_point.y) + m_z.append(m_point.z) + + m_np_x = np.asfarray(m_x) + m_np_y = np.asfarray(m_y) + m_np_z = np.asfarray(m_z) + if msg != 0: + print_msg(" m_np_x=" + str(m_np_x)) + print_msg(" m_np_y=" + str(m_np_y)) + print_msg(" m_np_z=" + str(m_np_z)) + m_data = np.concatenate((m_np_x[:, np.newaxis], + m_np_y[:, np.newaxis], + m_np_z[:, np.newaxis]), + axis=1) + if msg != 0: + print_msg(" m_data=" + str(m_data)) + # Calculate the mean of the points, i.e. the 'center' of the cloud + m_datamean = m_data.mean(axis=0) + if msg != 0: + print_msg(" m_datamean=" + str(m_datamean)) + Axis_E0 = Base.Vector(m_datamean[0], m_datamean[1], m_datamean[2]) + Plane_Point = Axis_E0 + + # Do an SVD on the mean-centered data. + m_uu, m_dd, m_vv = np.linalg.svd(m_data - m_datamean) + if msg != 0: + print_msg(" m_uu=" + str(m_uu)) + print_msg(" m_dd=" + str(m_dd)) + print_msg(" m_vv=" + str(m_vv)) + # Now vv[0] contains the first principal component, i.e. the direction + # vector of the 'best fit' line in the least squares sense. + Axis_dir1 = Base.Vector(m_vv[0][0],m_vv[0][1],m_vv[0][2]) + Axis_E1 = Axis_E0 - Axis_dir1.normalize().multiply(m_dd[0]/2.) + Axis_E2 = Axis_E0 + Axis_dir1.normalize().multiply(m_dd[0]/2.) + Axis_dir2 = Base.Vector(m_vv[1][0],m_vv[1][1],m_vv[1][2]) + Plane_Normal = Axis_dir1.cross( Axis_dir2 ) + Edge_Length = m_dd[0] + Plane_User_Name, plane = plot_plane(Edge_Length, Edge_Length, Plane_Point, Plane_Normal, part, name) + print_msg(str(Plane_User_Name) + result_msg ) + else: + printError_msg(error_msg) + except: + printError_msg(error_msg) + + def plot_axisPointPlane(): """ Create a plane passing trougth a Line and a Point. """ @@ -5875,6 +6690,7 @@ def plot_axisPointPlane(): result_msg = " : Plane created !" name = "WorkPlane" part = "Part::Feature" + Selection = get_SelectedObjects(info=msg, printError=False) try: SelectedObjects = Selection @@ -6625,6 +7441,7 @@ def get_all_from_bounding_box(ori_X,ori_Y,ori_Z,length_X,length_Y,length_Z,info= return Points, Edges, Faces + def volumBBox_toggled(flag): """ Respond to the change of solid flag. """ @@ -7902,7 +8719,6 @@ def plot_sectionSweep(): # Remove duplicated section App.getDocument(str(App.activeDocument().Name)).removeObject(m_copy.Label) - except: printError_msg(error_msg) @@ -8279,6 +9095,9 @@ def view_trackCamera(): m_lookVector = currEdge.valueAt( currEdge.Length ) m_camera.pointAt( coin.SbVec3f( m_lookVector[0], m_lookVector[1], m_lookVector[2] + m_camHeight ), coin.SbVec3f( 0, 0, 1 ) ) Gui.updateGui() + cam=Gui.ActiveDocument.ActiveView.getCameraNode() + direction = cam.orientation.getValue().multVec(coin.SbVec3f(0,0,1)).getValue() + print_msg("Camera Orientattion is :" + str(direction)) time.sleep( m_sleep ) while currPos.sub(currEdge.valueAt( 0.0 )).Length < currEdge.Length: @@ -8287,6 +9106,9 @@ def view_trackCamera(): m_lookVector = currEdge.valueAt( currEdge.Length ) m_camera.pointAt( coin.SbVec3f( m_lookVector[0], m_lookVector[1], m_lookVector[2] + m_camHeight ), coin.SbVec3f( 0, 0, 1 ) ) Gui.updateGui() + cam=Gui.ActiveDocument.ActiveView.getCameraNode() + direction = cam.orientation.getValue().multVec(coin.SbVec3f(0,0,1)).getValue() + print_msg("Camera Orientattion is :" + str(direction)) time.sleep( m_sleep ) if m_edges_num == 0: printError_msg("No Edge was selected !") @@ -9497,7 +10319,10 @@ def camera_orientation(): yP = pl.Rotation.Q[1] zP = pl.Rotation.Q[2] qP = pl.Rotation.Q[3] - + + cam=Gui.ActiveDocument.ActiveView.getCameraNode() + direction = cam.orientation.getValue().multVec(coin.SbVec3f(0,0,1)).getValue() + msg=\ "___Camera_Orientation____________________"+"\n" +\ "Radians XYZ Q : " + str(pl.Rotation.Q)+"\n" +\ @@ -9507,7 +10332,8 @@ def camera_orientation(): "Degrees Axis.x : " + str(math.degrees(pl.Rotation.Axis.x)) +"\n"+\ "Degrees Axis.y : " + str(math.degrees(pl.Rotation.Axis.y)) +"\n"+\ "Degrees Axis.z : " + str(math.degrees(pl.Rotation.Axis.z)) +"\n"+\ - "Degrees Angle : " + str(math.degrees(pl.Rotation.Angle)) + "Degrees Angle : " + str(math.degrees(pl.Rotation.Angle)) +"\n"+\ + "Direction Vector : " + str (direction) print_gui_msg(msg) @@ -9748,6 +10574,7 @@ def object_align2view_old(): except: printError_msg(error_msg) + def object_align2view(): """ Align the face of selected object(s) to the actual view Plane. @@ -10096,8 +10923,274 @@ def object_alignEdges(): printError_msg(error_msg) except: printError_msg(error_msg) - + + +def angleAlignMainAxis(value): + """ Respond to the change in angle value from the text box. + """ + try: + # First we check if a valid number have been entered + global m_angleAlignMainAxis + if str(value) == '-': + return + m_angleAlignMainAxis = float(value) + print_msg("New angle in degrees is :" + str(m_angleAlignMainAxis)) + except ValueError: + printError_msg("Angle must be valid number !") + + +def object_alignMainAxis(): + """Align the main Axis (first of the 2 axis set) from selected object(s) to the last Edge (or 2 main Axis from an object) selected. + - Click first to select at least one object! + This or These first object(s) will be rotated. + - Click last to select an Edge (or an Object) to align to (this last object is fixed and will never move). + Then Click the button. + NB: + The 2 main first axis are calculated using scan and sort from all axis of the object. + The center of rotation is at center mass location of each selected object. + + In case of several objects selection : + The 2 main Axis of the first object(s) will be aligned on the 2 main Axis of the last one. + In case of several objects selection plus one Edge : + The first main Axis of the object(s) will be aligned on the Edge. + - One click will align first main Axes. + - Second click will also align the second main Axes if exists on last object or + will rotate by 180 deg the moving objects on first main axes. + - Third and following clicks will rotate by 180 deg the moving objects on first main axes. + """ + msg=verbose + msg=1 + + try: + import numpy as np + except: + error_msg = "Unable to import numpy !\n" +\ + "You MUSt install numpy to use this function !" + printError_msg(error_msg) + + m_actDoc = get_ActiveDocument(info=msg) + if m_actDoc == None: + return None + + + error_msg =\ + "INCORRECT Object(s) Selection :\n" +\ + "You Must Select at least one object and one object (or one Edge)!\n" +\ + "In case of several objects selection :\n" +\ + " The 2 main Axis of the first object(s) will be aligned on the 2 main Axis of the last one.\n" +\ + "In case of several objects selection plus one Edge :\n" +\ + " The first main Axis of the object(s) will be aligned on the Edge." + + Selection2 = Gui.Selection.getSelectionEx(m_actDoc.Name) + + SelectedObjects = get_SelectedObjects(info=msg, printError=False) + + + try: + Selected_Axes = [] + Ref_Edge1 = None + Ref_Edge2 = None + Edge1 = None + Edge2 = None + + Number_of_Edges = SelectedObjects[1] + Number_of_Faces = SelectedObjects[2] + Number_of_Objects = len(SelectedObjects[6]) + if msg != 0: + print_msg("Number_of_Edges = " + str(Number_of_Edges)) + print_msg("Number_of_Faces = " + str(Number_of_Faces)) + print_msg("Number_of_Objects = " + str(Number_of_Objects)) + + # Get the Reference Edge : last of the selected or main axes of last object + if Number_of_Edges >= 1: + Edge_List = SelectedObjects[4] + # Get the Reference Edge : last of the selected + Ref_Edge1 = (Edge_List[-1].Vertexes[0].Point,Edge_List[-1].Vertexes[-1].Point) + #del Edge_List[-1] + else: + if Number_of_Objects > 1: + Ref_object = SelectedObjects[6][-1] + Selected_Axes = [] + for m_edge in Ref_object.Shape.Edges: + Selected_Axes.append(m_edge) + Number_of_Axes = len(Selected_Axes) + if Number_of_Axes == 0 : + printError_msg(error_msg) + return + Selected_AxesWithLength, Selected_Points = get_mainAxesFromSelectedAxes(Selected_Axes, info=0) + if Selected_AxesWithLength: + m_new_dim = len(Selected_AxesWithLength) + Vector_Center = meanVectorsPoint(Selected_Points,info=0) + if m_new_dim >= 1 : + # Get the first main axis + m_axiswithlength = Selected_AxesWithLength[-1] + m_p1 = m_axiswithlength[0].Vertexes[0].Point + m_p2 = m_axiswithlength[0].Vertexes[-1].Point + m_c = centerLinePoint(m_axiswithlength[0]) + m_mv = Vector_Center.sub(m_c) + Vector = m_p2.sub(m_p1).normalize().multiply(m_axiswithlength[1]/2) + + m_c.add(Vector.multiply(-1)).add(m_mv) + Ref_Edge1 = (m_c.add(Vector).add(m_mv),m_c.add(Vector.multiply(-1)).add(m_mv)) + if m_new_dim >= 2 : + # Get the second main axis + m_axiswithlength = Selected_AxesWithLength[-2] + m_p1 = m_axiswithlength[0].Vertexes[0].Point + m_p2 = m_axiswithlength[0].Vertexes[-1].Point + m_c = centerLinePoint(m_axiswithlength[0]) + m_mv = Vector_Center.sub(m_c) + Vector = m_p2.sub(m_p1).normalize().multiply(m_axiswithlength[1]/2) + + m_c.add(Vector.multiply(-1)).add(m_mv) + Ref_Edge2 = (m_c.add(Vector).add(m_mv),m_c.add(Vector.multiply(-1)).add(m_mv)) + else: + printError_msg(error_msg) + return + #del SelectedObjects[6][-1] + else: + printError_msg(error_msg) + + if not Ref_Edge1 : + printError_msg(error_msg) + return + if msg != 0: + print_msg("Ref_Edge = "+ str(Ref_Edge1)) + + Number_of_Objects = len(SelectedObjects[6]) + if msg != 0: + print_msg("Number_of_Objects to move = " + str(Number_of_Objects - 1)) + if Number_of_Objects > 0: + Object_List = SelectedObjects[6] + for m_object in Object_List[:-1]: + if msg != 0: + print_msg("m_object = "+ str(m_object)) + Selected_Axes = [] + for m_edge in m_object.Shape.Edges: + Selected_Axes.append(m_edge) + + Number_of_Axes = len(Selected_Axes) + if msg != 0: + print_msg("Number_of_Axes = "+ str(Number_of_Axes)) + if Number_of_Axes == 0 : + continue + + Selected_AxesWithLength, Selected_Points = get_mainAxesFromSelectedAxes(Selected_Axes, info=0) + if not Selected_AxesWithLength: + continue + m_new_dim = len(Selected_AxesWithLength) + if msg != 0: + print_msg("New Number_of_Axes = "+ str(m_new_dim)) + Vector_Center = m_object.Shape.CenterOfMass + if not Vector_Center: + Vector_Center = meanVectorsPoint(Selected_Points,info=0) + if m_new_dim >= 1 : + # Get the first main axis + m_axiswithlength = Selected_AxesWithLength[-1] + m_p1 = m_axiswithlength[0].Vertexes[0].Point + m_p2 = m_axiswithlength[0].Vertexes[-1].Point + m_c = centerLinePoint(m_axiswithlength[0]) + m_mv = Vector_Center.sub(m_c) + Vector = m_p2.sub(m_p1).normalize().multiply(m_axiswithlength[1]/2) + + m_c.add(Vector.multiply(-1)).add(m_mv) + Selected_Edge1 = (m_c.add(Vector).add(m_mv),m_c.add(Vector.multiply(-1)).add(m_mv)) + if m_new_dim >= 2 : + # Get the second main axis + m_axiswithlength = Selected_AxesWithLength[-2] + m_p1 = m_axiswithlength[0].Vertexes[0].Point + m_p2 = m_axiswithlength[0].Vertexes[-1].Point + m_c = centerLinePoint(m_axiswithlength[0]) + m_mv = Vector_Center.sub(m_c) + Vector = m_p2.sub(m_p1).normalize().multiply(m_axiswithlength[1]/2) + + m_c.add(Vector.multiply(-1)).add(m_mv) + Selected_Edge2 = (m_c.add(Vector).add(m_mv),m_c.add(Vector.multiply(-1)).add(m_mv)) + else: + printError_msg(error_msg) + return + + Edge1 = Selected_Edge1 + if Selected_Edge2: + Edge2 = Selected_Edge2 + if msg != 0: + print_msg("Selected_Edge1 = "+ str(Edge1)) + if Selected_Edge2: + print_msg("Selected_Edge2 = "+ str(Edge2)) + A = Base.Vector(Ref_Edge1[-1]).sub(Base.Vector(Ref_Edge1[0])) + if Ref_Edge2: + B = Base.Vector(Ref_Edge2[-1]).sub(Base.Vector(Ref_Edge2[0])) + Z = Base.Vector(0, 0, 0) + C = Base.Vector(Edge1[-1]).sub(Base.Vector(Edge1[0])) + if Selected_Edge2: + D = Base.Vector(Edge2[-1]).sub(Base.Vector(Edge2[0])) + + if colinearVectors(A, Z, C, info=msg , tolerance=1e-7): + #if angleBetween(C,A) == 0.0 or angleBetween(C,A) == 180.0 : + if msg != 0: + print_msg("First main axis are colinear!") + if Selected_Edge2 and Ref_Edge2: + if colinearVectors(B, Z, D, info=msg , tolerance=1e-7): + #if angleBetween(D,B) == 0.0 or angleBetween(D,B) == 180.0: + if msg != 0: + print_msg("Second main axis are colinear!") + rot_axis = Base.Vector(0, 0, 1).cross(D) + rot_center = Vector_Center + rot_angle = 180. + m_angleAlignMainAxis + if msg != 0: + print_msg("rot_axis = "+ str(rot_axis)) + print_msg("rot_center = "+ str(rot_center)) + print_msg("rot_angle = "+ str(rot_angle)) + Draft.rotate(m_object,rot_angle,rot_center,rot_axis) + else: + if msg != 0: + print_msg("Second main axis are Not colinear!") + m_angle, _ = angleBetween(D,B) + rot_axis = D.cross(B) + print_msg("rot_axis = " + str(rot_axis)) + rot_center = Vector_Center + rot_angle = m_angle + m_angleAlignMainAxis + if msg != 0: + print_msg("rot_axis = "+ str(rot_axis)) + print_msg("rot_center = "+ str(rot_center)) + print_msg("rot_angle = "+ str(rot_angle)) + Draft.rotate(m_object,rot_angle,rot_center,rot_axis) + else: + rot_axis = Base.Vector(0, 0, 1).cross(C) + rot_center = Vector_Center + rot_angle = 180. + m_angleAlignMainAxis + if msg != 0: + print_msg("rot_axis = "+ str(rot_axis)) + print_msg("rot_center = "+ str(rot_center)) + print_msg("rot_angle = "+ str(rot_angle)) + Draft.rotate(m_object,rot_angle,rot_center,rot_axis) + else: + if msg != 0: + print_msg("First main axis are Not colinear!") + m_angle, _ = angleBetween(C,A) + rot_axis = C.cross(A) + print_msg("rot_axis = " + str(rot_axis)) + rot_center = Vector_Center + rot_angle = m_angle + m_angleAlignMainAxis + if msg != 0: + print_msg("rot_axis = "+ str(rot_axis)) + print_msg("rot_center = "+ str(rot_center)) + print_msg("rot_angle = "+ str(rot_angle)) + Draft.rotate(m_object,rot_angle,rot_center,rot_axis) + # Case of Cube + # case of Sphere + # case of Tore + # Case of Cylinder + # Case of Cone + # Case of other objects + # Reset the selection changed by Draft.rotate + reset_SelectedObjects(Selection2, info=0) + else: + printError_msg(error_msg) + except: + printError_msg(error_msg) + + def object_jointPoints(): """ Joint Point(s) from selected object(s) to the last Point selected. @@ -10275,6 +11368,7 @@ except AttributeError: #################################################################################### class WorkFeatureTab(): def __init__(self, movable=True): + self.movable = movable if self.movable: # Look if WF movable tab already exists @@ -10363,11 +11457,15 @@ class WorkFeatureTab(): "button_cut_wire_point" : "plot_cutWirePoint", "button_click_for_point" : "plot_clickForPoint", "button_object_base_point" : "plot_baseObjectPoint", + "button_object_center_mass_point": "plot_centerMassObjectPoint", + "button_object_Npoint" : "plot_objectNPoints", "button_point_to_sketch" : "point_toSketch", + "button_points_load" : "point_toLoad", + "button_points_save" : "point_toSave", "button_object_axis" : "plot_centerObjectAxes", "button_twopoints_axis" : "plot_2PointsAxis", - "button_Npoints_axis" : "plot_NPoints_axis", + "button_Npoints_axis" : "plot_NPointsAxis", "button_cylinder_axis" : "plot_cylinderAxis", "button_plane_axis" : "plot_planeAxis", "button_face_normal" : "plot_faceNormal", @@ -10383,8 +11481,10 @@ class WorkFeatureTab(): "button_cut_axis" : "plot_cutAxis", "button_cut_wire_axis" : "plot_cutWireAxis", "button_extension_axis" : "plot_extensionAxis", - "button_click_for_axis" : "plot_clickForAxis", + "button_click_for_axis" : "plot_clickForAxis", "button_object_base_axes" : "plot_baseObjectAxes", + "button_object_Naxes" : "plot_objectNAxes", + "button_object_3axes" : "plot_object3Axes", "button_line_to_sketch" : "line_toSketch", "button_linecenter_circle" : "plot_linecenterCircle", @@ -10395,6 +11495,8 @@ class WorkFeatureTab(): "button_circle_to_sketch" : "circle_toSketch", "button_threepoints_plane" : "plot_3PointsPlane", + "button_twopoints_plane" : "plot_2PointsPlane", + "button_Npoints_plane" : "plot_NPointsPlane", "button_axisandpoint_plane" : "plot_axisPointPlane", "button_axis_point_plane" : "plot_perpendicularAxisPointPlane", "button_planeandpoint_plane" : "plot_planePointPlane", @@ -10440,9 +11542,11 @@ class WorkFeatureTab(): "button_isArea" : "plane_area", "button_isView" : "camera_orientation", + "button_alignface2view" : "object_align2view", "button_align_faces" : "object_alignFaces", "button_align_edges" : "object_alignEdges", + "button_align_main_axis" : "object_alignMainAxis", "button_joint_points" : "object_jointPoints", "button_joint_faces" : "object_jointFaces", } @@ -10482,6 +11586,7 @@ class WorkFeatureTab(): "dist_point" : "distPoint", "angle_align_faces" : "angleAlignFaces", "angle_align_edges" : "angleAlignEdges", + "angle_align_main_axis" : "angleAlignMainAxis", "angle_revolve" : "angleRevolve", "size_letter" : "sizeLetter", "letter" : "letter", @@ -10587,16 +11692,16 @@ class WorkFeatureTab(): break def getMainWindow(self): - """ Returns the main window - """ - # using QtGui.qApp.activeWindow() isn't very reliable because if another - # widget than the mainwindow is active (e.g. a dialog) the wrong widget - # is returned - toplevel = QtGui.qApp.topLevelWidgets() - for i in toplevel: - if i.metaObject().className() == "Gui::MainWindow": - return i - raise Exception("No main window found") + """ Returns the main window + """ + # using QtGui.qApp.activeWindow() isn't very reliable because if another + # widget than the mainwindow is active (e.g. a dialog) the wrong widget + # is returned + toplevel = QtGui.qApp.topLevelWidgets() + for i in toplevel: + if i.metaObject().className() == "Gui::MainWindow": + return i + raise Exception("No main window found") def getComboView(self,window): diff --git a/WorkFeature/WF_ObjRot_2015.py b/WorkFeature/WF_ObjRot_2015.py index 2621a22..93ec0aa 100644 --- a/WorkFeature/WF_ObjRot_2015.py +++ b/WorkFeature/WF_ObjRot_2015.py @@ -23,7 +23,21 @@ from FreeCAD import Base from PySide import QtCore, QtGui - +#Print x,y and z of a point:vector. +def print_point(point, msg=""): + """ Print x,y and z of a point:vector. + """ + if point.__class__.__name__ != "Vector": + print_msg("Not a Vector to print !") + return + #print_msg(str(point)) + #m_type = point.__class__.__name__ + #print_msg(str(m_type)) + print_msg(str(msg) + " " + + "x =" + str(point.x) + ", " + "y =" + str(point.y) + ", " + "z =" + str(point.z)) + return def plot_point(Vector_point, part="Part::Feature", name="CenterObjects", grp="Rot_Trans"): if not(App.ActiveDocument.getObject( grp )): @@ -242,6 +256,9 @@ class Translation(): def enable(self, flag=True): """ Enable or not most of the buttons. """ + if self.msg != 0: + func.print_msg("Translation.enable :") + self.comb_start.setEnabled(flag) self.but_start.setEnabled(flag) self.comb_end.setEnabled(flag) @@ -253,7 +270,10 @@ class Translation(): def setEnabledStartInput(self, flag=True): """ Enable or not the input boxes for start point. - """ + """ + if self.msg != 0: + func.print_msg("Translation.setEnabledStartInput :") + self.start_x.setEnabled(flag) self.start_y.setEnabled(flag) self.start_z.setEnabled(flag) @@ -261,7 +281,10 @@ class Translation(): def setEnabledEndInput(self, flag=True): """ Enable or not the input boxes for end point. - """ + """ + if self.msg != 0: + func.print_msg("Translation.setEnabledEndInput :") + self.end_x.setEnabled(flag) self.end_y.setEnabled(flag) self.end_z.setEnabled(flag) @@ -269,14 +292,17 @@ class Translation(): def numberCopies(self,value): """ Respond to the change in number of part value from the spin box. - """ + """ + if self.msg != 0: + + func.print_msg("Translation.numberCopies :") try: # First we check if a valid number have been entered if str(value) == '-': return self.m_num_cpy = int(value) except ValueError: - func.printError_msg("Number must be valid !") + func.printError_msg("Number must be valid !") if self.msg != 0: func.print_msg("New copy number is :" + str(self.m_num_cpy)) @@ -289,7 +315,8 @@ class Translation(): """ Respond to the change of deep copy flag. """ if self.msg != 0: - func.print_msg("deepCopyFlag !") + func.print_msg("Translation.deepCopyFlag :") + self.deep = flag @@ -297,7 +324,8 @@ class Translation(): """ Respond to the change of duplicate flag. """ if self.msg != 0: - func.print_msg("copyFlag !") + func.print_msg("Translation.copyFlag :") + if flag == False: self.m_num_cpy = 1 self.dup_num.setValue(self.m_num_cpy) @@ -325,7 +353,7 @@ class Translation(): """ Clean the list of Duplicated objects. """ if self.msg != 0: - func.print_msg("cleanDuplication :") + func.print_msg("Translation.cleanDuplication :") for m_objdup in self.m_objs_dup: if self.msg != 0: @@ -339,7 +367,7 @@ class Translation(): """ Reset the list of Duplicated objects. """ if self.msg != 0: - func.print_msg("resetDuplication :") + func.print_msg("Translation.resetDuplication :") self.cleanDuplication() @@ -359,7 +387,7 @@ class Translation(): into internal placement lists. """ if self.msg != 0: - func.print_msg("initialize !") + func.print_msg("Translation.initialize :") func.createFolders("Rot_Trans") @@ -440,7 +468,7 @@ class Translation(): func.print_msg("self.placement0[" + str(m_i) + "].Base=" + str(self.placement0[m_i].Base )) func.print_msg("self.placement0[" + str(m_i) + "].Rotation=" + str(self.placement0[m_i].Rotation )) - self.base = self.placement0[0].Base + self.base = self.placement0[0].Base self.center = func.centerObjectsPoint(self.m_objs, info=0) self.origin = App.Vector(0,0,0) @@ -466,7 +494,7 @@ class Translation(): """ Remove all the visualization objects. """ if self.msg != 0: - func.print_msg("removeVisu :") + func.print_msg("Translation.removeVisu :") for i in range(len(self.visuObjects)): App.getDocument(str(App.activeDocument().Name)).removeObject(self.visuObjects[i]) @@ -477,7 +505,7 @@ class Translation(): """ Set the visualization objects. """ if self.msg != 0: - func.print_msg("visu :") + func.print_msg("Translation.visu :") m_start = self.start m_base = self.base @@ -517,7 +545,8 @@ class Translation(): def start_x_entered(self): if self.msg != 0: - func.print_msg("start_x_entered :") + func.print_msg("Translation.start_x_entered :") + try: # First we check if a valid number have been entered self.start.x = float(self.start_x.text()) @@ -532,7 +561,8 @@ class Translation(): def start_y_entered(self): if self.msg != 0: - func.print_msg("start_y_entered :") + func.print_msg("Translation.start_y_entered :") + try: # First we check if a valid number have been entered self.start.y = float(self.start_y.text()) @@ -547,7 +577,8 @@ class Translation(): def start_z_entered(self): if self.msg != 0: - func.print_msg("start_z_entered :") + func.print_msg("Translation.start_z_entered :") + try: # First we check if a valid number have been entered self.start.z = float(self.start_z.text()) @@ -562,7 +593,7 @@ class Translation(): def print_start(self, point): if self.msg != 0: - func.print_msg("print_start :") + func.print_msg("Translation.print_start :") self.start_x.setText(str(point.x)) self.start_y.setText(str(point.y)) @@ -573,7 +604,7 @@ class Translation(): """ Selection of Start point of translation by button. """ if self.msg != 0: - func.print_msg("select_start : Selection of Start point of translation by button !") + func.print_msg("Translation.select_start : Selection of Start point of translation by button !") error_msg = "Select one point !" @@ -600,7 +631,8 @@ class Translation(): """ Reset the combo box for start button. """ if self.msg != 0: - func.print_msg("reset_start_value :") + func.print_msg("Translation.reset_start_value :") + # DeActivate select button self.but_start.setEnabled(False) button_text = "Select" @@ -614,7 +646,7 @@ class Translation(): """ Start point of translation by combo box. """ if self.msg != 0: - func.print_msg("select_start_type : Start point of translation by combo box !") + func.print_msg("Translation.select_start_type : Start point of translation by combo box !") self.reset_start_value() @@ -636,9 +668,9 @@ class Translation(): self.visu() - def end_x_entered(self): + def end_x_entered(self): if self.msg != 0: - func.print_msg("end_x_entered :") + func.print_msg("Translation.end_x_entered :") try: # First we check if a valid number have been entered self.relative.x = float(self.end_x.text()) @@ -660,7 +692,7 @@ class Translation(): def end_y_entered(self): if self.msg != 0: - func.print_msg("end_y_entered :") + func.print_msg("Translation.end_y_entered :") try: # First we check if a valid number have been entered self.relative.y = float(self.end_y.text()) @@ -682,7 +714,7 @@ class Translation(): def end_z_entered(self): if self.msg != 0: - func.print_msg("end_z_entered :") + func.print_msg("Translation.end_z_entered :") try: # First we check if a valid number have been entered self.relative.z = float(self.end_z.text()) @@ -704,7 +736,7 @@ class Translation(): def print_end(self, point): if self.msg != 0: - func.print_msg("print_end :") + func.print_msg("Translation.print_end :") self.end_x.setText(str(point.x)) self.end_y.setText(str(point.y)) @@ -715,7 +747,7 @@ class Translation(): """ Selection of End point(s) of translation by button. """ if self.msg != 0: - func.print_msg("select_end : Selection of End point(s) of translation by button !") + func.print_msg("Translation.select_end : Selection of End point(s) of translation by button !") error_msg = "Select at least one point !" @@ -748,7 +780,7 @@ class Translation(): """ Reset the combo box for end button. """ if self.msg != 0: - func.print_msg("reset_end_value :") + func.print_msg("Translation.reset_end_value :") # DeActivate select button self.but_end.setEnabled(False) @@ -763,7 +795,7 @@ class Translation(): """ End point of translation by combo box. """ if self.msg != 0: - func.print_msg("select_end_type : End point of translation by combo box !") + func.print_msg("Translation.select_end_type : End point of translation by combo box !") self.reset_end_value() @@ -798,7 +830,7 @@ class Translation(): """ Preview the placement. """ if self.msg != 0: - func.print_msg("Preview the placement !") + func.print_msg("Translation.Preview the placement !") if self.selection() == False: return @@ -868,7 +900,7 @@ class Translation(): """ Application by saving into internal placements list. """ if self.msg != 0: - func.print_msg("Apply button pressed !") + func.print_msg("Translation.application :") if self.selection() == False: if self.msg != 0: @@ -892,11 +924,12 @@ class Translation(): self.applied = True self.initialize() + def reset(self): """ Reset to original placement. """ if self.msg != 0: - func.print_msg("reset :") + func.print_msg("Translation.reset :") if self.selection() == False: if self.msg != 0: @@ -904,7 +937,7 @@ class Translation(): return if self.msg != 0: - func.print_msg("Selection detected !") + func.print_msg("Selection detected !") for m_i_obj in range(self.m_num_obj): self.m_objs[m_i_obj].Placement = self.placement0[m_i_obj] @@ -1446,6 +1479,7 @@ class TranslationEvents(DefineAndConnectEvents): "ObjTrans_end_y" : "end_y_entered", "ObjTrans_end_z" : "end_z_entered", } + #################################################################################### class ObjectRotationTab(): def __init__(self): @@ -1477,6 +1511,8 @@ class ObjectRotationTab(): self.ui.setupUi(self.m_dialog) self.m_tab.setCurrentIndex(i+1) + # Create a Rotation object + #self.rot = Rotation(self.ui) # Create a Translation object self.trans = Translation(self.ui) diff --git a/WorkFeature/WF_Utils_2015.py b/WorkFeature/WF_Utils_2015.py index a347b75..8051033 100644 --- a/WorkFeature/WF_Utils_2015.py +++ b/WorkFeature/WF_Utils_2015.py @@ -233,6 +233,11 @@ class DefineAndConnectEvents(): #print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.obj, str(m_val))) ) QtCore.QObject.connect(getattr(self.ui, str(m_key)), QtCore.SIGNAL("returnPressed()"),getattr(self.obj, str(m_val))) + + for m_key, m_val in self.connections_for_return_pressed.items(): + #print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.obj, str(m_val))) ) + QtCore.QObject.connect(getattr(self.ui, str(m_key)), + QtCore.SIGNAL("editingFinished()"),getattr(self.obj, str(m_val))) if __name__ == '__main__': myObject = DefineAndConnectEvents(None, None) \ No newline at end of file