mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
pep8: Some modifications to respect pep8 standard code.
This commit is contained in:
1 parent
8544dd1144
commit
fa2454d079
152 files changed
+1626
-1277
No files matched your search
@@ -115,6 +115,7 @@ class NodeItem(QGraphicsItem):
|
||||
if not self.graph._only_display:
|
||||
super(NodeItem, self).mouseMoveEvent(event)
|
||||
|
||||
|
||||
class EdgeItem(QGraphicsItem):
|
||||
Type = QGraphicsItem.UserType + 2
|
||||
|
||||
@@ -216,6 +217,7 @@ class EdgeItem(QGraphicsItem):
|
||||
painter.drawPolygon(poly)
|
||||
painter.fillPath(path, brush)
|
||||
|
||||
|
||||
class NodeText(QGraphicsTextItem):
|
||||
def __init__(self, node_item):
|
||||
super(NodeText, self).__init__()
|
||||
@@ -228,9 +230,9 @@ class NodeText(QGraphicsTextItem):
|
||||
|
||||
def set_custom_pos(self, pos):
|
||||
x = pos.x()
|
||||
y = pos.y() - 42 # Dont panic! The answer is 42
|
||||
y = pos.y() - 42 # Dont panic! The answer is 42
|
||||
|
||||
self.setPos(QPointF(x,y))
|
||||
self.setPos(QPointF(x, y))
|
||||
|
||||
@timer
|
||||
def paint(self, painter, option, widget):
|
||||
@@ -248,6 +250,7 @@ class NodeText(QGraphicsTextItem):
|
||||
# Update the node text
|
||||
self.setPlainText(self.item.node.name)
|
||||
|
||||
|
||||
class NewEdgeLine(QGraphicsItem):
|
||||
def __init__(self, src, dest):
|
||||
super(NewEdgeLine, self).__init__()
|
||||
@@ -278,13 +281,14 @@ class NewEdgeLine(QGraphicsItem):
|
||||
Qt.RoundJoin))
|
||||
painter.drawLine(line)
|
||||
|
||||
|
||||
class GraphWidget(QGraphicsView):
|
||||
changeEdge = pyqtSignal(object)
|
||||
changeNode = pyqtSignal(object)
|
||||
|
||||
def __init__(self, graph, parent=None,
|
||||
min_size=(400, 400), max_size=None,
|
||||
size=None, only_display=False, undo = None):
|
||||
size=None, only_display=False, undo=None):
|
||||
super(GraphWidget, self).__init__(parent=parent)
|
||||
|
||||
self.timerId = 0
|
||||
@@ -522,7 +526,6 @@ class GraphWidget(QGraphicsView):
|
||||
self.changeNode.emit(self.sender())
|
||||
self.changeEdge.emit(self.sender())
|
||||
|
||||
|
||||
def update_edges(self, node):
|
||||
"""Update display of all edges linked with the node
|
||||
|
||||
@@ -791,7 +794,7 @@ class GraphWidget(QGraphicsView):
|
||||
if self._state == "move":
|
||||
# Move on scene
|
||||
if (not self.selected_item() and
|
||||
event.buttons() & Qt.LeftButton):
|
||||
event.buttons() & Qt.LeftButton):
|
||||
old_p = self.mapToScene(self.m_origin_x, self.m_origin_y)
|
||||
new_p = self.mapToScene(event.pos())
|
||||
translation = new_p - old_p
|
||||
@@ -805,7 +808,6 @@ class GraphWidget(QGraphicsView):
|
||||
self.update()
|
||||
super(GraphWidget, self).mouseMoveEvent(event)
|
||||
|
||||
|
||||
# Contextual menu
|
||||
|
||||
def _menu_default(self, event, pos, items, menu):
|
||||
@@ -835,7 +837,8 @@ class GraphWidget(QGraphicsView):
|
||||
enable = menu.addAction(_translate("Network", "Enable the reach"))
|
||||
is_enable = False
|
||||
|
||||
reverse = menu.addAction(_translate("Network", "Reverse the reach orientation"))
|
||||
reverse = menu.addAction(_translate(
|
||||
"Network", "Reverse the reach orientation"))
|
||||
|
||||
action = menu.exec_(self.mapToGlobal(event.pos()))
|
||||
|
||||
|
||||
@@ -69,6 +69,7 @@ class ComboBoxDelegate(QItemDelegate):
|
||||
def currentItemChanged(self):
|
||||
self.commitData.emit(self.sender())
|
||||
|
||||
|
||||
class NodeTableModel(PamhyrTableModel):
|
||||
def _setup_lst(self):
|
||||
self._lst = self._data.nodes()
|
||||
@@ -120,6 +121,7 @@ class NodeTableModel(PamhyrTableModel):
|
||||
self._lst = self._data.nodes()
|
||||
self.layoutChanged.emit()
|
||||
|
||||
|
||||
class EdgeTableModel(PamhyrTableModel):
|
||||
def _setup_lst(self):
|
||||
self._lst = self._data.edges()
|
||||
@@ -140,7 +142,7 @@ class EdgeTableModel(PamhyrTableModel):
|
||||
|
||||
try:
|
||||
if (self._headers[index.column()] == "node1" or
|
||||
self._headers[index.column()] == "node2"):
|
||||
self._headers[index.column()] == "node2"):
|
||||
node = self.graph.node(value)
|
||||
self._undo.push(
|
||||
SetNodeCommand(
|
||||
|
||||
@@ -31,6 +31,7 @@ from Model.Network.Node import Node
|
||||
from Model.Network.Edge import Edge
|
||||
from Model.Network.Graph import Graph
|
||||
|
||||
|
||||
class AddNodeCommand(QUndoCommand):
|
||||
def __init__(self, graph, node):
|
||||
QUndoCommand.__init__(self)
|
||||
@@ -44,6 +45,7 @@ class AddNodeCommand(QUndoCommand):
|
||||
def redo(self):
|
||||
self._graph.insert_node(self._node)
|
||||
|
||||
|
||||
class SetNodePosCommand(QUndoCommand):
|
||||
def __init__(self, node, new, old):
|
||||
QUndoCommand.__init__(self)
|
||||
@@ -58,6 +60,7 @@ class SetNodePosCommand(QUndoCommand):
|
||||
def redo(self):
|
||||
self._node.node.setPos(self._new[0], self._new[1])
|
||||
|
||||
|
||||
class DelNodeCommand(QUndoCommand):
|
||||
def __init__(self, graph, node):
|
||||
QUndoCommand.__init__(self)
|
||||
@@ -86,6 +89,7 @@ class DelNodeCommand(QUndoCommand):
|
||||
|
||||
self._graph.remove_node(self._node.name)
|
||||
|
||||
|
||||
class AddEdgeCommand(QUndoCommand):
|
||||
def __init__(self, graph, edge):
|
||||
QUndoCommand.__init__(self)
|
||||
@@ -99,6 +103,7 @@ class AddEdgeCommand(QUndoCommand):
|
||||
def redo(self):
|
||||
self._graph.insert_edge(self._edge)
|
||||
|
||||
|
||||
class DelEdgeCommand(QUndoCommand):
|
||||
def __init__(self, graph, edge):
|
||||
QUndoCommand.__init__(self)
|
||||
@@ -144,6 +149,7 @@ class SetNodeCommand(QUndoCommand):
|
||||
def redo(self):
|
||||
self._el[self._column] = self._new
|
||||
|
||||
|
||||
class EnableEdgeCommand(QUndoCommand):
|
||||
def __init__(self, edge, enable):
|
||||
QUndoCommand.__init__(self)
|
||||
@@ -153,10 +159,11 @@ class EnableEdgeCommand(QUndoCommand):
|
||||
self._enable = enable
|
||||
|
||||
def undo(self):
|
||||
self._edge.enable(enable = self._old)
|
||||
self._edge.enable(enable=self._old)
|
||||
|
||||
def redo(self):
|
||||
self._edge.enable(enable = self._enable)
|
||||
self._edge.enable(enable=self._enable)
|
||||
|
||||
|
||||
class ReverseEdgeCommand(QUndoCommand):
|
||||
def __init__(self, edge):
|
||||
|
||||
+22
-21
@@ -57,11 +57,11 @@ class NetworkWindow(PamhyrWindow):
|
||||
|
||||
def __init__(self, study=None, config=None, parent=None):
|
||||
super(NetworkWindow, self).__init__(
|
||||
title = self._pamhyr_name + " - " + study.name,
|
||||
study = study,
|
||||
config = config,
|
||||
trad = NetworkTranslate(),
|
||||
options = ['undo'],
|
||||
title=self._pamhyr_name + " - " + study.name,
|
||||
study=study,
|
||||
config=config,
|
||||
trad=NetworkTranslate(),
|
||||
options=['undo'],
|
||||
parent=parent,
|
||||
)
|
||||
|
||||
@@ -77,11 +77,11 @@ class NetworkWindow(PamhyrWindow):
|
||||
# Nodes table
|
||||
table = self.find(QTableView, "tableView_nodes")
|
||||
self._nodes_model = NodeTableModel(
|
||||
table_view = table,
|
||||
table_headers = self._table_headers_node,
|
||||
editable_headers = ["name"],
|
||||
data = self._graph,
|
||||
undo = self._undo_stack,
|
||||
table_view=table,
|
||||
table_headers=self._table_headers_node,
|
||||
editable_headers=["name"],
|
||||
data=self._graph,
|
||||
undo=self._undo_stack,
|
||||
)
|
||||
table.setModel(self._nodes_model)
|
||||
|
||||
@@ -91,30 +91,30 @@ class NetworkWindow(PamhyrWindow):
|
||||
# Edges table
|
||||
table = self.find(QTableView, "tableView_reachs")
|
||||
self.delegate_combobox = ComboBoxDelegate(
|
||||
graph = self._graph,
|
||||
parent = self,
|
||||
graph=self._graph,
|
||||
parent=self,
|
||||
)
|
||||
|
||||
self._reachs_model = EdgeTableModel(
|
||||
table_view = table,
|
||||
table_headers = self._table_headers_edge,
|
||||
editable_headers = ["name", "node1", "node2"],
|
||||
delegates = {
|
||||
table_view=table,
|
||||
table_headers=self._table_headers_edge,
|
||||
editable_headers=["name", "node1", "node2"],
|
||||
delegates={
|
||||
"node1": self.delegate_combobox,
|
||||
"node2": self.delegate_combobox,
|
||||
},
|
||||
data = self._graph,
|
||||
undo = self._undo_stack,
|
||||
data=self._graph,
|
||||
undo=self._undo_stack,
|
||||
)
|
||||
table.setModel(self._reachs_model)
|
||||
table.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||
table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
|
||||
#table.resizeColumnsToContents()
|
||||
# table.resizeColumnsToContents()
|
||||
|
||||
def setup_graph(self):
|
||||
self._graph_widget = GraphWidget(
|
||||
self._graph, parent=self,
|
||||
undo = self._undo_stack
|
||||
undo=self._undo_stack
|
||||
)
|
||||
self._graph_layout = self.find(QHBoxLayout, "horizontalLayout_graph")
|
||||
self._graph_layout.addWidget(self._graph_widget)
|
||||
@@ -122,7 +122,8 @@ class NetworkWindow(PamhyrWindow):
|
||||
def setup_connections(self):
|
||||
self._nodes_model.dataChanged.connect(self._reachs_model.update)
|
||||
self._nodes_model.dataChanged.connect(self._graph_widget.rename_nodes)
|
||||
self._reachs_model.dataChanged.connect(self._graph_widget.display_update)
|
||||
self._reachs_model.dataChanged.connect(
|
||||
self._graph_widget.display_update)
|
||||
self._reachs_model.dataChanged.connect(self._nodes_model.update)
|
||||
self._graph_widget.changeEdge.connect(self._reachs_model.update)
|
||||
self._graph_widget.changeNode.connect(self._nodes_model.update)
|
||||
|
||||
@@ -22,6 +22,7 @@ from View.Tools.PamhyrTranslate import PamhyrTranslate
|
||||
|
||||
_translate = QCoreApplication.translate
|
||||
|
||||
|
||||
class NetworkTranslate(PamhyrTranslate):
|
||||
def __init__(self):
|
||||
super(NetworkTranslate, self).__init__()
|
||||
|
||||
Reference in new issue
Block a user