diff --git a/Gui.py b/Gui.py index 42cd35a..0fbe5b0 100644 --- a/Gui.py +++ b/Gui.py @@ -25,7 +25,7 @@ class Ui_fluencyCAD(object): def setupUi(self, fluencyCAD): if not fluencyCAD.objectName(): fluencyCAD.setObjectName(u"fluencyCAD") - fluencyCAD.resize(2214, 803) + fluencyCAD.resize(2192, 957) self.actionNew_Project = QAction(fluencyCAD) self.actionNew_Project.setObjectName(u"actionNew_Project") self.actionLoad_Project = QAction(fluencyCAD) @@ -36,8 +36,134 @@ class Ui_fluencyCAD(object): self.centralwidget.setObjectName(u"centralwidget") self.gridLayout = QGridLayout(self.centralwidget) self.gridLayout.setObjectName(u"gridLayout") + self.gl_box = QGroupBox(self.centralwidget) + self.gl_box.setObjectName(u"gl_box") + sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(4) + sizePolicy.setHeightForWidth(self.gl_box.sizePolicy().hasHeightForWidth()) + self.gl_box.setSizePolicy(sizePolicy) + font = QFont() + font.setPointSize(12) + self.gl_box.setFont(font) + self.horizontalLayout_4 = QHBoxLayout(self.gl_box) +#ifndef Q_OS_MAC + self.horizontalLayout_4.setSpacing(-1) +#endif + self.horizontalLayout_4.setObjectName(u"horizontalLayout_4") + self.horizontalLayout_4.setContentsMargins(12, -1, -1, -1) + + self.gridLayout.addWidget(self.gl_box, 0, 3, 7, 1) + + self.groupBox_4 = QGroupBox(self.centralwidget) + self.groupBox_4.setObjectName(u"groupBox_4") + self.verticalLayout_2 = QVBoxLayout(self.groupBox_4) + self.verticalLayout_2.setObjectName(u"verticalLayout_2") + self.pushButton_2 = QPushButton(self.groupBox_4) + self.pushButton_2.setObjectName(u"pushButton_2") + + self.verticalLayout_2.addWidget(self.pushButton_2) + + + self.gridLayout.addWidget(self.groupBox_4, 12, 4, 1, 1) + + self.InputTab = QTabWidget(self.centralwidget) + self.InputTab.setObjectName(u"InputTab") + sizePolicy1 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred) + sizePolicy1.setHorizontalStretch(0) + sizePolicy1.setVerticalStretch(0) + sizePolicy1.setHeightForWidth(self.InputTab.sizePolicy().hasHeightForWidth()) + self.InputTab.setSizePolicy(sizePolicy1) + self.sketch_tab = QWidget() + self.sketch_tab.setObjectName(u"sketch_tab") + self.verticalLayout_4 = QVBoxLayout(self.sketch_tab) + self.verticalLayout_4.setObjectName(u"verticalLayout_4") + self.InputTab.addTab(self.sketch_tab, "") + self.code_tab = QWidget() + self.code_tab.setObjectName(u"code_tab") + self.verticalLayout = QVBoxLayout(self.code_tab) + self.verticalLayout.setObjectName(u"verticalLayout") + self.textEdit = QTextEdit(self.code_tab) + self.textEdit.setObjectName(u"textEdit") + + self.verticalLayout.addWidget(self.textEdit) + + self.groupBox_7 = QGroupBox(self.code_tab) + self.groupBox_7.setObjectName(u"groupBox_7") + self.gridLayout_5 = QGridLayout(self.groupBox_7) + self.gridLayout_5.setObjectName(u"gridLayout_5") + self.pushButton_5 = QPushButton(self.groupBox_7) + self.pushButton_5.setObjectName(u"pushButton_5") + + self.gridLayout_5.addWidget(self.pushButton_5, 2, 0, 1, 1) + + self.pushButton_4 = QPushButton(self.groupBox_7) + self.pushButton_4.setObjectName(u"pushButton_4") + + self.gridLayout_5.addWidget(self.pushButton_4, 2, 1, 1, 1) + + self.pb_apply_code = QPushButton(self.groupBox_7) + self.pb_apply_code.setObjectName(u"pb_apply_code") + + self.gridLayout_5.addWidget(self.pb_apply_code, 1, 0, 1, 1) + + self.pushButton = QPushButton(self.groupBox_7) + self.pushButton.setObjectName(u"pushButton") + + self.gridLayout_5.addWidget(self.pushButton, 1, 1, 1, 1) + + + self.verticalLayout.addWidget(self.groupBox_7) + + self.InputTab.addTab(self.code_tab, "") + + self.gridLayout.addWidget(self.InputTab, 0, 2, 7, 1) + + self.timeline_box = QGroupBox(self.centralwidget) + self.timeline_box.setObjectName(u"timeline_box") + + self.gridLayout.addWidget(self.timeline_box, 12, 2, 1, 2) + + self.groupBox = QGroupBox(self.centralwidget) + self.groupBox.setObjectName(u"groupBox") + self.gridLayout_3 = QGridLayout(self.groupBox) + self.gridLayout_3.setObjectName(u"gridLayout_3") + self.pb_revop = QPushButton(self.groupBox) + self.pb_revop.setObjectName(u"pb_revop") + + self.gridLayout_3.addWidget(self.pb_revop, 2, 1, 1, 1) + + self.pb_extrdop = QPushButton(self.groupBox) + self.pb_extrdop.setObjectName(u"pb_extrdop") + + self.gridLayout_3.addWidget(self.pb_extrdop, 0, 0, 1, 1) + + self.pb_arrayop = QPushButton(self.groupBox) + self.pb_arrayop.setObjectName(u"pb_arrayop") + + self.gridLayout_3.addWidget(self.pb_arrayop, 2, 0, 1, 1) + + self.pb_cutop = QPushButton(self.groupBox) + self.pb_cutop.setObjectName(u"pb_cutop") + + self.gridLayout_3.addWidget(self.pb_cutop, 0, 1, 1, 1) + + self.pb_combop = QPushButton(self.groupBox) + self.pb_combop.setObjectName(u"pb_combop") + + self.gridLayout_3.addWidget(self.pb_combop, 1, 0, 1, 1) + + self.pb_moveop = QPushButton(self.groupBox) + self.pb_moveop.setObjectName(u"pb_moveop") + + self.gridLayout_3.addWidget(self.pb_moveop, 1, 1, 1, 1) + + + self.gridLayout.addWidget(self.groupBox, 0, 4, 1, 1, Qt.AlignTop) + self.groupBox_9 = QGroupBox(self.centralwidget) self.groupBox_9.setObjectName(u"groupBox_9") + self.groupBox_9.setMaximumSize(QSize(200, 16777215)) self.gridLayout_7 = QGridLayout(self.groupBox_9) self.gridLayout_7.setObjectName(u"gridLayout_7") self.pb_origin_wp = QPushButton(self.groupBox_9) @@ -61,16 +187,54 @@ class Ui_fluencyCAD(object): self.gridLayout_7.addWidget(self.pb_move_wp, 1, 1, 1, 1) - self.gridLayout.addWidget(self.groupBox_9, 0, 0, 1, 1) + self.gridLayout.addWidget(self.groupBox_9, 0, 0, 1, 1, Qt.AlignTop) + + self.groupBox_2 = QGroupBox(self.centralwidget) + self.groupBox_2.setObjectName(u"groupBox_2") + sizePolicy2 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) + sizePolicy2.setHorizontalStretch(0) + sizePolicy2.setVerticalStretch(0) + sizePolicy2.setHeightForWidth(self.groupBox_2.sizePolicy().hasHeightForWidth()) + self.groupBox_2.setSizePolicy(sizePolicy2) + self.groupBox_2.setMaximumSize(QSize(200, 16777215)) + self.gridLayout_2 = QGridLayout(self.groupBox_2) + self.gridLayout_2.setObjectName(u"gridLayout_2") + self.pb_rectool = QPushButton(self.groupBox_2) + self.pb_rectool.setObjectName(u"pb_rectool") + self.pb_rectool.setCheckable(True) + self.pb_rectool.setAutoExclusive(False) + + self.gridLayout_2.addWidget(self.pb_rectool, 1, 1, 1, 1, Qt.AlignTop) + + self.pb_circtool = QPushButton(self.groupBox_2) + self.pb_circtool.setObjectName(u"pb_circtool") + self.pb_circtool.setCheckable(True) + self.pb_circtool.setAutoExclusive(False) + + self.gridLayout_2.addWidget(self.pb_circtool, 2, 0, 1, 1, Qt.AlignTop) + + self.pb_slotool = QPushButton(self.groupBox_2) + self.pb_slotool.setObjectName(u"pb_slotool") + self.pb_slotool.setCheckable(True) + self.pb_slotool.setAutoExclusive(False) + + self.gridLayout_2.addWidget(self.pb_slotool, 2, 1, 1, 1, Qt.AlignTop) + + self.pb_linetool = QPushButton(self.groupBox_2) + self.pb_linetool.setObjectName(u"pb_linetool") + self.pb_linetool.setCheckable(True) + self.pb_linetool.setAutoExclusive(False) + + self.gridLayout_2.addWidget(self.pb_linetool, 1, 0, 1, 1) + + + self.gridLayout.addWidget(self.groupBox_2, 1, 0, 1, 1) self.groupBox_3 = QGroupBox(self.centralwidget) self.groupBox_3.setObjectName(u"groupBox_3") - sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.groupBox_3.sizePolicy().hasHeightForWidth()) - self.groupBox_3.setSizePolicy(sizePolicy) - self.groupBox_3.setMaximumSize(QSize(16777214, 16777213)) + sizePolicy2.setHeightForWidth(self.groupBox_3.sizePolicy().hasHeightForWidth()) + self.groupBox_3.setSizePolicy(sizePolicy2) + self.groupBox_3.setMaximumSize(QSize(200, 16777213)) self.gridLayout_4 = QGridLayout(self.groupBox_3) self.gridLayout_4.setObjectName(u"gridLayout_4") self.pb_con_line = QPushButton(self.groupBox_3) @@ -131,214 +295,75 @@ class Ui_fluencyCAD(object): self.gridLayout.addWidget(self.groupBox_3, 2, 0, 1, 1) - self.groupBox_2 = QGroupBox(self.centralwidget) - self.groupBox_2.setObjectName(u"groupBox_2") - sizePolicy.setHeightForWidth(self.groupBox_2.sizePolicy().hasHeightForWidth()) - self.groupBox_2.setSizePolicy(sizePolicy) - self.gridLayout_2 = QGridLayout(self.groupBox_2) - self.gridLayout_2.setObjectName(u"gridLayout_2") - self.pb_rectool = QPushButton(self.groupBox_2) - self.pb_rectool.setObjectName(u"pb_rectool") - self.pb_rectool.setCheckable(True) - self.pb_rectool.setAutoExclusive(False) - - self.gridLayout_2.addWidget(self.pb_rectool, 1, 1, 1, 1, Qt.AlignTop) - - self.pb_circtool = QPushButton(self.groupBox_2) - self.pb_circtool.setObjectName(u"pb_circtool") - self.pb_circtool.setCheckable(True) - self.pb_circtool.setAutoExclusive(False) - - self.gridLayout_2.addWidget(self.pb_circtool, 2, 0, 1, 1, Qt.AlignTop) - - self.pb_slotool = QPushButton(self.groupBox_2) - self.pb_slotool.setObjectName(u"pb_slotool") - self.pb_slotool.setCheckable(True) - self.pb_slotool.setAutoExclusive(False) - - self.gridLayout_2.addWidget(self.pb_slotool, 2, 1, 1, 1, Qt.AlignTop) - - self.pb_linetool = QPushButton(self.groupBox_2) - self.pb_linetool.setObjectName(u"pb_linetool") - self.pb_linetool.setCheckable(True) - self.pb_linetool.setAutoExclusive(False) - - self.gridLayout_2.addWidget(self.pb_linetool, 1, 0, 1, 1) - - - self.gridLayout.addWidget(self.groupBox_2, 1, 0, 1, 1) - - self.gl_box = QGroupBox(self.centralwidget) - self.gl_box.setObjectName(u"gl_box") - sizePolicy1 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) - sizePolicy1.setHorizontalStretch(0) - sizePolicy1.setVerticalStretch(4) - sizePolicy1.setHeightForWidth(self.gl_box.sizePolicy().hasHeightForWidth()) - self.gl_box.setSizePolicy(sizePolicy1) - font = QFont() - font.setPointSize(12) - self.gl_box.setFont(font) - self.horizontalLayout_4 = QHBoxLayout(self.gl_box) -#ifndef Q_OS_MAC - self.horizontalLayout_4.setSpacing(-1) -#endif - self.horizontalLayout_4.setObjectName(u"horizontalLayout_4") - self.horizontalLayout_4.setContentsMargins(12, -1, -1, -1) - - self.gridLayout.addWidget(self.gl_box, 0, 4, 12, 1) - - self.InputTab = QTabWidget(self.centralwidget) - self.InputTab.setObjectName(u"InputTab") - sizePolicy2 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred) - sizePolicy2.setHorizontalStretch(0) - sizePolicy2.setVerticalStretch(0) - sizePolicy2.setHeightForWidth(self.InputTab.sizePolicy().hasHeightForWidth()) - self.InputTab.setSizePolicy(sizePolicy2) - self.sketch_tab = QWidget() - self.sketch_tab.setObjectName(u"sketch_tab") - self.verticalLayout_4 = QVBoxLayout(self.sketch_tab) - self.verticalLayout_4.setObjectName(u"verticalLayout_4") - self.InputTab.addTab(self.sketch_tab, "") - self.code_tab = QWidget() - self.code_tab.setObjectName(u"code_tab") - self.verticalLayout = QVBoxLayout(self.code_tab) - self.verticalLayout.setObjectName(u"verticalLayout") - self.textEdit = QTextEdit(self.code_tab) - self.textEdit.setObjectName(u"textEdit") - - self.verticalLayout.addWidget(self.textEdit) - - self.groupBox_7 = QGroupBox(self.code_tab) - self.groupBox_7.setObjectName(u"groupBox_7") - self.gridLayout_5 = QGridLayout(self.groupBox_7) - self.gridLayout_5.setObjectName(u"gridLayout_5") - self.pushButton_5 = QPushButton(self.groupBox_7) - self.pushButton_5.setObjectName(u"pushButton_5") - - self.gridLayout_5.addWidget(self.pushButton_5, 2, 0, 1, 1) - - self.pushButton_4 = QPushButton(self.groupBox_7) - self.pushButton_4.setObjectName(u"pushButton_4") - - self.gridLayout_5.addWidget(self.pushButton_4, 2, 1, 1, 1) - - self.pb_apply_code = QPushButton(self.groupBox_7) - self.pb_apply_code.setObjectName(u"pb_apply_code") - - self.gridLayout_5.addWidget(self.pb_apply_code, 1, 0, 1, 1) - - self.pushButton = QPushButton(self.groupBox_7) - self.pushButton.setObjectName(u"pushButton") - - self.gridLayout_5.addWidget(self.pushButton, 1, 1, 1, 1) - - - self.verticalLayout.addWidget(self.groupBox_7) - - self.InputTab.addTab(self.code_tab, "") - - self.gridLayout.addWidget(self.InputTab, 0, 2, 12, 1) - - self.groupBox = QGroupBox(self.centralwidget) - self.groupBox.setObjectName(u"groupBox") - self.gridLayout_3 = QGridLayout(self.groupBox) - self.gridLayout_3.setObjectName(u"gridLayout_3") - self.pb_revop = QPushButton(self.groupBox) - self.pb_revop.setObjectName(u"pb_revop") - - self.gridLayout_3.addWidget(self.pb_revop, 2, 1, 1, 1) - - self.pb_extrdop = QPushButton(self.groupBox) - self.pb_extrdop.setObjectName(u"pb_extrdop") - - self.gridLayout_3.addWidget(self.pb_extrdop, 0, 0, 1, 1) - - self.pb_arrayop = QPushButton(self.groupBox) - self.pb_arrayop.setObjectName(u"pb_arrayop") - - self.gridLayout_3.addWidget(self.pb_arrayop, 2, 0, 1, 1) - - self.pb_cutop = QPushButton(self.groupBox) - self.pb_cutop.setObjectName(u"pb_cutop") - - self.gridLayout_3.addWidget(self.pb_cutop, 0, 1, 1, 1) - - self.pb_combop = QPushButton(self.groupBox) - self.pb_combop.setObjectName(u"pb_combop") - - self.gridLayout_3.addWidget(self.pb_combop, 1, 0, 1, 1) - - self.pb_moveop = QPushButton(self.groupBox) - self.pb_moveop.setObjectName(u"pb_moveop") - - self.gridLayout_3.addWidget(self.pb_moveop, 1, 1, 1, 1) - - - self.gridLayout.addWidget(self.groupBox, 0, 5, 10, 1, Qt.AlignTop) - - self.groupBox_4 = QGroupBox(self.centralwidget) - self.groupBox_4.setObjectName(u"groupBox_4") - self.verticalLayout_2 = QVBoxLayout(self.groupBox_4) - self.verticalLayout_2.setObjectName(u"verticalLayout_2") - self.pushButton_2 = QPushButton(self.groupBox_4) - self.pushButton_2.setObjectName(u"pushButton_2") - - self.verticalLayout_2.addWidget(self.pushButton_2) - - - self.gridLayout.addWidget(self.groupBox_4, 11, 5, 1, 1) - - self.groupBox_5 = QGroupBox(self.centralwidget) - self.groupBox_5.setObjectName(u"groupBox_5") - sizePolicy3 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + self.groupBox_11 = QGroupBox(self.centralwidget) + self.groupBox_11.setObjectName(u"groupBox_11") + sizePolicy3 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Expanding) sizePolicy3.setHorizontalStretch(0) sizePolicy3.setVerticalStretch(0) - sizePolicy3.setHeightForWidth(self.groupBox_5.sizePolicy().hasHeightForWidth()) - self.groupBox_5.setSizePolicy(sizePolicy3) - self.groupBox_5.setMaximumSize(QSize(300, 16777215)) - self.verticalLayout_3 = QVBoxLayout(self.groupBox_5) - self.verticalLayout_3.setObjectName(u"verticalLayout_3") - self.sketch_list = QListWidget(self.groupBox_5) + sizePolicy3.setHeightForWidth(self.groupBox_11.sizePolicy().hasHeightForWidth()) + self.groupBox_11.setSizePolicy(sizePolicy3) + self.groupBox_11.setMaximumSize(QSize(200, 16777215)) + self.verticalLayout_7 = QVBoxLayout(self.groupBox_11) + self.verticalLayout_7.setObjectName(u"verticalLayout_7") + self.verticalLayout_7.setContentsMargins(5, 5, 5, 5) + self.sketch_list = QListWidget(self.groupBox_11) self.sketch_list.setObjectName(u"sketch_list") + sizePolicy4 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + sizePolicy4.setHorizontalStretch(0) + sizePolicy4.setVerticalStretch(0) + sizePolicy4.setHeightForWidth(self.sketch_list.sizePolicy().hasHeightForWidth()) + self.sketch_list.setSizePolicy(sizePolicy4) self.sketch_list.setSelectionRectVisible(True) - self.verticalLayout_3.addWidget(self.sketch_list) + self.verticalLayout_7.addWidget(self.sketch_list) - self.groupBox_6 = QGroupBox(self.groupBox_5) + self.groupBox_6 = QGroupBox(self.groupBox_11) self.groupBox_6.setObjectName(u"groupBox_6") - sizePolicy.setHeightForWidth(self.groupBox_6.sizePolicy().hasHeightForWidth()) - self.groupBox_6.setSizePolicy(sizePolicy) + sizePolicy2.setHeightForWidth(self.groupBox_6.sizePolicy().hasHeightForWidth()) + self.groupBox_6.setSizePolicy(sizePolicy2) self.gridLayout_6 = QGridLayout(self.groupBox_6) self.gridLayout_6.setObjectName(u"gridLayout_6") self.gridLayout_6.setContentsMargins(2, 2, 2, 2) - self.pb_del_sketch = QPushButton(self.groupBox_6) - self.pb_del_sketch.setObjectName(u"pb_del_sketch") + self.pb_edt_sktch = QPushButton(self.groupBox_6) + self.pb_edt_sktch.setObjectName(u"pb_edt_sktch") - self.gridLayout_6.addWidget(self.pb_del_sketch, 0, 2, 1, 1) + self.gridLayout_6.addWidget(self.pb_edt_sktch, 1, 1, 1, 1) self.pb_nw_sktch = QPushButton(self.groupBox_6) self.pb_nw_sktch.setObjectName(u"pb_nw_sktch") - self.gridLayout_6.addWidget(self.pb_nw_sktch, 0, 0, 1, 1) + self.gridLayout_6.addWidget(self.pb_nw_sktch, 1, 0, 1, 1) - self.pb_edt_sktch = QPushButton(self.groupBox_6) - self.pb_edt_sktch.setObjectName(u"pb_edt_sktch") + self.pb_del_sketch = QPushButton(self.groupBox_6) + self.pb_del_sketch.setObjectName(u"pb_del_sketch") - self.gridLayout_6.addWidget(self.pb_edt_sktch, 0, 1, 1, 1) + self.gridLayout_6.addWidget(self.pb_del_sketch, 1, 2, 1, 1) - self.verticalLayout_3.addWidget(self.groupBox_6) + self.verticalLayout_7.addWidget(self.groupBox_6) - self.body_list = QListWidget(self.groupBox_5) + + self.gridLayout.addWidget(self.groupBox_11, 5, 0, 2, 1) + + self.groupBox_10 = QGroupBox(self.centralwidget) + self.groupBox_10.setObjectName(u"groupBox_10") + sizePolicy3.setHeightForWidth(self.groupBox_10.sizePolicy().hasHeightForWidth()) + self.groupBox_10.setSizePolicy(sizePolicy3) + self.groupBox_10.setMaximumSize(QSize(200, 16777215)) + self.verticalLayout_6 = QVBoxLayout(self.groupBox_10) + self.verticalLayout_6.setObjectName(u"verticalLayout_6") + self.verticalLayout_6.setContentsMargins(5, 5, 5, 5) + self.body_list = QListWidget(self.groupBox_10) self.body_list.setObjectName(u"body_list") self.body_list.setSelectionRectVisible(True) - self.verticalLayout_3.addWidget(self.body_list) + self.verticalLayout_6.addWidget(self.body_list) - self.groupBox_8 = QGroupBox(self.groupBox_5) + self.groupBox_8 = QGroupBox(self.groupBox_10) self.groupBox_8.setObjectName(u"groupBox_8") - sizePolicy.setHeightForWidth(self.groupBox_8.sizePolicy().hasHeightForWidth()) - self.groupBox_8.setSizePolicy(sizePolicy) + sizePolicy2.setHeightForWidth(self.groupBox_8.sizePolicy().hasHeightForWidth()) + self.groupBox_8.setSizePolicy(sizePolicy2) + self.groupBox_8.setMaximumSize(QSize(200, 16777215)) self.gridLayout_8 = QGridLayout(self.groupBox_8) self.gridLayout_8.setObjectName(u"gridLayout_8") self.gridLayout_8.setContentsMargins(2, 2, 2, 2) @@ -358,20 +383,15 @@ class Ui_fluencyCAD(object): self.gridLayout_8.addWidget(self.pb_edt_sktch_3, 0, 1, 1, 1) - self.verticalLayout_3.addWidget(self.groupBox_8) + self.verticalLayout_6.addWidget(self.groupBox_8) - self.gridLayout.addWidget(self.groupBox_5, 0, 3, 12, 1) - - self.timeline_box = QGroupBox(self.centralwidget) - self.timeline_box.setObjectName(u"timeline_box") - - self.gridLayout.addWidget(self.timeline_box, 12, 2, 1, 3) + self.gridLayout.addWidget(self.groupBox_10, 5, 4, 2, 1) fluencyCAD.setCentralWidget(self.centralwidget) self.menubar = QMenuBar(fluencyCAD) self.menubar.setObjectName(u"menubar") - self.menubar.setGeometry(QRect(0, 0, 2214, 24)) + self.menubar.setGeometry(QRect(0, 0, 2192, 24)) self.menuFile = QMenu(self.menubar) self.menuFile.setObjectName(u"menuFile") self.menuSettings = QMenu(self.menubar) @@ -401,6 +421,24 @@ class Ui_fluencyCAD(object): self.actionNew_Project.setText(QCoreApplication.translate("fluencyCAD", u"New", None)) self.actionLoad_Project.setText(QCoreApplication.translate("fluencyCAD", u"Load", None)) self.actionRecent.setText(QCoreApplication.translate("fluencyCAD", u"Recent", None)) + self.gl_box.setTitle(QCoreApplication.translate("fluencyCAD", u"Model Viewer", None)) + self.groupBox_4.setTitle(QCoreApplication.translate("fluencyCAD", u"Export", None)) + self.pushButton_2.setText(QCoreApplication.translate("fluencyCAD", u"STL", None)) + self.InputTab.setTabText(self.InputTab.indexOf(self.sketch_tab), QCoreApplication.translate("fluencyCAD", u"Sketch", None)) + self.groupBox_7.setTitle(QCoreApplication.translate("fluencyCAD", u"Executive", None)) + self.pushButton_5.setText(QCoreApplication.translate("fluencyCAD", u"Load Code", None)) + self.pushButton_4.setText(QCoreApplication.translate("fluencyCAD", u"Save code", None)) + self.pb_apply_code.setText(QCoreApplication.translate("fluencyCAD", u"Apply Code", None)) + self.pushButton.setText(QCoreApplication.translate("fluencyCAD", u"Delete Code", None)) + self.InputTab.setTabText(self.InputTab.indexOf(self.code_tab), QCoreApplication.translate("fluencyCAD", u"Code", None)) + self.timeline_box.setTitle(QCoreApplication.translate("fluencyCAD", u"Timeline", None)) + self.groupBox.setTitle(QCoreApplication.translate("fluencyCAD", u"Modify", None)) + self.pb_revop.setText(QCoreApplication.translate("fluencyCAD", u"Rev", None)) + self.pb_extrdop.setText(QCoreApplication.translate("fluencyCAD", u"Extrd", None)) + self.pb_arrayop.setText(QCoreApplication.translate("fluencyCAD", u"Arry", None)) + self.pb_cutop.setText(QCoreApplication.translate("fluencyCAD", u"Cut", None)) + self.pb_combop.setText(QCoreApplication.translate("fluencyCAD", u"Comb", None)) + self.pb_moveop.setText(QCoreApplication.translate("fluencyCAD", u"Mve", None)) self.groupBox_9.setTitle(QCoreApplication.translate("fluencyCAD", u"Workplanes", None)) #if QT_CONFIG(tooltip) self.pb_origin_wp.setToolTip(QCoreApplication.translate("fluencyCAD", u"orking Plane at 0, 0, 0", None)) @@ -429,6 +467,17 @@ class Ui_fluencyCAD(object): self.pb_move_wp.setText(QCoreApplication.translate("fluencyCAD", u"WP Mve", None)) #if QT_CONFIG(shortcut) self.pb_move_wp.setShortcut(QCoreApplication.translate("fluencyCAD", u"M", None)) +#endif // QT_CONFIG(shortcut) + self.groupBox_2.setTitle(QCoreApplication.translate("fluencyCAD", u"Drawing", None)) + self.pb_rectool.setText(QCoreApplication.translate("fluencyCAD", u"Rctgl", None)) + self.pb_circtool.setText(QCoreApplication.translate("fluencyCAD", u"Circle", None)) + self.pb_slotool.setText(QCoreApplication.translate("fluencyCAD", u"Slot", None)) +#if QT_CONFIG(statustip) + self.pb_linetool.setStatusTip(QCoreApplication.translate("fluencyCAD", u"Line >SS 0 0 - 2214 - 803 + 2192 + 957 @@ -15,8 +15,180 @@ - + + + + + 0 + 4 + + + + + 12 + + + + Model Viewer + + + + -1 + + + 12 + + + + + + + + Export + + + + + + STL + + + + + + + + + + + 0 + 0 + + + + 0 + + + + Sketch + + + + + + Code + + + + + + + + + Executive + + + + + + Load Code + + + + + + + Save code + + + + + + + Apply Code + + + + + + + Delete Code + + + + + + + + + + + + + + Timeline + + + + + + + Modify + + + + + + Rev + + + + + + + Extrd + + + + + + + Arry + + + + + + + Cut + + + + + + + Comb + + + + + + + Mve + + + + + + + + + + 200 + 16777215 + + Workplanes @@ -76,6 +248,85 @@ + + + + + 0 + 0 + + + + + 200 + 16777215 + + + + Drawing + + + + + + Rctgl + + + true + + + false + + + + + + + Circle + + + true + + + false + + + + + + + Slot + + + true + + + false + + + + + + + Line >S<egment + + + Line + + + S + + + true + + + false + + + + + + @@ -86,7 +337,7 @@ - 16777214 + 200 16777213 @@ -219,258 +470,44 @@ - - + + - - 0 - 0 - - - - Drawing - - - - - - Rctgl - - - true - - - false - - - - - - - Circle - - - true - - - false - - - - - - - Slot - - - true - - - false - - - - - - - Line >S<egment - - - Line - - - S - - - true - - - false - - - - - - - - - - - 0 - 4 - - - - - 12 - - - - Model Viewer - - - - -1 - - - 12 - - - - - - - - - 0 - 0 - - - - 0 - - - - Sketch - - - - - - Code - - - - - - - - - Executive - - - - - - Load Code - - - - - - - Save code - - - - - - - Apply Code - - - - - - - Delete Code - - - - - - - - - - - - - - Modify - - - - - - Rev - - - - - - - Extrd - - - - - - - Arry - - - - - - - Cut - - - - - - - Comb - - - - - - - Mve - - - - - - - - - - Export - - - - - - STL - - - - - - - - - - + 0 0 - 300 + 200 16777215 Sketch - + + + 5 + + + 5 + + + 5 + + + 5 + + + + 0 + 0 + + true @@ -500,30 +537,63 @@ 2 - - - - Del sketch - - - - - - - Add Sktch - - - - + - Edt Sktch + Edt + + + + + + + Add + + + + + + + Del + + + + + + + + 0 + 0 + + + + + 200 + 16777215 + + + + Bodys / Operations + + + + 5 + + + 5 + + + 5 + + + 5 + @@ -539,6 +609,12 @@ 0 + + + 200 + 16777215 + + Tools @@ -558,14 +634,14 @@ - Del Bdy + Del - Bdy Upd + Upd @@ -582,13 +658,6 @@ - - - - Timeline - - - @@ -596,7 +665,7 @@ 0 0 - 2214 + 2192 24