git: Rename some directory.
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from model.network.Node import Node
|
||||
from Model.Network.Node import Node
|
||||
|
||||
class Edge(object):
|
||||
def __init__(self, id:str, name:str,
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
from functools import reduce
|
||||
|
||||
from model.network.Node import Node
|
||||
from model.network.Edge import Edge
|
||||
from Model.Network.Node import Node
|
||||
from Model.Network.Edge import Edge
|
||||
|
||||
class Graph(object):
|
||||
def __init__(self):
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from model.network.Point import Point
|
||||
from Model.Network.Point import Point
|
||||
|
||||
class Node(object):
|
||||
def __init__(self, id:str, name:str,
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
import os
|
||||
from datetime import datetime
|
||||
from model.Serializable import Serializable
|
||||
from Model.Serializable import Serializable
|
||||
|
||||
class Study(Serializable):
|
||||
def __init__(self):
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from solver.ASolver import (
|
||||
from Solver.ASolver import (
|
||||
AbstractSolver, STATUS
|
||||
)
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from view.ASubWindow import ASubWindow
|
||||
from View.ASubWindow import ASubWindow
|
||||
|
||||
class AboutWindow(ASubWindow):
|
||||
def __init__(self, title="About", parent=None):
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from solver.Solvers import solver_type_list
|
||||
|
||||
from view.ASubWindow import ASubWindow
|
||||
from solver.GenericSolver import GenericSolver
|
||||
from View.ASubWindow import ASubWindow
|
||||
from Solver.Solvers import solver_type_list
|
||||
from Solver.GenericSolver import GenericSolver
|
||||
|
||||
from PyQt5.QtWidgets import (
|
||||
QPushButton,
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from config import Config
|
||||
from view.ASubWindow import ASubWindow
|
||||
from view.ListedSubWindow import ListedSubWindow
|
||||
from view.ConfigureAddSolverWindow import ConfigureAddSolverWindow
|
||||
from View.ASubWindow import ASubWindow
|
||||
from View.ListedSubWindow import ListedSubWindow
|
||||
from View.ConfigureAddSolverWindow import ConfigureAddSolverWindow
|
||||
|
||||
from PyQt5.QtCore import (
|
||||
Qt, QVariant, QAbstractTableModel,
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from view.ASubWindow import ASubWindow
|
||||
from View.ASubWindow import ASubWindow
|
||||
|
||||
class DummyWindow(ASubWindow):
|
||||
def __init__(self, title="Dummy", parent=None):
|
||||
|
|
@ -13,14 +13,14 @@ from PyQt5.QtWidgets import (
|
|||
)
|
||||
from PyQt5.uic import loadUi
|
||||
|
||||
from view.ListedSubWindow import ListedSubWindow
|
||||
from view.DummyWindow import DummyWindow
|
||||
from view.ConfigureWindow import ConfigureWindow
|
||||
from view.NewStudyWindow import NewStudyWindow
|
||||
from view.NetworkWindow import NetworkWindow
|
||||
from view.AboutWindow import AboutWindow
|
||||
from View.ListedSubWindow import ListedSubWindow
|
||||
from View.DummyWindow import DummyWindow
|
||||
from View.ConfigureWindow import ConfigureWindow
|
||||
from View.NewStudyWindow import NewStudyWindow
|
||||
from View.NetworkWindow import NetworkWindow
|
||||
from View.AboutWindow import AboutWindow
|
||||
|
||||
from model.Study import Study
|
||||
from Model.Study import Study
|
||||
|
||||
no_model_action = [
|
||||
"action_menu_new", "action_menu_open", "action_menu_import_mage",
|
||||
|
|
@ -15,9 +15,9 @@ from PyQt5.QtWidgets import (
|
|||
QGraphicsItem, QGraphicsTextItem,
|
||||
)
|
||||
|
||||
from model.network.Node import Node
|
||||
from model.network.Edge import Edge
|
||||
from model.network.Graph import Graph
|
||||
from Model.Network.Node import Node
|
||||
from Model.Network.Edge import Edge
|
||||
from Model.Network.Graph import Graph
|
||||
|
||||
class NodeItem(QGraphicsItem):
|
||||
Type = QGraphicsItem.UserType + 1
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from model.network.Node import Node
|
||||
from model.network.Edge import Edge
|
||||
from model.network.Graph import Graph
|
||||
from view.ASubWindow import ASubWindow
|
||||
from view.network.GraphWidget import GraphWidget
|
||||
from Model.Network.Node import Node
|
||||
from Model.Network.Edge import Edge
|
||||
from Model.Network.Graph import Graph
|
||||
from View.ASubWindow import ASubWindow
|
||||
from View.Network.GraphWidget import GraphWidget
|
||||
|
||||
from PyQt5.QtCore import (
|
||||
Qt, QRect, QVariant, QAbstractTableModel, pyqtSlot, pyqtSignal,
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from model.network.Node import Node
|
||||
from model.network.Edge import Edge
|
||||
from model.network.Graph import Graph
|
||||
from view.ASubWindow import ASubWindow
|
||||
from view.network.GraphWidget import GraphWidget
|
||||
from view.network.TableModel import (
|
||||
from Model.Network.Node import Node
|
||||
from Model.Network.Edge import Edge
|
||||
from Model.Network.Graph import Graph
|
||||
from View.ASubWindow import ASubWindow
|
||||
from View.Network.GraphWidget import GraphWidget
|
||||
from View.Network.TableModel import (
|
||||
GraphTableModel, ComboBoxDelegate, TrueFalseComboBoxDelegate,
|
||||
)
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ class NetworkWindow(ASubWindow):
|
|||
self.ui.setWindowTitle(title)
|
||||
|
||||
self.model = model
|
||||
if not self.model.data["graph"]:
|
||||
if "graph" not in self.model.data:
|
||||
self.graph = Graph()
|
||||
self.model.data["graph"] = self.graph
|
||||
else:
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from model.Study import Study
|
||||
from view.ASubWindow import ASubWindow
|
||||
from Model.Study import Study
|
||||
from View.ASubWindow import ASubWindow
|
||||
|
||||
class NewStudyWindow(ASubWindow):
|
||||
def __init__(self, study=None, title="New Study", parent=None):
|
||||
|
Before Width: | Height: | Size: 286 B After Width: | Height: | Size: 286 B |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 531 B After Width: | Height: | Size: 531 B |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 605 B After Width: | Height: | Size: 605 B |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 312 B After Width: | Height: | Size: 312 B |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 964 B After Width: | Height: | Size: 964 B |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 904 B After Width: | Height: | Size: 904 B |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 672 B After Width: | Height: | Size: 672 B |
|
Before Width: | Height: | Size: 460 B After Width: | Height: | Size: 460 B |
|
Before Width: | Height: | Size: 651 B After Width: | Height: | Size: 651 B |
|
Before Width: | Height: | Size: 266 B After Width: | Height: | Size: 266 B |
|
Before Width: | Height: | Size: 376 B After Width: | Height: | Size: 376 B |
|
Before Width: | Height: | Size: 529 B After Width: | Height: | Size: 529 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 661 B After Width: | Height: | Size: 661 B |
|
Before Width: | Height: | Size: 434 B After Width: | Height: | Size: 434 B |
|
Before Width: | Height: | Size: 507 B After Width: | Height: | Size: 507 B |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 672 B After Width: | Height: | Size: 672 B |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 784 B After Width: | Height: | Size: 784 B |
|
Before Width: | Height: | Size: 779 B After Width: | Height: | Size: 779 B |
|
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 243 B |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 596 B After Width: | Height: | Size: 596 B |
|
Before Width: | Height: | Size: 546 B After Width: | Height: | Size: 546 B |
|
Before Width: | Height: | Size: 828 B After Width: | Height: | Size: 828 B |
|
Before Width: | Height: | Size: 696 B After Width: | Height: | Size: 696 B |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 460 B After Width: | Height: | Size: 460 B |
|
Before Width: | Height: | Size: 927 B After Width: | Height: | Size: 927 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 991 B After Width: | Height: | Size: 991 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 345 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 669 B After Width: | Height: | Size: 669 B |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |