diff --git a/src/View/Geometry/GeometryWindow.py b/src/View/Geometry/GeometryWindow.py index ef2a3e5e6e6194f79ef4084c4e5491e346ad3552..9d63ec42d040c3007b8ada8b9d5039ab41d568a0 100644 --- a/src/View/Geometry/GeometryWindow.py +++ b/src/View/Geometry/GeometryWindow.py @@ -91,7 +91,7 @@ class GeometryWindow(QMainWindow, WindowToolKit): self.ui.btn_delete.clicked.connect(self.delete_row) self.ui.btn_edit.clicked.connect(self.edit_profile) self.ui.verticalSlider.valueChanged.connect(self.changed_slider_value) - # self.tableView.selectionModel().selectionChanged.connect(self.changed_slider_value_2) + self.ui.btn_slider_up.clicked.connect(self.decrement_value_slider) self.ui.btn_slider_down.clicked.connect(self.increment_value_slider) self.ui.btn_move_up.clicked.connect(self.changed_profile_slot) @@ -104,16 +104,6 @@ class GeometryWindow(QMainWindow, WindowToolKit): .selectionChanged\ .connect(self.select_current_profile) - # Update plot when profile data change - # self._tablemodel.dataChanged.connect(self.update_plot_xy) - # self._tablemodel.dataChanged.connect(self.update_plot_kpc) - # self.tableView.selectionModel()\ - # .selectionChanged\ - # .connect(self.update_plot_xy) - # self.tableView.selectionModel()\ - # .selectionChanged\ - # .connect(self.update_plot_kpc) - def open_file_dialog(self): options = QFileDialog.Options() DEFAULT_DIRECTORY = os.getenv("HOME") diff --git a/src/View/Geometry/mainwindow_ui_reach.py b/src/View/Geometry/mainwindow_ui_reach.py index cf5d7ec3c3503370d37066e8b8655b8a85fbabc5..31e1ce9e79f471b0870335cbb04ab2877ddd6c23 100644 --- a/src/View/Geometry/mainwindow_ui_reach.py +++ b/src/View/Geometry/mainwindow_ui_reach.py @@ -38,18 +38,7 @@ class Ui_MainWindow(object): self.label_section_order = QtWidgets.QLabel(self.widget) self.label_section_order.setLayoutDirection(Qt.LeftToRight) self.label_section_order.setObjectName("label_section_order") - # self.label_section_order.setStyleSheet( - # "QLabel{ border: 1px solid darkGray;\n" - # " gridline-color: gray;\n" - # " border-radius: 1px;\n" - # " border-style: solid;\n" - # " background-color: ; \n" - # " selection-background-color: #218ede;\n" - # " font-size: 12px;\n" - # " font-family: Helvetica\n" - # "\n" - # " }" - # ) + self.verticalLayout.addWidget(self.label_section_order) btn_size = QSize(30, 30) self.btn_open = QtWidgets.QPushButton(self.widget) @@ -177,28 +166,18 @@ class Ui_MainWindow(object): self.btn_end_editing.setIconSize(btn_size) self.horizontalLayout.addWidget(self.btn_end_editing) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem = QtWidgets.QSpacerItem( + 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum + ) self.horizontalLayout.addItem(spacerItem) self.verticalLayout.addLayout(self.horizontalLayout) self.tableView = QtWidgets.QTableView(self.widget) self.tableView.setObjectName("tableView") self.verticalLayout.addWidget(self.tableView) - self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows) # permet de sélectionner une ligne entière - self.tableView.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch) # ajuster la largeur du tableau - self.tableView.setAlternatingRowColors(True) # colorie une ligne sur 2 - self.tableView.verticalHeader().hide() # hide vertical/row headers - # self.tableView.setStyleSheet( - # " QTableView { border: 1px solid black;\n" - # " gridline-color: blue;\n" - # " border-radius: 2px;\n" - # " border-style: solid;\n" - # " background-color: #EEF6FC; \n" - # " selection-background-color: #218ede;\n" - # " font-size: 12px;\n" - # " font-family: Helvetica\n" - # "\n" - # " }" - # ) + self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows) + self.tableView.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch) + self.tableView.setAlternatingRowColors(True) + self.tableView.verticalHeader().hide() self.tableView.resizeColumnsToContents() self.tableView.resizeRowsToContents() @@ -225,18 +204,6 @@ class Ui_MainWindow(object): self.toolbar_1 = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT( self.canvas_1, self.centralwidget ) - # self.toolbar_1.setStyleSheet( - # "QToolBar{ border: 1px solid darkGray;\n" - # " gridline-color: blue;\n" - # " border-radius: 4px;\n" - # " border-style: solid;\n" - # " background-color: #EEF6FC; \n" - # " selection-background-color: #218ede;\n" - # " font-size: 12px;\n" - # " font-family: Helvetica\n" - # "\n" - # " }" - # ) self.verticalLayout_canvas_1.addWidget(self.toolbar_1) self.verticalLayout_canvas_1.addWidget(self.canvas_1) @@ -250,19 +217,9 @@ class Ui_MainWindow(object): self.canvas_2 = MplCanvas.MplCanvas(width=5, height=4, dpi=100) self.canvas_2.setObjectName("canvas_2") - self.toolbar_2 = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT(self.canvas_2, self.centralwidget) - # self.toolbar_2.setStyleSheet( - # "QToolBar{ border: 1px solid darkGray;\n" - # " gridline-color: blue;\n" - # " border-radius: 4px;\n" - # " border-style: solid;\n" - # " background-color: #EEF6FC; \n" - # " selection-background-color: #218ede;\n" - # " font-size: 12px;\n" - # " font-family: Helvetica\n" - # "\n" - # " }" - # ) + self.toolbar_2 = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT( + self.canvas_2, self.centralwidget + ) self.verticalLayout_canvas_2.addWidget(self.toolbar_2) self.verticalLayout_canvas_2.addWidget(self.canvas_2) @@ -275,19 +232,9 @@ class Ui_MainWindow(object): self.canvas_3 = MplCanvas.MplCanvas(width=5, height=4, dpi=100) self.canvas_3.setObjectName("canvas_3") - self.toolbar_3 = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT(self.canvas_3, self.centralwidget) - # self.toolbar_3.setStyleSheet( - # "QToolBar{ border: 1px solid darkGray;\n" - # " gridline-color: blue;\n" - # " border-radius: 4px;\n" - # " border-style: solid;\n" - # " background-color: #EEF6FC; \n" - # " selection-background-color: #218ede;\n" - # " font-size: 12px;\n" - # " font-family: Helvetica\n" - # "\n" - # " }" - # ) + self.toolbar_3 = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT( + self.canvas_3, self.centralwidget + ) self.verticalLayout_canvas_3.addWidget(self.toolbar_3) self.verticalLayout_canvas_3.addWidget(self.canvas_3) @@ -322,8 +269,6 @@ class Ui_MainWindow(object): self.gridLayout.addWidget(self.btn_slider_down, 2, 3, 1, 1) self.vertical_slider_label = QtWidgets.QLabel(self.widget1) - # self.vertical_slider_label.setLayoutDirection(Qt.RightToLeft) - # self.vertical_slider_label.setLayoutDirection(Qt.LeftToRight) self.vertical_slider_label.setObjectName("vertical_slider_label") self.gridLayout.addWidget(self.vertical_slider_label, 3, 2, 2, 1) self.vertical_slider_label.setAlignment(Qt.AlignRight)