diff --git a/src/view/ASubWindow.py b/src/view/ASubWindow.py index 002b6fee42dcccb33df838a2cddab7100e7239c5..29ef8c8125d280fc3ad2ae5addd471fb3b394a1e 100644 --- a/src/view/ASubWindow.py +++ b/src/view/ASubWindow.py @@ -167,13 +167,36 @@ class ASubWindow(QDialog): """ return self.find(QSpinBox, name).value() - def set_radio_button(self, name:str, checked:bool): - """Set value of spinbox component + def set_push_button_checkable(self, name:str, checked:bool): + """Set value of push button component Args: - name: The spinbox component name + name: The push button component name value: The new value + Returns: + Nothing + """ + self.find(QPushButton, name).setChecked(checked) + + def get_push_button_checkable(self, name:str): + """Get status of push button + + Args: + name: The push button component name + + Returns: + The status of push button + """ + return self.find(QPushButton, name).isChecked() + + def set_radio_button(self, name:str, checked:bool): + """Set value of radio button component + + Args: + name: The radio button component name + checked: Checked + Returns: Nothing """ diff --git a/src/view/NetworkWindow.py b/src/view/NetworkWindow.py index 3683551594c11bf0096fefb6adba182174fce418..a9065028cd6db28087e9ad73b735119960b5230d 100644 --- a/src/view/NetworkWindow.py +++ b/src/view/NetworkWindow.py @@ -12,6 +12,7 @@ from PyQt5.QtCore import ( from PyQt5.QtWidgets import ( QTableView, QItemDelegate, QComboBox, QLineEdit, QHBoxLayout, QSlider, + QPushButton, ) class LineEditDelegate(QItemDelegate): @@ -172,3 +173,20 @@ class NetworkWindow(ASubWindow): self.nodes_model.dataChanged.connect(self.reachs_model.update) self.reachs_model.dataChanged.connect(self.nodes_model.update) + + self.find(QPushButton, "pushButton_add").clicked.connect( + self.clicked_add + ) + + self.find(QPushButton, "pushButton_del").clicked.connect( + self.clicked_del + ) + + + def clicked_add(self): + if self.get_push_button_checkable("pushButton_add"): + self.set_push_button_checkable("pushButton_del", False) + + def clicked_del(self): + if self.get_push_button_checkable("pushButton_del"): + self.set_push_button_checkable("pushButton_add", False) diff --git a/src/view/network/GraphWidget.py b/src/view/network/GraphWidget.py index a444465fba83f79948cc59355acd5f1068f7852e..a76849827472f196fb5434ac5d9baa7a27813b29 100644 --- a/src/view/network/GraphWidget.py +++ b/src/view/network/GraphWidget.py @@ -75,9 +75,6 @@ class NodeItem(QGraphicsItem): # painter.setPen(QPen(Qt.black, 0)) painter.drawEllipse(-10, -10, 20, 20) - painter.setFont(QFont("Arial", 20)) - painter.drawText(QPoint(-10, -10), self.node.name) - def itemChange(self, change, value): if change == QGraphicsItem.ItemPositionHasChanged: self.graph.itemMoved() diff --git a/src/view/ui/Network.ui b/src/view/ui/Network.ui index 1372ae773cdb6c9b493480dd06ba1e924f57880d..26a24cd9412cbfdf21d112fec05f284585a68d14 100644 --- a/src/view/ui/Network.ui +++ b/src/view/ui/Network.ui @@ -25,7 +25,7 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout_6"> <item> - <widget class="QPushButton" name="pushButton_19"> + <widget class="QPushButton" name="pushButton_add"> <property name="text"> <string/> </property> @@ -48,7 +48,7 @@ </widget> </item> <item> - <widget class="QPushButton" name="pushButton_20"> + <widget class="QPushButton" name="pushButton_del"> <property name="text"> <string/> </property>