diff --git a/src/model/AModelComponent.py b/src/Model/AModelComponent.py similarity index 100% rename from src/model/AModelComponent.py rename to src/Model/AModelComponent.py diff --git a/src/model/network/Edge.py b/src/Model/Network/Edge.py similarity index 97% rename from src/model/network/Edge.py rename to src/Model/Network/Edge.py index 8b77c74c635272d5dff2b714319cb10e0b4b3bdc..09b2cb7b47e40de9524a2b9a06858940db869f36 100644 --- a/src/model/network/Edge.py +++ b/src/Model/Network/Edge.py @@ -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, diff --git a/src/model/network/Graph.py b/src/Model/Network/Graph.py similarity index 97% rename from src/model/network/Graph.py rename to src/Model/Network/Graph.py index d5a080d3aa9ef03686c66d3d9ef6a92893498128..6e17c4ad3991c6e23772027bece265fe5a5b41b7 100644 --- a/src/model/network/Graph.py +++ b/src/Model/Network/Graph.py @@ -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): diff --git a/src/model/network/Node.py b/src/Model/Network/Node.py similarity index 95% rename from src/model/network/Node.py rename to src/Model/Network/Node.py index c0fc06c5459d8ba60da92780cfef5c075e05a5e4..32bff349b6de840bb0f59b339ce5562314624f80 100644 --- a/src/model/network/Node.py +++ b/src/Model/Network/Node.py @@ -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, diff --git a/src/model/network/Point.py b/src/Model/Network/Point.py similarity index 100% rename from src/model/network/Point.py rename to src/Model/Network/Point.py diff --git a/src/model/Serializable.py b/src/Model/Serializable.py similarity index 100% rename from src/model/Serializable.py rename to src/Model/Serializable.py diff --git a/src/model/Study.py b/src/Model/Study.py similarity index 94% rename from src/model/Study.py rename to src/Model/Study.py index 47977bb81352953b58e852f40f38e2deeef66360..7363d0269dbd26fc5bcc219bf85124e64b29f278 100644 --- a/src/model/Study.py +++ b/src/Model/Study.py @@ -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): diff --git a/src/solver/ASolver.py b/src/Solver/ASolver.py similarity index 100% rename from src/solver/ASolver.py rename to src/Solver/ASolver.py diff --git a/src/solver/GenericSolver.py b/src/Solver/GenericSolver.py similarity index 87% rename from src/solver/GenericSolver.py rename to src/Solver/GenericSolver.py index b756f7c0515780863424a9609501dd1ddb716ba5..03e53daaedb1e39a99035b89ef38b81dfe4c4c79 100644 --- a/src/solver/GenericSolver.py +++ b/src/Solver/GenericSolver.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from solver.ASolver import ( +from Solver.ASolver import ( AbstractSolver, STATUS ) diff --git a/src/solver/Solvers.py b/src/Solver/Solvers.py similarity index 100% rename from src/solver/Solvers.py rename to src/Solver/Solvers.py diff --git a/src/view/ASubWindow.py b/src/View/ASubWindow.py similarity index 100% rename from src/view/ASubWindow.py rename to src/View/ASubWindow.py diff --git a/src/view/AboutWindow.py b/src/View/AboutWindow.py similarity index 85% rename from src/view/AboutWindow.py rename to src/View/AboutWindow.py index 03f3db6261a489cc3b8aa1f48b66246ae430cb6c..9f84ad8674d044dd2b14883669b6a7b936194527 100644 --- a/src/view/AboutWindow.py +++ b/src/View/AboutWindow.py @@ -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): diff --git a/src/view/ConfigureAddSolverWindow.py b/src/View/ConfigureAddSolverWindow.py similarity index 95% rename from src/view/ConfigureAddSolverWindow.py rename to src/View/ConfigureAddSolverWindow.py index 47099b1d7d9565153a3de9e41680821639d4f262..feacb54f63e8836c50124f020231cf643eef03d5 100644 --- a/src/view/ConfigureAddSolverWindow.py +++ b/src/View/ConfigureAddSolverWindow.py @@ -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, diff --git a/src/view/ConfigureWindow.py b/src/View/ConfigureWindow.py similarity index 97% rename from src/view/ConfigureWindow.py rename to src/View/ConfigureWindow.py index 551bf3fab21d45ed2e65c281a20f83e1a1aada2a..80ef05af7aab4ca6921067bd0a7598d7b1841ec4 100644 --- a/src/view/ConfigureWindow.py +++ b/src/View/ConfigureWindow.py @@ -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, diff --git a/src/view/DummyWindow.py b/src/View/DummyWindow.py similarity index 85% rename from src/view/DummyWindow.py rename to src/View/DummyWindow.py index a0cd038f4e49dffc655c49b6cce458ab7731fd78..576b51881df3ddc922121c10f44f7cdae3ad75f4 100644 --- a/src/view/DummyWindow.py +++ b/src/View/DummyWindow.py @@ -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): diff --git a/src/view/ListedSubWindow.py b/src/View/ListedSubWindow.py similarity index 100% rename from src/view/ListedSubWindow.py rename to src/View/ListedSubWindow.py diff --git a/src/view/MainWindow.py b/src/View/MainWindow.py similarity index 96% rename from src/view/MainWindow.py rename to src/View/MainWindow.py index fc14fa6c475fc33d1384fd40ba7ad0ecf9e7d710..1a4af5858d24229bcfba2fe0aa1ebc56ff391356 100644 --- a/src/view/MainWindow.py +++ b/src/View/MainWindow.py @@ -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 model.Study import Study +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 no_model_action = [ "action_menu_new", "action_menu_open", "action_menu_import_mage", diff --git a/src/view/network/GraphWidget.py b/src/View/Network/GraphWidget.py similarity index 99% rename from src/view/network/GraphWidget.py rename to src/View/Network/GraphWidget.py index 6cb693586e696b6497d26311231b312720f82904..8692fb91c1bb800805104651364e01601b2552aa 100644 --- a/src/view/network/GraphWidget.py +++ b/src/View/Network/GraphWidget.py @@ -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 diff --git a/src/view/network/TableModel.py b/src/View/Network/TableModel.py similarity index 96% rename from src/view/network/TableModel.py rename to src/View/Network/TableModel.py index 8108e3bc5733ffafe38a0f24f54fe850f5814ce8..1bf0e5b463bca14ae31afa20a6480969e60a5a31 100644 --- a/src/view/network/TableModel.py +++ b/src/View/Network/TableModel.py @@ -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, diff --git a/src/view/NetworkWindow.py b/src/View/NetworkWindow.py similarity index 93% rename from src/view/NetworkWindow.py rename to src/View/NetworkWindow.py index de4a3f99828ff239e1a08a2a25830e28da80cfc8..8494043642c7d5a789bbf332f599c7f90fe8dca2 100644 --- a/src/view/NetworkWindow.py +++ b/src/View/NetworkWindow.py @@ -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: diff --git a/src/view/NewStudyWindow.py b/src/View/NewStudyWindow.py similarity index 92% rename from src/view/NewStudyWindow.py rename to src/View/NewStudyWindow.py index 7de5cf0b4c0a7f53e5f04c861fed2dffddf6d9b9..905815ea78555f794d86d2404d80d2bf9e33eacf 100644 --- a/src/view/NewStudyWindow.py +++ b/src/View/NewStudyWindow.py @@ -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): diff --git a/src/view/ui/ConfigureAddSolverDialog.ui b/src/View/ui/ConfigureAddSolverDialog.ui similarity index 100% rename from src/view/ui/ConfigureAddSolverDialog.ui rename to src/View/ui/ConfigureAddSolverDialog.ui diff --git a/src/view/ui/ConfigureDialog.ui b/src/View/ui/ConfigureDialog.ui similarity index 100% rename from src/view/ui/ConfigureDialog.ui rename to src/View/ui/ConfigureDialog.ui diff --git a/src/view/ui/MainWindow.ui b/src/View/ui/MainWindow.ui similarity index 100% rename from src/view/ui/MainWindow.ui rename to src/View/ui/MainWindow.ui diff --git a/src/view/ui/MainWindow_old.ui b/src/View/ui/MainWindow_old.ui similarity index 100% rename from src/view/ui/MainWindow_old.ui rename to src/View/ui/MainWindow_old.ui diff --git a/src/view/ui/Network.ui b/src/View/ui/Network.ui similarity index 100% rename from src/view/ui/Network.ui rename to src/View/ui/Network.ui diff --git a/src/view/ui/NewStudy.ui b/src/View/ui/NewStudy.ui similarity index 100% rename from src/view/ui/NewStudy.ui rename to src/View/ui/NewStudy.ui diff --git a/src/view/ui/about.ui b/src/View/ui/about.ui similarity index 100% rename from src/view/ui/about.ui rename to src/View/ui/about.ui diff --git a/src/view/ui/dummy.ui b/src/View/ui/dummy.ui similarity index 100% rename from src/view/ui/dummy.ui rename to src/View/ui/dummy.ui diff --git a/src/view/ui/ressources/14_layer_visible.png b/src/View/ui/ressources/14_layer_visible.png similarity index 100% rename from src/view/ui/ressources/14_layer_visible.png rename to src/View/ui/ressources/14_layer_visible.png diff --git a/src/view/ui/ressources/Cemagref.gif b/src/View/ui/ressources/Cemagref.gif similarity index 100% rename from src/view/ui/ressources/Cemagref.gif rename to src/View/ui/ressources/Cemagref.gif diff --git a/src/view/ui/ressources/Cemagref_apropos.gif b/src/View/ui/ressources/Cemagref_apropos.gif similarity index 100% rename from src/view/ui/ressources/Cemagref_apropos.gif rename to src/View/ui/ressources/Cemagref_apropos.gif diff --git a/src/view/ui/ressources/Copie de Cemagref_apropos.gif b/src/View/ui/ressources/Copie de Cemagref_apropos.gif similarity index 100% rename from src/view/ui/ressources/Copie de Cemagref_apropos.gif rename to src/View/ui/ressources/Copie de Cemagref_apropos.gif diff --git a/src/view/ui/ressources/M_icon.png b/src/View/ui/ressources/M_icon.png similarity index 100% rename from src/view/ui/ressources/M_icon.png rename to src/View/ui/ressources/M_icon.png diff --git a/src/view/ui/ressources/bold.png b/src/View/ui/ressources/bold.png similarity index 100% rename from src/view/ui/ressources/bold.png rename to src/View/ui/ressources/bold.png diff --git a/src/view/ui/ressources/cancel.png b/src/View/ui/ressources/cancel.png similarity index 100% rename from src/view/ui/ressources/cancel.png rename to src/View/ui/ressources/cancel.png diff --git a/src/view/ui/ressources/close.png b/src/View/ui/ressources/close.png similarity index 100% rename from src/view/ui/ressources/close.png rename to src/View/ui/ressources/close.png diff --git a/src/view/ui/ressources/color.png b/src/View/ui/ressources/color.png similarity index 100% rename from src/view/ui/ressources/color.png rename to src/View/ui/ressources/color.png diff --git a/src/view/ui/ressources/down.png b/src/View/ui/ressources/down.png similarity index 100% rename from src/view/ui/ressources/down.png rename to src/View/ui/ressources/down.png diff --git a/src/view/ui/ressources/edit.png b/src/View/ui/ressources/edit.png similarity index 100% rename from src/view/ui/ressources/edit.png rename to src/View/ui/ressources/edit.png diff --git a/src/view/ui/ressources/edit2.png b/src/View/ui/ressources/edit2.png similarity index 100% rename from src/view/ui/ressources/edit2.png rename to src/View/ui/ressources/edit2.png diff --git a/src/view/ui/ressources/exit_bis.png b/src/View/ui/ressources/exit_bis.png similarity index 100% rename from src/view/ui/ressources/exit_bis.png rename to src/View/ui/ressources/exit_bis.png diff --git a/src/view/ui/ressources/export.png b/src/View/ui/ressources/export.png similarity index 100% rename from src/view/ui/ressources/export.png rename to src/View/ui/ressources/export.png diff --git a/src/view/ui/ressources/file.png b/src/View/ui/ressources/file.png similarity index 100% rename from src/view/ui/ressources/file.png rename to src/View/ui/ressources/file.png diff --git a/src/view/ui/ressources/font.png b/src/View/ui/ressources/font.png similarity index 100% rename from src/view/ui/ressources/font.png rename to src/View/ui/ressources/font.png diff --git a/src/view/ui/ressources/geometrie.png b/src/View/ui/ressources/geometrie.png similarity index 100% rename from src/view/ui/ressources/geometrie.png rename to src/View/ui/ressources/geometrie.png diff --git a/src/view/ui/ressources/geometrie0.png b/src/View/ui/ressources/geometrie0.png similarity index 100% rename from src/view/ui/ressources/geometrie0.png rename to src/View/ui/ressources/geometrie0.png diff --git a/src/view/ui/ressources/geometrie_80.png b/src/View/ui/ressources/geometrie_80.png similarity index 100% rename from src/view/ui/ressources/geometrie_80.png rename to src/View/ui/ressources/geometrie_80.png diff --git a/src/view/ui/ressources/geometrie_80_bis.png b/src/View/ui/ressources/geometrie_80_bis.png similarity index 100% rename from src/view/ui/ressources/geometrie_80_bis.png rename to src/View/ui/ressources/geometrie_80_bis.png diff --git a/src/view/ui/ressources/gnome-stock-edit.png b/src/View/ui/ressources/gnome-stock-edit.png similarity index 100% rename from src/view/ui/ressources/gnome-stock-edit.png rename to src/View/ui/ressources/gnome-stock-edit.png diff --git a/src/view/ui/ressources/gnome-stock-insert-table.png b/src/View/ui/ressources/gnome-stock-insert-table.png similarity index 100% rename from src/view/ui/ressources/gnome-stock-insert-table.png rename to src/View/ui/ressources/gnome-stock-insert-table.png diff --git a/src/view/ui/ressources/go-down.png b/src/View/ui/ressources/go-down.png similarity index 100% rename from src/view/ui/ressources/go-down.png rename to src/View/ui/ressources/go-down.png diff --git a/src/view/ui/ressources/go-down1.png b/src/View/ui/ressources/go-down1.png similarity index 100% rename from src/view/ui/ressources/go-down1.png rename to src/View/ui/ressources/go-down1.png diff --git a/src/view/ui/ressources/go-up.png b/src/View/ui/ressources/go-up.png similarity index 100% rename from src/view/ui/ressources/go-up.png rename to src/View/ui/ressources/go-up.png diff --git a/src/view/ui/ressources/go-up1.png b/src/View/ui/ressources/go-up1.png similarity index 100% rename from src/view/ui/ressources/go-up1.png rename to src/View/ui/ressources/go-up1.png diff --git a/src/view/ui/ressources/go-up2.png b/src/View/ui/ressources/go-up2.png similarity index 100% rename from src/view/ui/ressources/go-up2.png rename to src/View/ui/ressources/go-up2.png diff --git a/src/view/ui/ressources/gtk-activer.png b/src/View/ui/ressources/gtk-activer.png similarity index 100% rename from src/view/ui/ressources/gtk-activer.png rename to src/View/ui/ressources/gtk-activer.png diff --git a/src/view/ui/ressources/gtk-add.png b/src/View/ui/ressources/gtk-add.png similarity index 100% rename from src/view/ui/ressources/gtk-add.png rename to src/View/ui/ressources/gtk-add.png diff --git a/src/view/ui/ressources/gtk-apply.png b/src/View/ui/ressources/gtk-apply.png similarity index 100% rename from src/view/ui/ressources/gtk-apply.png rename to src/View/ui/ressources/gtk-apply.png diff --git a/src/view/ui/ressources/gtk-close.png b/src/View/ui/ressources/gtk-close.png similarity index 100% rename from src/view/ui/ressources/gtk-close.png rename to src/View/ui/ressources/gtk-close.png diff --git a/src/view/ui/ressources/gtk-copy.png b/src/View/ui/ressources/gtk-copy.png similarity index 100% rename from src/view/ui/ressources/gtk-copy.png rename to src/View/ui/ressources/gtk-copy.png diff --git a/src/view/ui/ressources/gtk-desactiver.png b/src/View/ui/ressources/gtk-desactiver.png similarity index 100% rename from src/view/ui/ressources/gtk-desactiver.png rename to src/View/ui/ressources/gtk-desactiver.png diff --git a/src/view/ui/ressources/gtk-dialog-error.png b/src/View/ui/ressources/gtk-dialog-error.png similarity index 100% rename from src/view/ui/ressources/gtk-dialog-error.png rename to src/View/ui/ressources/gtk-dialog-error.png diff --git a/src/view/ui/ressources/gtk-dialog-warning.png b/src/View/ui/ressources/gtk-dialog-warning.png similarity index 100% rename from src/view/ui/ressources/gtk-dialog-warning.png rename to src/View/ui/ressources/gtk-dialog-warning.png diff --git a/src/view/ui/ressources/gtk-dnd-multiple.png b/src/View/ui/ressources/gtk-dnd-multiple.png similarity index 100% rename from src/view/ui/ressources/gtk-dnd-multiple.png rename to src/View/ui/ressources/gtk-dnd-multiple.png diff --git a/src/view/ui/ressources/gtk-execute.png b/src/View/ui/ressources/gtk-execute.png similarity index 100% rename from src/view/ui/ressources/gtk-execute.png rename to src/View/ui/ressources/gtk-execute.png diff --git a/src/view/ui/ressources/gtk-go-back.png b/src/View/ui/ressources/gtk-go-back.png similarity index 100% rename from src/view/ui/ressources/gtk-go-back.png rename to src/View/ui/ressources/gtk-go-back.png diff --git a/src/view/ui/ressources/gtk-go-forward.png b/src/View/ui/ressources/gtk-go-forward.png similarity index 100% rename from src/view/ui/ressources/gtk-go-forward.png rename to src/View/ui/ressources/gtk-go-forward.png diff --git a/src/view/ui/ressources/gtk-help.png b/src/View/ui/ressources/gtk-help.png similarity index 100% rename from src/view/ui/ressources/gtk-help.png rename to src/View/ui/ressources/gtk-help.png diff --git a/src/view/ui/ressources/gtk-new.png b/src/View/ui/ressources/gtk-new.png similarity index 100% rename from src/view/ui/ressources/gtk-new.png rename to src/View/ui/ressources/gtk-new.png diff --git a/src/view/ui/ressources/gtk-ok.png b/src/View/ui/ressources/gtk-ok.png similarity index 100% rename from src/view/ui/ressources/gtk-ok.png rename to src/View/ui/ressources/gtk-ok.png diff --git a/src/view/ui/ressources/gtk-open.png b/src/View/ui/ressources/gtk-open.png similarity index 100% rename from src/view/ui/ressources/gtk-open.png rename to src/View/ui/ressources/gtk-open.png diff --git a/src/view/ui/ressources/gtk-paste.png b/src/View/ui/ressources/gtk-paste.png similarity index 100% rename from src/view/ui/ressources/gtk-paste.png rename to src/View/ui/ressources/gtk-paste.png diff --git a/src/view/ui/ressources/gtk-print.png b/src/View/ui/ressources/gtk-print.png similarity index 100% rename from src/view/ui/ressources/gtk-print.png rename to src/View/ui/ressources/gtk-print.png diff --git a/src/view/ui/ressources/gtk-quit.png b/src/View/ui/ressources/gtk-quit.png similarity index 100% rename from src/view/ui/ressources/gtk-quit.png rename to src/View/ui/ressources/gtk-quit.png diff --git a/src/view/ui/ressources/gtk-refresh.PNG b/src/View/ui/ressources/gtk-refresh.PNG similarity index 100% rename from src/view/ui/ressources/gtk-refresh.PNG rename to src/View/ui/ressources/gtk-refresh.PNG diff --git a/src/view/ui/ressources/gtk-remove.png b/src/View/ui/ressources/gtk-remove.png similarity index 100% rename from src/view/ui/ressources/gtk-remove.png rename to src/View/ui/ressources/gtk-remove.png diff --git a/src/view/ui/ressources/gtk-save-as.png b/src/View/ui/ressources/gtk-save-as.png similarity index 100% rename from src/view/ui/ressources/gtk-save-as.png rename to src/View/ui/ressources/gtk-save-as.png diff --git a/src/view/ui/ressources/gtk-save.png b/src/View/ui/ressources/gtk-save.png similarity index 100% rename from src/view/ui/ressources/gtk-save.png rename to src/View/ui/ressources/gtk-save.png diff --git a/src/view/ui/ressources/gtk-select-color.png b/src/View/ui/ressources/gtk-select-color.png similarity index 100% rename from src/view/ui/ressources/gtk-select-color.png rename to src/View/ui/ressources/gtk-select-color.png diff --git a/src/view/ui/ressources/gtk-sort-ascending.png b/src/View/ui/ressources/gtk-sort-ascending.png similarity index 100% rename from src/view/ui/ressources/gtk-sort-ascending.png rename to src/View/ui/ressources/gtk-sort-ascending.png diff --git a/src/view/ui/ressources/gtk-sort-descending.png b/src/View/ui/ressources/gtk-sort-descending.png similarity index 100% rename from src/view/ui/ressources/gtk-sort-descending.png rename to src/View/ui/ressources/gtk-sort-descending.png diff --git a/src/view/ui/ressources/gtk-stop.png b/src/View/ui/ressources/gtk-stop.png similarity index 100% rename from src/view/ui/ressources/gtk-stop.png rename to src/View/ui/ressources/gtk-stop.png diff --git a/src/view/ui/ressources/gtk-undo.png b/src/View/ui/ressources/gtk-undo.png similarity index 100% rename from src/view/ui/ressources/gtk-undo.png rename to src/View/ui/ressources/gtk-undo.png diff --git a/src/view/ui/ressources/gtk-zoom-100.png b/src/View/ui/ressources/gtk-zoom-100.png similarity index 100% rename from src/view/ui/ressources/gtk-zoom-100.png rename to src/View/ui/ressources/gtk-zoom-100.png diff --git a/src/view/ui/ressources/gtk-zoom-fit.png b/src/View/ui/ressources/gtk-zoom-fit.png similarity index 100% rename from src/view/ui/ressources/gtk-zoom-fit.png rename to src/View/ui/ressources/gtk-zoom-fit.png diff --git a/src/view/ui/ressources/gtk-zoom-in.png b/src/View/ui/ressources/gtk-zoom-in.png similarity index 100% rename from src/view/ui/ressources/gtk-zoom-in.png rename to src/View/ui/ressources/gtk-zoom-in.png diff --git a/src/view/ui/ressources/gtk-zoom-out.png b/src/View/ui/ressources/gtk-zoom-out.png similarity index 100% rename from src/view/ui/ressources/gtk-zoom-out.png rename to src/View/ui/ressources/gtk-zoom-out.png diff --git a/src/view/ui/ressources/gtk_add.png b/src/View/ui/ressources/gtk_add.png similarity index 100% rename from src/view/ui/ressources/gtk_add.png rename to src/View/ui/ressources/gtk_add.png diff --git a/src/view/ui/ressources/image989.png b/src/View/ui/ressources/image989.png similarity index 100% rename from src/view/ui/ressources/image989.png rename to src/View/ui/ressources/image989.png diff --git a/src/view/ui/ressources/italic.png b/src/View/ui/ressources/italic.png similarity index 100% rename from src/view/ui/ressources/italic.png rename to src/View/ui/ressources/italic.png diff --git a/src/view/ui/ressources/justifyCenter.png b/src/View/ui/ressources/justifyCenter.png similarity index 100% rename from src/view/ui/ressources/justifyCenter.png rename to src/View/ui/ressources/justifyCenter.png diff --git a/src/view/ui/ressources/justifyLeft.png b/src/View/ui/ressources/justifyLeft.png similarity index 100% rename from src/view/ui/ressources/justifyLeft.png rename to src/View/ui/ressources/justifyLeft.png diff --git a/src/view/ui/ressources/justifyRight.png b/src/View/ui/ressources/justifyRight.png similarity index 100% rename from src/view/ui/ressources/justifyRight.png rename to src/View/ui/ressources/justifyRight.png diff --git a/src/view/ui/ressources/linetool.png b/src/View/ui/ressources/linetool.png similarity index 100% rename from src/view/ui/ressources/linetool.png rename to src/View/ui/ressources/linetool.png diff --git a/src/view/ui/ressources/logoCemagref.gif b/src/View/ui/ressources/logoCemagref.gif similarity index 100% rename from src/view/ui/ressources/logoCemagref.gif rename to src/View/ui/ressources/logoCemagref.gif diff --git a/src/view/ui/ressources/logoIsima.gif b/src/View/ui/ressources/logoIsima.gif similarity index 100% rename from src/view/ui/ressources/logoIsima.gif rename to src/View/ui/ressources/logoIsima.gif diff --git a/src/view/ui/ressources/mailles-50.png b/src/View/ui/ressources/mailles-50.png similarity index 100% rename from src/view/ui/ressources/mailles-50.png rename to src/View/ui/ressources/mailles-50.png diff --git a/src/view/ui/ressources/new.png b/src/View/ui/ressources/new.png similarity index 100% rename from src/view/ui/ressources/new.png rename to src/View/ui/ressources/new.png diff --git a/src/view/ui/ressources/no_icone.PNG b/src/View/ui/ressources/no_icone.PNG similarity index 100% rename from src/view/ui/ressources/no_icone.PNG rename to src/View/ui/ressources/no_icone.PNG diff --git a/src/view/ui/ressources/noeud_amont.PNG b/src/View/ui/ressources/noeud_amont.PNG similarity index 100% rename from src/view/ui/ressources/noeud_amont.PNG rename to src/View/ui/ressources/noeud_amont.PNG diff --git a/src/view/ui/ressources/noeud_amont.gif b/src/View/ui/ressources/noeud_amont.gif similarity index 100% rename from src/view/ui/ressources/noeud_amont.gif rename to src/View/ui/ressources/noeud_amont.gif diff --git a/src/view/ui/ressources/noeud_aval.PNG b/src/View/ui/ressources/noeud_aval.PNG similarity index 100% rename from src/view/ui/ressources/noeud_aval.PNG rename to src/View/ui/ressources/noeud_aval.PNG diff --git a/src/view/ui/ressources/noeud_aval.gif b/src/View/ui/ressources/noeud_aval.gif similarity index 100% rename from src/view/ui/ressources/noeud_aval.gif rename to src/View/ui/ressources/noeud_aval.gif diff --git a/src/view/ui/ressources/noeud_desact.PNG b/src/View/ui/ressources/noeud_desact.PNG similarity index 100% rename from src/view/ui/ressources/noeud_desact.PNG rename to src/View/ui/ressources/noeud_desact.PNG diff --git a/src/view/ui/ressources/noeud_desact.gif b/src/View/ui/ressources/noeud_desact.gif similarity index 100% rename from src/view/ui/ressources/noeud_desact.gif rename to src/View/ui/ressources/noeud_desact.gif diff --git a/src/view/ui/ressources/noeud_int.PNG b/src/View/ui/ressources/noeud_int.PNG similarity index 100% rename from src/view/ui/ressources/noeud_int.PNG rename to src/View/ui/ressources/noeud_int.PNG diff --git a/src/view/ui/ressources/noeud_int.gif b/src/View/ui/ressources/noeud_int.gif similarity index 100% rename from src/view/ui/ressources/noeud_int.gif rename to src/View/ui/ressources/noeud_int.gif diff --git a/src/view/ui/ressources/noeud_int_hs.PNG b/src/View/ui/ressources/noeud_int_hs.PNG similarity index 100% rename from src/view/ui/ressources/noeud_int_hs.PNG rename to src/View/ui/ressources/noeud_int_hs.PNG diff --git a/src/view/ui/ressources/noeud_int_hs.gif b/src/View/ui/ressources/noeud_int_hs.gif similarity index 100% rename from src/view/ui/ressources/noeud_int_hs.gif rename to src/View/ui/ressources/noeud_int_hs.gif diff --git a/src/view/ui/ressources/open.png b/src/View/ui/ressources/open.png similarity index 100% rename from src/view/ui/ressources/open.png rename to src/View/ui/ressources/open.png diff --git a/src/view/ui/ressources/player_pause.png b/src/View/ui/ressources/player_pause.png similarity index 100% rename from src/view/ui/ressources/player_pause.png rename to src/View/ui/ressources/player_pause.png diff --git a/src/view/ui/ressources/player_play.png b/src/View/ui/ressources/player_play.png similarity index 100% rename from src/view/ui/ressources/player_play.png rename to src/View/ui/ressources/player_play.png diff --git a/src/view/ui/ressources/query_erase.png b/src/View/ui/ressources/query_erase.png similarity index 100% rename from src/view/ui/ressources/query_erase.png rename to src/View/ui/ressources/query_erase.png diff --git a/src/view/ui/ressources/reseau.png b/src/View/ui/ressources/reseau.png similarity index 100% rename from src/view/ui/ressources/reseau.png rename to src/View/ui/ressources/reseau.png diff --git a/src/view/ui/ressources/reseau1.jpg b/src/View/ui/ressources/reseau1.jpg similarity index 100% rename from src/view/ui/ressources/reseau1.jpg rename to src/View/ui/ressources/reseau1.jpg diff --git a/src/view/ui/ressources/reseau2.png b/src/View/ui/ressources/reseau2.png similarity index 100% rename from src/view/ui/ressources/reseau2.png rename to src/View/ui/ressources/reseau2.png diff --git a/src/view/ui/ressources/reseau3.png b/src/View/ui/ressources/reseau3.png similarity index 100% rename from src/view/ui/ressources/reseau3.png rename to src/View/ui/ressources/reseau3.png diff --git a/src/view/ui/ressources/reseau3_100.png b/src/View/ui/ressources/reseau3_100.png similarity index 100% rename from src/view/ui/ressources/reseau3_100.png rename to src/View/ui/ressources/reseau3_100.png diff --git a/src/view/ui/ressources/reseau3_24.png b/src/View/ui/ressources/reseau3_24.png similarity index 100% rename from src/view/ui/ressources/reseau3_24.png rename to src/View/ui/ressources/reseau3_24.png diff --git a/src/view/ui/ressources/reseau4.png b/src/View/ui/ressources/reseau4.png similarity index 100% rename from src/view/ui/ressources/reseau4.png rename to src/View/ui/ressources/reseau4.png diff --git a/src/view/ui/ressources/reseau_2.svg b/src/View/ui/ressources/reseau_2.svg similarity index 100% rename from src/view/ui/ressources/reseau_2.svg rename to src/View/ui/ressources/reseau_2.svg diff --git a/src/view/ui/ressources/reseau_2_svgsimple.svg b/src/View/ui/ressources/reseau_2_svgsimple.svg similarity index 100% rename from src/view/ui/ressources/reseau_2_svgsimple.svg rename to src/View/ui/ressources/reseau_2_svgsimple.svg diff --git a/src/view/ui/ressources/save.png b/src/View/ui/ressources/save.png similarity index 100% rename from src/view/ui/ressources/save.png rename to src/View/ui/ressources/save.png diff --git a/src/view/ui/ressources/strikethrough.png b/src/View/ui/ressources/strikethrough.png similarity index 100% rename from src/view/ui/ressources/strikethrough.png rename to src/View/ui/ressources/strikethrough.png diff --git a/src/view/ui/ressources/test3_graph_24x24.png b/src/View/ui/ressources/test3_graph_24x24.png similarity index 100% rename from src/view/ui/ressources/test3_graph_24x24.png rename to src/View/ui/ressources/test3_graph_24x24.png diff --git a/src/view/ui/ressources/test_graph_24x24.png b/src/View/ui/ressources/test_graph_24x24.png similarity index 100% rename from src/view/ui/ressources/test_graph_24x24.png rename to src/View/ui/ressources/test_graph_24x24.png diff --git a/src/view/ui/ressources/underline.png b/src/View/ui/ressources/underline.png similarity index 100% rename from src/view/ui/ressources/underline.png rename to src/View/ui/ressources/underline.png diff --git a/src/view/ui/ressources/up.png b/src/View/ui/ressources/up.png similarity index 100% rename from src/view/ui/ressources/up.png rename to src/View/ui/ressources/up.png diff --git a/src/view/ui/ressources/xX.png b/src/View/ui/ressources/xX.png similarity index 100% rename from src/view/ui/ressources/xX.png rename to src/View/ui/ressources/xX.png diff --git a/src/view/ui/ressources/xX.svg b/src/View/ui/ressources/xX.svg similarity index 100% rename from src/view/ui/ressources/xX.svg rename to src/View/ui/ressources/xX.svg diff --git a/src/view/ui/ressources/xX_.png b/src/View/ui/ressources/xX_.png similarity index 100% rename from src/view/ui/ressources/xX_.png rename to src/View/ui/ressources/xX_.png diff --git a/src/view/ui/ressources/x_coiss.png b/src/View/ui/ressources/x_coiss.png similarity index 100% rename from src/view/ui/ressources/x_coiss.png rename to src/View/ui/ressources/x_coiss.png diff --git a/src/view/ui/ressources/zoom.png b/src/View/ui/ressources/zoom.png similarity index 100% rename from src/view/ui/ressources/zoom.png rename to src/View/ui/ressources/zoom.png diff --git a/src/view/ui/ressources/zoom_fit.png b/src/View/ui/ressources/zoom_fit.png similarity index 100% rename from src/view/ui/ressources/zoom_fit.png rename to src/View/ui/ressources/zoom_fit.png diff --git a/src/view/ui/ressources/zoom_fit_11.png b/src/View/ui/ressources/zoom_fit_11.png similarity index 100% rename from src/view/ui/ressources/zoom_fit_11.png rename to src/View/ui/ressources/zoom_fit_11.png diff --git a/src/view/ui/ui_to_py.sh b/src/View/ui/ui_to_py.sh similarity index 100% rename from src/view/ui/ui_to_py.sh rename to src/View/ui/ui_to_py.sh diff --git a/src/pamhyr.py b/src/pamhyr.py index 1ca646ac072343bf462f340f8ffc92b0ba4cfd79..b56d0af9393afab32236b9211787e0c6e1dce032 100755 --- a/src/pamhyr.py +++ b/src/pamhyr.py @@ -8,8 +8,8 @@ from PyQt5.QtCore import QTranslator from PyQt5.QtWidgets import QApplication from config import Config -from view.MainWindow import ApplicationWindow -from model.Study import Study +from View.MainWindow import ApplicationWindow +from Model.Study import Study def main(): conf = Config.load()