Commit b23417b82c193308676a82a74538d434c4811db1
1 parent
575009da
Exists in
dev
Restructuration du projet - phase 5b :
/src/devices_controller/ => réorganisation interne 2/2 : - create folder devices_controller/devices_controller_concrete/ - migrer le dossier devices_controller/server/ => devices_controller/devices_controller_concrete/server/ - rename server/ => device_simulator_common/ - Deplacement de tous les devices concrets dans leurs dossiers respectifs (Gemini, AK, ...)
Showing
5 changed files
with
20 additions
and
11 deletions
Show diff stats
README.md
| ... | ... | @@ -42,7 +42,7 @@ This software has been tested and validated with the following configurations : |
| 42 | 42 | - Apache 2.4.10 |
| 43 | 43 | |
| 44 | 44 | -------------------------------------------------------------------------------------------- |
| 45 | -## Project structure | |
| 45 | +## Project structure (OBSOLETE) | |
| 46 | 46 | |
| 47 | 47 | - src/ : conteneur du projet (le nom est sans importance) |
| 48 | 48 | - manage.py : utilitaire en ligne de commande permettant differentes actions sur le projet |
| ... | ... | @@ -71,15 +71,14 @@ Date: 17/06/2019 |
| 71 | 71 | |
| 72 | 72 | Author: E. Pallier (epallier@irap.omp.eu) |
| 73 | 73 | |
| 74 | -VERSION: 0.30.8 | |
| 74 | +VERSION: 0.30.9 | |
| 75 | 75 | |
| 76 | 76 | Comment : |
| 77 | - | |
| 78 | -TODO (coming) : | |
| 79 | 77 | - Restructuration du projet - phase 5b : /src/devices_controller/ => réorganisation interne 2/2 : |
| 80 | 78 | - create folder devices_controller/devices_controller_concrete/ |
| 81 | 79 | - migrer le dossier devices_controller/server/ => devices_controller/devices_controller_concrete/server/ |
| 82 | 80 | - rename server/ => device_simulator_common/ |
| 81 | +- Deplacement de tous les devices concrets dans leurs dossiers respectifs (Gemini, AK, ...) | |
| 83 | 82 | |
| 84 | 83 | |
| 85 | 84 | RAPPELS SUR L'UTILISATION : |
| ... | ... | @@ -116,7 +115,7 @@ Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master |
| 116 | 115 | |
| 117 | 116 | (The new official changes history is here : https://tinyurl.com/pyros-dev#heading=h.2r55bflctpt5) |
| 118 | 117 | |
| 119 | -**12/06-17/06/2019 : v0.30.3-8 (EP)** | |
| 118 | +**12/06-17/06/2019 : v0.30.3-9 (EP)** | |
| 120 | 119 | - Restructuration du projet - phase 1 : /src/ => /pyros_django/ |
| 121 | 120 | - Restructuration du projet - phase 2 : /pyros_django/ => /src/core/pyros_django/ |
| 122 | 121 | - Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/ |
| ... | ... | @@ -130,7 +129,8 @@ Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master |
| 130 | 129 | - Restructuration du projet - phase 5b : /src/devices_controller/ => réorganisation interne 2/2 : |
| 131 | 130 | - create folder devices_controller/devices_controller_concrete/ |
| 132 | 131 | - migrer le dossier devices_controller/server/ => devices_controller/devices_controller_concrete/server/ |
| 133 | - - rename server/ => device_simulator_common/ | |
| 132 | + - rename server/ => device_simulator_common/ | |
| 133 | + - Deplacement de tous les devices concrets dans leurs dossiers respectifs (Gemini, AK, ...) | |
| 134 | 134 | |
| 135 | 135 | **11/06/2019 : v0.30.2 (EP)** |
| 136 | 136 | - Ajouté options "test" et "testall" dans pyros.py pour exécution des (anciens) tests unitaires | ... | ... |
src/core/pyros_django/agent/AgentDevice.py
| ... | ... | @@ -9,7 +9,7 @@ import time |
| 9 | 9 | sys.path.append("..") |
| 10 | 10 | from agent.Agent import Agent, extract_parameters |
| 11 | 11 | from common.models import AgentDeviceTelescopeStatus, get_or_create_unique_row_from_model |
| 12 | -from devices_controller.telescope_controller_gemini import TelescopeControllerGEMINI | |
| 12 | +from devices_controller.devices_controller_concrete.device_controller_Gemini.telescope_controller_gemini import TelescopeControllerGEMINI | |
| 13 | 13 | |
| 14 | 14 | ##log = L.setupLogger("AgentXTaskLogger", "AgentX") |
| 15 | 15 | ... | ... |
src/devices_controller/devices_controller_abstract_component/telescope_controller_abstract.py
src/devices_controller/devices_controller_concrete/device_controller_Gemini/client_telescope_controller_gemini_run.py
| ... | ... | @@ -5,8 +5,16 @@ import pprint |
| 5 | 5 | import sys |
| 6 | 6 | |
| 7 | 7 | |
| 8 | -sys.path.append("..") | |
| 9 | -from devices_controller.telescope_controller_gemini import TelescopeControllerGEMINI | |
| 8 | +''' | |
| 9 | +(1) | |
| 10 | +sys.path.append("../../..") | |
| 11 | +from devices_controller.devices_controller_concrete.device_controller_Gemini.telescope_controller_gemini import TelescopeControllerGEMINI | |
| 12 | +ou (2) | |
| 13 | +#sys.path.append("..") | |
| 14 | +#from device_controller_Gemini.telescope_controller_gemini import TelescopeControllerGEMINI | |
| 15 | +ou (3) | |
| 16 | +''' | |
| 17 | +from telescope_controller_gemini import TelescopeControllerGEMINI | |
| 10 | 18 | |
| 11 | 19 | #DEBUG = False |
| 12 | 20 | DEBUG = True | ... | ... |
src/devices_controller/devices_controller_concrete/device_controller_Gemini/telescope_controller_gemini.py
| ... | ... | @@ -14,9 +14,10 @@ import time |
| 14 | 14 | # None |
| 15 | 15 | |
| 16 | 16 | # Local application imports |
| 17 | -sys.path.append('../..') | |
| 17 | +sys.path.append('../../..') | |
| 18 | 18 | #from src.client.socket_client_telescope_abstract import Position, UnknownCommandException, TimeoutException, SocketClientTelescopeAbstract |
| 19 | 19 | ##from src_socket.client.socket_client_telescope_abstract import * |
| 20 | +#from devices_controller.devices_controller_abstract_component.telescope_controller_abstract import * | |
| 20 | 21 | from devices_controller.devices_controller_abstract_component.telescope_controller_abstract import * |
| 21 | 22 | |
| 22 | 23 | # Default timeouts | ... | ... |