Inclusão do Nó de Carga. Criação dos novos Dialogs para Linha e Religador. Dialog do religador armazena as informações inseridas e repassa ao XML em CIM.

Author: matcvieira

graphics.py

@@ -7,7 +7,8 @@
 from rede import Chave
 # import models
 
-from DialogReligador import RecloserDialog
+from DialogRecloser import RecloserDialog
+from DialogLine import LineDialog
 
 
 class GhostR(QtGui.QGraphicsRectItem):
@@ -84,6 +85,8 @@ def __init__(self, w1, w2, edge_menu, parent=None, scene=None):
 
         self.myEdgeMenu = edge_menu
 
+
+
         line = QtCore.QLineF(self.w1.pos(), self.w2.pos())
         self.setLine(line)
         self.setZValue(-1)
@@ -183,7 +186,7 @@ def update_ret(self):
 
 
         self.GhostRet.setRect(xbase + 40, ybase + (delta_y / 2) - 5, comp, 50)
-        if self.w1.myItemType == 4 or self.w2.myItemType == 4:
+        if self.w1.myItemType == Node.NoConectivo or self.w2.myItemType == Node.NoConectivo:
             self.GhostRet.setRect(xbase + 40, ybase + (delta_y / 2) - 5, comp, 50)
         if self.isFixed:
             self.GhostRet.adjust(-20, -20, -20, -20)
@@ -197,12 +200,12 @@ def update_ret(self):
                 QtGui.QTransform().translate(x, y).rotate(-angle).translate(
                     -x, -y))
         # if self.GhostRetItem.collidesWithItem(self.w1):
-        #     if self.w1.myItemType == 4:
+        #     if self.w1.myItemType == Node.NoConectivo:
         #         print "bateu no nó"
         #         self.GhostRetItem.setRect(self.GhostRetItem.rect().adjusted(-10,-10,-10,-10))
 
         # if self.GhostRetItem.collidesWithItem(self.w2):
-        #     if self.w2.myItemType == 4:
+        #     if self.w2.myItemType == Node.NoConectivo:
         #         print "bateu no nó"
         #         self.GhostRetItem.setRect(self.GhostRetItem.rect().adjusted(-10,-10,-10,-10))
 
@@ -412,7 +415,7 @@ class Node(QtGui.QGraphicsRectItem):
        Classe que implementa o objeto Node Genérico.
     '''
     # tipos de itens possiveis
-    Subestacao, Religador, Barra, Agent, NoConectivo = range(5)
+    Subestacao, Religador, Barra, Agent, NoDeCarga, NoConectivo = range(6)
 
     def __init__(self, item_type, node_menu, parent=None, scene=None):
         '''
@@ -440,7 +443,7 @@ def __init__(self, item_type, node_menu, parent=None, scene=None):
         elif self.myItemType == self.Religador:
             rect = QtCore.QRectF(0, 0, 40.0, 40.0)
             # Cria o objeto abstrato chave referente ao religador
-            self.chave = Chave('religador1', 400, 0.01, 1000, 3)
+            self.chave = Chave(str(self.id))
             # definine e ajusta a posicao do label do item grafico
             self.text = Text('Religador', self, self.scene())
             self.text.setPos(self.mapFromItem(self.text, 0, rect.height()))
@@ -460,6 +463,11 @@ def __init__(self, item_type, node_menu, parent=None, scene=None):
         elif self.myItemType == self.NoConectivo:
             rect = QtCore.QRectF(0, 0, 7, 7)
 
+        elif self.myItemType == self.NoDeCarga:
+            rect = QtCore.QRectF(0, 0, 10, 10)
+            self.text = Text('Carga', self, self.scene())
+            self.text.setPos(self.mapFromItem(self.text, 0, rect.height()))
+
         self.setRect(rect)
         self.myNodeMenu = node_menu
 
@@ -569,6 +577,11 @@ def paint(self, painter, option, widget):
             painter.setBrush(QtCore.Qt.black)
             painter.drawEllipse(self.rect())
 
+        elif self.myItemType == self.NoDeCarga:
+            painter.setPen(QtGui.QPen(QtCore.Qt.black, 1.5))
+            painter.setBrush(QtCore.Qt.black)
+            painter.drawEllipse(self.rect())
+
         if self.isSelected():
             painter.setPen(QtGui.QPen(QtCore.Qt.red, 2, QtCore.Qt.DashLine))
             painter.setBrush(QtCore.Qt.NoBrush)
@@ -586,7 +599,7 @@ def itemChange(self, change, value):
         return QtGui.QGraphicsItem.itemChange(self, change, value)
 
     def mousePressEvent(self, mouse_event):
-        print len(self.edges)
+        print "Id:", self.chave.nome, ",", "Corrente Nominal:", self.chave.ratedCurrent, ",", "Breaking Capacity:", self.chave.breakingCapacity, ",", "Seq de Religamento", self.chave.recloseSequences
         self.setSelected(True)
         super(Node, self).mousePressEvent(mouse_event)
         return
@@ -603,7 +616,7 @@ def mouseReleaseEvent(self, mouse_event):
                 new_obj = edge.w2
             if edge.w2 == self:
                 new_obj = edge.w1
-        if self.myItemType == 4:
+        if self.myItemType == Node.NoConectivo:
             for item in self.scene().items():
                 if isinstance(item, Node):
 
@@ -680,13 +693,14 @@ def mousePressEvent(self, mouse_event):
         else:
             self.removeItem(item_oculto)
         if self.myMode == self.InsertItem:
-
             if self.myItemType == Node.Religador:
                 item = Node(self.myItemType, self.myRecloserMenu)
             elif self.myItemType == Node.Barra:
                 item = Node(self.myItemType, self.myBusMenu)
             elif self.myItemType == Node.Subestacao:
                 item = Node(self.myItemType, self.mySubstationMenu)
+            elif self.myItemType == Node.NoDeCarga:
+                item = Node(self.myItemType, self.mySubstationMenu)
 
             self.addItem(item)
             item.setPos(mouse_event.scenePos())
@@ -705,7 +719,7 @@ def mousePressEvent(self, mouse_event):
 
                         c_pos = (
                             item.edge.line().p1() + item.edge.line().p2()) / 2
-                        self.no = Node(4, self.myLineMenu)
+                        self.no = Node(Node.NoConectivo, self.myLineMenu)
                         self.addItem(self.no)
                         self.no.setPos(c_pos - QtCore.QPointF(3.5, 3.5))
                         item.no = self.no
@@ -718,7 +732,7 @@ def mousePressEvent(self, mouse_event):
                 self.l0 = c_pos
             else:
                 self.l0 = mouse_event.scenePos()
-                self.no = Node(4, self.myLineMenu)
+                self.no = Node(Node.NoConectivo, self.myLineMenu)
                 if add is True:
                     self.addItem(self.no)
                 self.no.setPos(mouse_event.scenePos())
@@ -813,13 +827,13 @@ def mouseReleaseEvent(self, mouse_event):
             if len(start_items) == 0:
                 if isinstance(start_pop, GhostR) and start_pop is not None:
                     c_pos = (start_pop.edge.line().p1() + start_pop.edge.line().p2()) / 2
-                    start_item = Node(4, self.myLineMenu)
+                    start_item = Node(Node.NoConectivo, self.myLineMenu)
                     self.addItem(start_item)
                     start_item.setPos(c_pos)
                     self.start_item_is_ghost = True
                 else:
                     print "checkpoint 1"
-                    start_item = Node(4, self.myLineMenu)
+                    start_item = Node(Node.NoConectivo, self.myLineMenu)
                     self.addItem(start_item)
                     start_item.setPos(self.pressPos)
 
@@ -839,14 +853,14 @@ def mouseReleaseEvent(self, mouse_event):
 
 
             if len(end_items) == 0:
-                end_item = Node(4, self.myLineMenu)
+                end_item = Node(Node.NoConectivo, self.myLineMenu)
                 self.addItem(end_item)
                 end_item.setPos(mouse_event.scenePos())
 
             if len(end_items):
                 if isinstance(end_pop, GhostR):
                     c_pos = (end_pop.edge.line().p1() + end_pop.edge.line().p2()) / 2
-                    end_item = Node(4, self.myLineMenu)
+                    end_item = Node(Node.NoConectivo, self.myLineMenu)
                     self.addItem(end_item)
                     end_item.setPos(c_pos)
                     self.ghost = end_pop
@@ -914,11 +928,11 @@ def mouseReleaseEvent(self, mouse_event):
                 if not permit1:
                     print "permit 1 negado!"
                     if isinstance(start_item, Node):
-                        if start_item.myItemType == 4 and len(start_item.edges) == 0:
+                        if start_item.myItemType == Node.NoConectivo and len(start_item.edges) == 0:
                             self.removeItem(start_item)
                             print "checkpoint 1"
                     if isinstance(end_item, Node):
-                        if end_item.myItemType == 4 and len(end_item.edges) == 0:
+                        if end_item.myItemType == Node.NoConectivo and len(end_item.edges) == 0:
                             self.removeItem(end_item)
                             print "checkpoint 2"
 
@@ -958,7 +972,7 @@ def mouseReleaseEvent(self, mouse_event):
             else:
                 return
 
-            if edge.w1.myItemType == 4:
+            if edge.w1.myItemType == Node.NoConectivo:
                 aux = edge.w1
                 edge.w1 = edge.w2
                 edge.w2 = aux
@@ -994,7 +1008,7 @@ def mouseReleaseEvent(self, mouse_event):
             # if inserted is False and self.no is not None:
             #     self.break_edge()
             #     print "oi 1"
-            #     new_node = Node(4, self.myLineMenu)
+            #     new_node = Node(Node.NoConectivo, self.myLineMenu)
             #     self.addItem(new_node)
             #     new_node.setPos(mouse_event.scenePos())
             #     new_edge = Edge(self.no, new_node, self.myLineMenu)
@@ -1161,7 +1175,52 @@ def launch_dialog(self):
             Este método inicia os diálogos de configuração de cada um dos itens
             gráficos do diagrama.
         '''
-        dialog = RecloserDialog()
+        for item in self.selectedItems():
+            if isinstance(item, Node):
+                if item.myItemType == Node.Religador:
+                    dialog = RecloserDialog(item)
+                    print dialog.dialog.result()
+                    if dialog.dialog.result() == 1:
+                        if dialog.identificaOLineEdit.text() == "":
+                            pass
+                        else:
+                            item.chave.nome = dialog.identificaOLineEdit.text()
+                        if dialog.correnteNominalLineEdit.text() == "":
+                            pass
+                        else:
+                            item.chave.ratedCurrent = dialog.correnteNominalLineEdit.text()
+                        if dialog.capacidadeDeInterrupOLineEdit.text() == "":
+                            pass
+                        else:
+                            item.chave.breakingCapacity = dialog.capacidadeDeInterrupOLineEdit.text()
+                        if dialog.nDeSequNciasDeReligamentoLineEdit.text() == "":
+                            pass
+                        else:
+                            item.chave.recloseSequences = dialog.nDeSequNciasDeReligamentoLineEdit.text()
+                if item.myItemType == Node.Subestacao:
+                    return
+                    # dialog = SubstationDialog(item)
+
+            if isinstance(item, Edge):
+                dialog = LineDialog()
+                print dialog.dialog.result()
+                    # if dialog.dialog.result() == 1:
+                    #     if dialog.identificaOLineEdit.text() == "":
+                    #         pass
+                    #     else:
+                    #         item.chave.nome = dialog.identificaOLineEdit.text()
+                    #     if dialog.correnteNominalLineEdit.text() == "":
+                    #         pass
+                    #     else:
+                    #         item.chave.ratedCurrent = dialog.correnteNominalLineEdit.text()
+                    #     if dialog.capacidadeDeInterrupOLineEdit.text() == "":
+                    #         pass
+                    #     else:
+                    #         item.chave.breakingCapacity = dialog.capacidadeDeInterrupOLineEdit.text()
+                    #     if dialog.nDeSequNciasDeReligamentoLineEdit.text() == "":
+                    #         pass
+                    #     else:
+                    #         item.chave.recloseSequences = dialog.nDeSequNciasDeReligamentoLineEdit.text()
 
     def increase_bus(self, ):
         '''

simulador.py

@@ -127,13 +127,17 @@ def inicializar_componentes(self, main_window):
         self.lineButton = QtGui.QPushButton(self.page_1)
         self.lineButton.setObjectName("lineButton")
         self.lineButton.setCheckable(True)
+        self.noButton = QtGui.QPushButton(self.page_1)
+        self.noButton.setObjectName("noButton")
+        self.noButton.setCheckable(True)
 
         # define o grupo de botoes da pagina 1 do notebook
         self.buttonGroup = QtGui.QButtonGroup()
         self.buttonGroup.addButton(self.substationButton, 0)
         self.buttonGroup.addButton(self.recloserButton, 1)
         self.buttonGroup.addButton(self.busButton, 2)
         self.buttonGroup.addButton(self.lineButton, 3)
+        self.buttonGroup.addButton(self.noButton, 4)
         self.buttonGroup.setExclusive(False)
 
         self.buttonGroup.buttonClicked[int].connect(self.buttonGroupClicked)
@@ -159,6 +163,11 @@ def inicializar_componentes(self, main_window):
         self.lineLabel.setSizePolicy(
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
         self.lineLabel.setObjectName("lineLabel")
+        self.noLabel = QtGui.QLabel('')
+        self.noLabel.setAlignment(QtCore.Qt.AlignHCenter)
+        self.noLabel.setSizePolicy(
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        self.noLabel.setObjectName("noLabel")
 
         # adiciona os botoes ao gridLayout_3
         self.gridlayout_page_1.addWidget(self.substationButton, 0, 0)
@@ -169,6 +178,8 @@ def inicializar_componentes(self, main_window):
         self.gridlayout_page_1.addWidget(self.lineButton, 2, 1)
         self.gridlayout_page_1.addWidget(self.busLabel, 3, 0)
         self.gridlayout_page_1.addWidget(self.lineLabel, 3, 1)
+        self.gridlayout_page_1.addWidget(self.noButton, 4, 0)
+        self.gridlayout_page_1.addWidget(self.noLabel, 5, 0) 
 
         # adiciona o gridLayout_3 a pagina_1 do dockWidget
         self.page_1.setLayout(self.gridlayout_page_1)
@@ -374,6 +385,14 @@ def retranslateUi(self, main_window):
             QtGui.QApplication.translate(
                 "main_window", "Linha", None, QtGui.QApplication.UnicodeUTF8))
 
+        self.noButton.setText(
+            QtGui.QApplication.translate(
+                "main_window", "Nó de Carga", None, QtGui.QApplication.UnicodeUTF8))
+
+        self.noLabel.setText(
+            QtGui.QApplication.translate(
+                "main_window", "Nó de Carga", None, QtGui.QApplication.UnicodeUTF8))
+
         self.toolBox.setItemText(
             self.toolBox.indexOf(self.page_1),
             QtGui.QApplication.translate(