From d418b57fa09a3e04db4c84b9220f76e4a9e49174 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Thu, 30 Mar 2023 09:29:33 +0200
Subject: [PATCH] git: Rename some directory.
---
src/{model => Model}/AModelComponent.py | 0
src/{model/network => Model/Network}/Edge.py | 2 +-
src/{model/network => Model/Network}/Graph.py | 4 ++--
src/{model/network => Model/Network}/Node.py | 2 +-
src/{model/network => Model/Network}/Point.py | 0
src/{model => Model}/Serializable.py | 0
src/{model => Model}/Study.py | 2 +-
src/{solver => Solver}/ASolver.py | 0
src/{solver => Solver}/GenericSolver.py | 2 +-
src/{solver => Solver}/Solvers.py | 0
src/{view => View}/ASubWindow.py | 0
src/{view => View}/AboutWindow.py | 2 +-
src/{view => View}/ConfigureAddSolverWindow.py | 7 +++----
src/{view => View}/ConfigureWindow.py | 6 +++---
src/{view => View}/DummyWindow.py | 2 +-
src/{view => View}/ListedSubWindow.py | 0
src/{view => View}/MainWindow.py | 16 ++++++++--------
.../network => View/Network}/GraphWidget.py | 6 +++---
.../network => View/Network}/TableModel.py | 10 +++++-----
src/{view => View}/NetworkWindow.py | 14 +++++++-------
src/{view => View}/NewStudyWindow.py | 4 ++--
.../ui/ConfigureAddSolverDialog.ui | 0
src/{view => View}/ui/ConfigureDialog.ui | 0
src/{view => View}/ui/MainWindow.ui | 0
src/{view => View}/ui/MainWindow_old.ui | 0
src/{view => View}/ui/Network.ui | 0
src/{view => View}/ui/NewStudy.ui | 0
src/{view => View}/ui/about.ui | 0
src/{view => View}/ui/dummy.ui | 0
.../ui/ressources/14_layer_visible.png | Bin
src/{view => View}/ui/ressources/Cemagref.gif | Bin
.../ui/ressources/Cemagref_apropos.gif | Bin
.../ui/ressources/Copie de Cemagref_apropos.gif | Bin
src/{view => View}/ui/ressources/M_icon.png | Bin
src/{view => View}/ui/ressources/bold.png | Bin
src/{view => View}/ui/ressources/cancel.png | Bin
src/{view => View}/ui/ressources/close.png | Bin
src/{view => View}/ui/ressources/color.png | Bin
src/{view => View}/ui/ressources/down.png | Bin
src/{view => View}/ui/ressources/edit.png | Bin
src/{view => View}/ui/ressources/edit2.png | Bin
src/{view => View}/ui/ressources/exit_bis.png | Bin
src/{view => View}/ui/ressources/export.png | Bin
src/{view => View}/ui/ressources/file.png | Bin
src/{view => View}/ui/ressources/font.png | Bin
src/{view => View}/ui/ressources/geometrie.png | Bin
src/{view => View}/ui/ressources/geometrie0.png | Bin
.../ui/ressources/geometrie_80.png | Bin
.../ui/ressources/geometrie_80_bis.png | Bin
.../ui/ressources/gnome-stock-edit.png | Bin
.../ui/ressources/gnome-stock-insert-table.png | Bin
src/{view => View}/ui/ressources/go-down.png | Bin
src/{view => View}/ui/ressources/go-down1.png | Bin
src/{view => View}/ui/ressources/go-up.png | Bin
src/{view => View}/ui/ressources/go-up1.png | Bin
src/{view => View}/ui/ressources/go-up2.png | Bin
.../ui/ressources/gtk-activer.png | Bin
src/{view => View}/ui/ressources/gtk-add.png | Bin
src/{view => View}/ui/ressources/gtk-apply.png | Bin
src/{view => View}/ui/ressources/gtk-close.png | Bin
src/{view => View}/ui/ressources/gtk-copy.png | Bin
.../ui/ressources/gtk-desactiver.png | Bin
.../ui/ressources/gtk-dialog-error.png | Bin
.../ui/ressources/gtk-dialog-warning.png | Bin
.../ui/ressources/gtk-dnd-multiple.png | Bin
.../ui/ressources/gtk-execute.png | Bin
.../ui/ressources/gtk-go-back.png | Bin
.../ui/ressources/gtk-go-forward.png | Bin
src/{view => View}/ui/ressources/gtk-help.png | 0
src/{view => View}/ui/ressources/gtk-new.png | Bin
src/{view => View}/ui/ressources/gtk-ok.png | Bin
src/{view => View}/ui/ressources/gtk-open.png | Bin
src/{view => View}/ui/ressources/gtk-paste.png | Bin
src/{view => View}/ui/ressources/gtk-print.png | Bin
src/{view => View}/ui/ressources/gtk-quit.png | Bin
.../ui/ressources/gtk-refresh.PNG | Bin
src/{view => View}/ui/ressources/gtk-remove.png | Bin
.../ui/ressources/gtk-save-as.png | Bin
src/{view => View}/ui/ressources/gtk-save.png | Bin
.../ui/ressources/gtk-select-color.png | Bin
.../ui/ressources/gtk-sort-ascending.png | Bin
.../ui/ressources/gtk-sort-descending.png | Bin
src/{view => View}/ui/ressources/gtk-stop.png | Bin
src/{view => View}/ui/ressources/gtk-undo.png | Bin
.../ui/ressources/gtk-zoom-100.png | Bin
.../ui/ressources/gtk-zoom-fit.png | Bin
.../ui/ressources/gtk-zoom-in.png | 0
.../ui/ressources/gtk-zoom-out.png | 0
src/{view => View}/ui/ressources/gtk_add.png | Bin
src/{view => View}/ui/ressources/image989.png | Bin
src/{view => View}/ui/ressources/italic.png | Bin
.../ui/ressources/justifyCenter.png | Bin
.../ui/ressources/justifyLeft.png | Bin
.../ui/ressources/justifyRight.png | Bin
src/{view => View}/ui/ressources/linetool.png | Bin
.../ui/ressources/logoCemagref.gif | Bin
src/{view => View}/ui/ressources/logoIsima.gif | Bin
src/{view => View}/ui/ressources/mailles-50.png | Bin
src/{view => View}/ui/ressources/new.png | Bin
src/{view => View}/ui/ressources/no_icone.PNG | Bin
.../ui/ressources/noeud_amont.PNG | Bin
.../ui/ressources/noeud_amont.gif | Bin
src/{view => View}/ui/ressources/noeud_aval.PNG | Bin
src/{view => View}/ui/ressources/noeud_aval.gif | Bin
.../ui/ressources/noeud_desact.PNG | Bin
.../ui/ressources/noeud_desact.gif | Bin
src/{view => View}/ui/ressources/noeud_int.PNG | Bin
src/{view => View}/ui/ressources/noeud_int.gif | Bin
.../ui/ressources/noeud_int_hs.PNG | Bin
.../ui/ressources/noeud_int_hs.gif | Bin
src/{view => View}/ui/ressources/open.png | Bin
.../ui/ressources/player_pause.png | Bin
.../ui/ressources/player_play.png | Bin
.../ui/ressources/query_erase.png | Bin
src/{view => View}/ui/ressources/reseau.png | Bin
src/{view => View}/ui/ressources/reseau1.jpg | Bin
src/{view => View}/ui/ressources/reseau2.png | Bin
src/{view => View}/ui/ressources/reseau3.png | Bin
.../ui/ressources/reseau3_100.png | Bin
src/{view => View}/ui/ressources/reseau3_24.png | Bin
src/{view => View}/ui/ressources/reseau4.png | Bin
src/{view => View}/ui/ressources/reseau_2.svg | 0
.../ui/ressources/reseau_2_svgsimple.svg | 0
src/{view => View}/ui/ressources/save.png | Bin
.../ui/ressources/strikethrough.png | Bin
.../ui/ressources/test3_graph_24x24.png | Bin
.../ui/ressources/test_graph_24x24.png | Bin
src/{view => View}/ui/ressources/underline.png | Bin
src/{view => View}/ui/ressources/up.png | Bin
src/{view => View}/ui/ressources/xX.png | Bin
src/{view => View}/ui/ressources/xX.svg | 0
src/{view => View}/ui/ressources/xX_.png | Bin
src/{view => View}/ui/ressources/x_coiss.png | Bin
src/{view => View}/ui/ressources/zoom.png | Bin
src/{view => View}/ui/ressources/zoom_fit.png | Bin
.../ui/ressources/zoom_fit_11.png | Bin
src/{view => View}/ui/ui_to_py.sh | 0
src/pamhyr.py | 4 ++--
138 files changed, 41 insertions(+), 42 deletions(-)
rename src/{model => Model}/AModelComponent.py (100%)
rename src/{model/network => Model/Network}/Edge.py (97%)
rename src/{model/network => Model/Network}/Graph.py (97%)
rename src/{model/network => Model/Network}/Node.py (95%)
rename src/{model/network => Model/Network}/Point.py (100%)
rename src/{model => Model}/Serializable.py (100%)
rename src/{model => Model}/Study.py (94%)
rename src/{solver => Solver}/ASolver.py (100%)
rename src/{solver => Solver}/GenericSolver.py (87%)
rename src/{solver => Solver}/Solvers.py (100%)
rename src/{view => View}/ASubWindow.py (100%)
rename src/{view => View}/AboutWindow.py (85%)
rename src/{view => View}/ConfigureAddSolverWindow.py (95%)
rename src/{view => View}/ConfigureWindow.py (97%)
rename src/{view => View}/DummyWindow.py (85%)
rename src/{view => View}/ListedSubWindow.py (100%)
rename src/{view => View}/MainWindow.py (96%)
rename src/{view/network => View/Network}/GraphWidget.py (99%)
rename src/{view/network => View/Network}/TableModel.py (96%)
rename src/{view => View}/NetworkWindow.py (93%)
rename src/{view => View}/NewStudyWindow.py (92%)
rename src/{view => View}/ui/ConfigureAddSolverDialog.ui (100%)
rename src/{view => View}/ui/ConfigureDialog.ui (100%)
rename src/{view => View}/ui/MainWindow.ui (100%)
rename src/{view => View}/ui/MainWindow_old.ui (100%)
rename src/{view => View}/ui/Network.ui (100%)
rename src/{view => View}/ui/NewStudy.ui (100%)
rename src/{view => View}/ui/about.ui (100%)
rename src/{view => View}/ui/dummy.ui (100%)
rename src/{view => View}/ui/ressources/14_layer_visible.png (100%)
rename src/{view => View}/ui/ressources/Cemagref.gif (100%)
rename src/{view => View}/ui/ressources/Cemagref_apropos.gif (100%)
rename src/{view => View}/ui/ressources/Copie de Cemagref_apropos.gif (100%)
rename src/{view => View}/ui/ressources/M_icon.png (100%)
rename src/{view => View}/ui/ressources/bold.png (100%)
rename src/{view => View}/ui/ressources/cancel.png (100%)
rename src/{view => View}/ui/ressources/close.png (100%)
rename src/{view => View}/ui/ressources/color.png (100%)
rename src/{view => View}/ui/ressources/down.png (100%)
rename src/{view => View}/ui/ressources/edit.png (100%)
rename src/{view => View}/ui/ressources/edit2.png (100%)
rename src/{view => View}/ui/ressources/exit_bis.png (100%)
rename src/{view => View}/ui/ressources/export.png (100%)
rename src/{view => View}/ui/ressources/file.png (100%)
rename src/{view => View}/ui/ressources/font.png (100%)
rename src/{view => View}/ui/ressources/geometrie.png (100%)
rename src/{view => View}/ui/ressources/geometrie0.png (100%)
rename src/{view => View}/ui/ressources/geometrie_80.png (100%)
rename src/{view => View}/ui/ressources/geometrie_80_bis.png (100%)
rename src/{view => View}/ui/ressources/gnome-stock-edit.png (100%)
rename src/{view => View}/ui/ressources/gnome-stock-insert-table.png (100%)
rename src/{view => View}/ui/ressources/go-down.png (100%)
rename src/{view => View}/ui/ressources/go-down1.png (100%)
rename src/{view => View}/ui/ressources/go-up.png (100%)
rename src/{view => View}/ui/ressources/go-up1.png (100%)
rename src/{view => View}/ui/ressources/go-up2.png (100%)
rename src/{view => View}/ui/ressources/gtk-activer.png (100%)
rename src/{view => View}/ui/ressources/gtk-add.png (100%)
rename src/{view => View}/ui/ressources/gtk-apply.png (100%)
rename src/{view => View}/ui/ressources/gtk-close.png (100%)
rename src/{view => View}/ui/ressources/gtk-copy.png (100%)
rename src/{view => View}/ui/ressources/gtk-desactiver.png (100%)
rename src/{view => View}/ui/ressources/gtk-dialog-error.png (100%)
rename src/{view => View}/ui/ressources/gtk-dialog-warning.png (100%)
rename src/{view => View}/ui/ressources/gtk-dnd-multiple.png (100%)
rename src/{view => View}/ui/ressources/gtk-execute.png (100%)
rename src/{view => View}/ui/ressources/gtk-go-back.png (100%)
rename src/{view => View}/ui/ressources/gtk-go-forward.png (100%)
rename src/{view => View}/ui/ressources/gtk-help.png (100%)
rename src/{view => View}/ui/ressources/gtk-new.png (100%)
rename src/{view => View}/ui/ressources/gtk-ok.png (100%)
rename src/{view => View}/ui/ressources/gtk-open.png (100%)
rename src/{view => View}/ui/ressources/gtk-paste.png (100%)
rename src/{view => View}/ui/ressources/gtk-print.png (100%)
rename src/{view => View}/ui/ressources/gtk-quit.png (100%)
rename src/{view => View}/ui/ressources/gtk-refresh.PNG (100%)
rename src/{view => View}/ui/ressources/gtk-remove.png (100%)
rename src/{view => View}/ui/ressources/gtk-save-as.png (100%)
rename src/{view => View}/ui/ressources/gtk-save.png (100%)
rename src/{view => View}/ui/ressources/gtk-select-color.png (100%)
rename src/{view => View}/ui/ressources/gtk-sort-ascending.png (100%)
rename src/{view => View}/ui/ressources/gtk-sort-descending.png (100%)
rename src/{view => View}/ui/ressources/gtk-stop.png (100%)
rename src/{view => View}/ui/ressources/gtk-undo.png (100%)
rename src/{view => View}/ui/ressources/gtk-zoom-100.png (100%)
rename src/{view => View}/ui/ressources/gtk-zoom-fit.png (100%)
rename src/{view => View}/ui/ressources/gtk-zoom-in.png (100%)
rename src/{view => View}/ui/ressources/gtk-zoom-out.png (100%)
rename src/{view => View}/ui/ressources/gtk_add.png (100%)
rename src/{view => View}/ui/ressources/image989.png (100%)
rename src/{view => View}/ui/ressources/italic.png (100%)
rename src/{view => View}/ui/ressources/justifyCenter.png (100%)
rename src/{view => View}/ui/ressources/justifyLeft.png (100%)
rename src/{view => View}/ui/ressources/justifyRight.png (100%)
rename src/{view => View}/ui/ressources/linetool.png (100%)
rename src/{view => View}/ui/ressources/logoCemagref.gif (100%)
rename src/{view => View}/ui/ressources/logoIsima.gif (100%)
rename src/{view => View}/ui/ressources/mailles-50.png (100%)
rename src/{view => View}/ui/ressources/new.png (100%)
rename src/{view => View}/ui/ressources/no_icone.PNG (100%)
rename src/{view => View}/ui/ressources/noeud_amont.PNG (100%)
rename src/{view => View}/ui/ressources/noeud_amont.gif (100%)
rename src/{view => View}/ui/ressources/noeud_aval.PNG (100%)
rename src/{view => View}/ui/ressources/noeud_aval.gif (100%)
rename src/{view => View}/ui/ressources/noeud_desact.PNG (100%)
rename src/{view => View}/ui/ressources/noeud_desact.gif (100%)
rename src/{view => View}/ui/ressources/noeud_int.PNG (100%)
rename src/{view => View}/ui/ressources/noeud_int.gif (100%)
rename src/{view => View}/ui/ressources/noeud_int_hs.PNG (100%)
rename src/{view => View}/ui/ressources/noeud_int_hs.gif (100%)
rename src/{view => View}/ui/ressources/open.png (100%)
rename src/{view => View}/ui/ressources/player_pause.png (100%)
rename src/{view => View}/ui/ressources/player_play.png (100%)
rename src/{view => View}/ui/ressources/query_erase.png (100%)
rename src/{view => View}/ui/ressources/reseau.png (100%)
rename src/{view => View}/ui/ressources/reseau1.jpg (100%)
rename src/{view => View}/ui/ressources/reseau2.png (100%)
rename src/{view => View}/ui/ressources/reseau3.png (100%)
rename src/{view => View}/ui/ressources/reseau3_100.png (100%)
rename src/{view => View}/ui/ressources/reseau3_24.png (100%)
rename src/{view => View}/ui/ressources/reseau4.png (100%)
rename src/{view => View}/ui/ressources/reseau_2.svg (100%)
rename src/{view => View}/ui/ressources/reseau_2_svgsimple.svg (100%)
rename src/{view => View}/ui/ressources/save.png (100%)
rename src/{view => View}/ui/ressources/strikethrough.png (100%)
rename src/{view => View}/ui/ressources/test3_graph_24x24.png (100%)
rename src/{view => View}/ui/ressources/test_graph_24x24.png (100%)
rename src/{view => View}/ui/ressources/underline.png (100%)
rename src/{view => View}/ui/ressources/up.png (100%)
rename src/{view => View}/ui/ressources/xX.png (100%)
rename src/{view => View}/ui/ressources/xX.svg (100%)
rename src/{view => View}/ui/ressources/xX_.png (100%)
rename src/{view => View}/ui/ressources/x_coiss.png (100%)
rename src/{view => View}/ui/ressources/zoom.png (100%)
rename src/{view => View}/ui/ressources/zoom_fit.png (100%)
rename src/{view => View}/ui/ressources/zoom_fit_11.png (100%)
rename src/{view => View}/ui/ui_to_py.sh (100%)
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 8b77c74c..09b2cb7b 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 d5a080d3..6e17c4ad 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 c0fc06c5..32bff349 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 47977bb8..7363d026 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 b756f7c0..03e53daa 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 03f3db62..9f84ad86 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 47099b1d..feacb54f 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 551bf3fa..80ef05af 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 a0cd038f..576b5188 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 fc14fa6c..1a4af585 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 6cb69358..8692fb91 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 8108e3bc..1bf0e5b4 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 de4a3f99..84940436 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 7de5cf0b..905815ea 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 1ca646ac..b56d0af9 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()
--
GitLab