From 3946ebc660013fb3942062b6817780959b228a18 Mon Sep 17 00:00:00 2001 From: Piv <18462828+Piv200@users.noreply.github.com> Date: Sun, 19 Apr 2020 12:30:00 +0930 Subject: [PATCH] Move car python code into src subdirectory --- car/.gitignore | 7 ------- car/build.gradle | 6 +++++- car/generate-proto | 3 --- car/setup.py | 3 ++- .../DecisionSystem/CentralisedDecision/__init__.py | 0 .../CentralisedDecision/ballotvoter.py | 0 .../CentralisedDecision/cameraserver.py | 0 .../CentralisedDecision/central_server.py | 0 .../CentralisedDecision/centralisedinstance.py | 0 .../DecisionSystem/CentralisedDecision/commander.py | 0 .../DecisionSystem/CentralisedDecision/messenger.py | 0 .../DecisionSystem/CentralisedDecision/videoget.py | 0 .../DecentralisedActivityFusion/voter.py | 0 car/{ => src}/DecisionSystem/__init__.py | 0 car/{ => src}/DecisionSystem/messages.py | 0 car/{ => src}/GestureRecognition/HandRecHSV.py | 0 car/{ => src}/GestureRecognition/HandRecV2.py | 0 car/{ => src}/GestureRecognition/IMG_0818.png | Bin car/{ => src}/GestureRecognition/IMG_0825.jpg | Bin .../Neural Network hand Tracking.pdf | Bin .../GestureRecognition/SimpleHandRecogniser.py | 0 car/{ => src}/GestureRecognition/__init__.py | 0 .../GestureRecognition/frozen_inference_graph.pb | Bin car/{ => src}/GestureRecognition/graph.pbtxt | 0 car/{ => src}/GestureRecognition/handrecogniser.py | 0 car/{ => src}/GestureRecognition/kaleidoscope.py | 0 car/{ => src}/GestureRecognition/keras_ex.py | 0 .../GestureRecognition/opencvtensorflowex.py | 0 car/{ => src}/GestureRecognition/starkaleid.py | 0 car/{ => src}/Messaging/__init__.py | 0 car/{ => src}/Messaging/message_factory.py | 0 car/{ => src}/Messaging/messages.py | 0 car/{ => src}/Messaging/mqttsession.py | 0 car/{ => src}/__init__.py | 0 car/{ => src}/control/PythonRemoteController.py | 0 car/{ => src}/control/__init__.py | 0 car/{ => src}/control/gpio/__init__.py | 0 car/{ => src}/control/gpio/mockvehicle.py | 0 car/{ => src}/control/gpio/vehicle.py | 0 car/{ => src}/control/motor_servicer.py | 0 car/{ => src}/controller.py | 0 car/{ => src}/slam/__init__.py | 0 car/{ => src}/slam/slam_servicer.py | 0 car/{ => src}/slam/slam_streamer.py | 0 car/{ => src}/slam/zmq_pair_testing/pair.py | 0 car/{ => src}/tracking/__init__.py | 0 car/{ => src}/tracking/algorithms.py | 0 car/{ => src}/tracking/all_scans.txt | Bin car/{ => src}/tracking/animate.py | 0 car/{ => src}/tracking/animate_alg.py | 0 car/{ => src}/tracking/devices/__init__.py | 0 car/{ => src}/tracking/devices/factory.py | 0 car/{ => src}/tracking/devices/mock_lidar.py | 0 car/{ => src}/tracking/lidar_cache.py | 0 car/{ => src}/tracking/lidar_loader.py | 0 car/{ => src}/tracking/lidar_servicer.py | 0 car/{ => src}/tracking/lidar_tester.py | 0 car/{ => src}/tracking/out.pickle | Bin car/{ => src}/tracking/readme.txt | 0 59 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 car/.gitignore delete mode 100755 car/generate-proto rename car/{ => src}/DecisionSystem/CentralisedDecision/__init__.py (100%) rename car/{ => src}/DecisionSystem/CentralisedDecision/ballotvoter.py (100%) rename car/{ => src}/DecisionSystem/CentralisedDecision/cameraserver.py (100%) rename car/{ => src}/DecisionSystem/CentralisedDecision/central_server.py (100%) rename car/{ => src}/DecisionSystem/CentralisedDecision/centralisedinstance.py (100%) rename car/{ => src}/DecisionSystem/CentralisedDecision/commander.py (100%) rename car/{ => src}/DecisionSystem/CentralisedDecision/messenger.py (100%) rename car/{ => src}/DecisionSystem/CentralisedDecision/videoget.py (100%) rename car/{ => src}/DecisionSystem/DecentralisedActivityFusion/voter.py (100%) rename car/{ => src}/DecisionSystem/__init__.py (100%) rename car/{ => src}/DecisionSystem/messages.py (100%) rename car/{ => src}/GestureRecognition/HandRecHSV.py (100%) rename car/{ => src}/GestureRecognition/HandRecV2.py (100%) rename car/{ => src}/GestureRecognition/IMG_0818.png (100%) rename car/{ => src}/GestureRecognition/IMG_0825.jpg (100%) rename car/{ => src}/GestureRecognition/Neural Network hand Tracking.pdf (100%) rename car/{ => src}/GestureRecognition/SimpleHandRecogniser.py (100%) rename car/{ => src}/GestureRecognition/__init__.py (100%) rename car/{ => src}/GestureRecognition/frozen_inference_graph.pb (100%) rename car/{ => src}/GestureRecognition/graph.pbtxt (100%) rename car/{ => src}/GestureRecognition/handrecogniser.py (100%) rename car/{ => src}/GestureRecognition/kaleidoscope.py (100%) rename car/{ => src}/GestureRecognition/keras_ex.py (100%) rename car/{ => src}/GestureRecognition/opencvtensorflowex.py (100%) rename car/{ => src}/GestureRecognition/starkaleid.py (100%) rename car/{ => src}/Messaging/__init__.py (100%) rename car/{ => src}/Messaging/message_factory.py (100%) rename car/{ => src}/Messaging/messages.py (100%) rename car/{ => src}/Messaging/mqttsession.py (100%) rename car/{ => src}/__init__.py (100%) rename car/{ => src}/control/PythonRemoteController.py (100%) rename car/{ => src}/control/__init__.py (100%) rename car/{ => src}/control/gpio/__init__.py (100%) rename car/{ => src}/control/gpio/mockvehicle.py (100%) rename car/{ => src}/control/gpio/vehicle.py (100%) rename car/{ => src}/control/motor_servicer.py (100%) rename car/{ => src}/controller.py (100%) rename car/{ => src}/slam/__init__.py (100%) rename car/{ => src}/slam/slam_servicer.py (100%) rename car/{ => src}/slam/slam_streamer.py (100%) rename car/{ => src}/slam/zmq_pair_testing/pair.py (100%) rename car/{ => src}/tracking/__init__.py (100%) rename car/{ => src}/tracking/algorithms.py (100%) rename car/{ => src}/tracking/all_scans.txt (100%) rename car/{ => src}/tracking/animate.py (100%) rename car/{ => src}/tracking/animate_alg.py (100%) rename car/{ => src}/tracking/devices/__init__.py (100%) rename car/{ => src}/tracking/devices/factory.py (100%) rename car/{ => src}/tracking/devices/mock_lidar.py (100%) rename car/{ => src}/tracking/lidar_cache.py (100%) rename car/{ => src}/tracking/lidar_loader.py (100%) rename car/{ => src}/tracking/lidar_servicer.py (100%) rename car/{ => src}/tracking/lidar_tester.py (100%) rename car/{ => src}/tracking/out.pickle (100%) rename car/{ => src}/tracking/readme.txt (100%) diff --git a/car/.gitignore b/car/.gitignore deleted file mode 100644 index 52005fc..0000000 --- a/car/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -**/*env -**.vscode -**.DS_STORE -**/__pycache__ -build -dist -CarController.egg-info \ No newline at end of file diff --git a/car/build.gradle b/car/build.gradle index 9f1b034..43e3d4b 100644 --- a/car/build.gradle +++ b/car/build.gradle @@ -12,5 +12,9 @@ dependencies { task copyPythonCode(type: Copy, dependsOn: configurations.python){ // Copy python protobuf code from proto project. from zipTree(configurations.python.asPath) - into '.' + into './src' +} + +task build(type: Exec, dependsOn: copyPythonCode) { + commandLine 'python3', 'setup.py', 'bdist_wheel' } \ No newline at end of file diff --git a/car/generate-proto b/car/generate-proto deleted file mode 100755 index 6ca8031..0000000 --- a/car/generate-proto +++ /dev/null @@ -1,3 +0,0 @@ -python3 -m grpc_tools.protoc -I proto --python_out=. --grpc_python_out=. proto/control/motorService.proto -python3 -m grpc_tools.protoc -I proto --python_out=. --grpc_python_out=. proto/slam/SlamController.proto -python3 -m grpc_tools.protoc -I proto --python_out=. --grpc_python_out=. proto/tracking/lidar_tracker.proto \ No newline at end of file diff --git a/car/setup.py b/car/setup.py index 7a9facf..549520c 100644 --- a/car/setup.py +++ b/car/setup.py @@ -2,7 +2,8 @@ from setuptools import setup, find_packages setup( name="CarController", - packages=find_packages(), + package_dir={'': 'src'}, + packages=find_packages('src'), author="Michael Pivato", version="0.1" ) \ No newline at end of file diff --git a/car/DecisionSystem/CentralisedDecision/__init__.py b/car/src/DecisionSystem/CentralisedDecision/__init__.py similarity index 100% rename from car/DecisionSystem/CentralisedDecision/__init__.py rename to car/src/DecisionSystem/CentralisedDecision/__init__.py diff --git a/car/DecisionSystem/CentralisedDecision/ballotvoter.py b/car/src/DecisionSystem/CentralisedDecision/ballotvoter.py similarity index 100% rename from car/DecisionSystem/CentralisedDecision/ballotvoter.py rename to car/src/DecisionSystem/CentralisedDecision/ballotvoter.py diff --git a/car/DecisionSystem/CentralisedDecision/cameraserver.py b/car/src/DecisionSystem/CentralisedDecision/cameraserver.py similarity index 100% rename from car/DecisionSystem/CentralisedDecision/cameraserver.py rename to car/src/DecisionSystem/CentralisedDecision/cameraserver.py diff --git a/car/DecisionSystem/CentralisedDecision/central_server.py b/car/src/DecisionSystem/CentralisedDecision/central_server.py similarity index 100% rename from car/DecisionSystem/CentralisedDecision/central_server.py rename to car/src/DecisionSystem/CentralisedDecision/central_server.py diff --git a/car/DecisionSystem/CentralisedDecision/centralisedinstance.py b/car/src/DecisionSystem/CentralisedDecision/centralisedinstance.py similarity index 100% rename from car/DecisionSystem/CentralisedDecision/centralisedinstance.py rename to car/src/DecisionSystem/CentralisedDecision/centralisedinstance.py diff --git a/car/DecisionSystem/CentralisedDecision/commander.py b/car/src/DecisionSystem/CentralisedDecision/commander.py similarity index 100% rename from car/DecisionSystem/CentralisedDecision/commander.py rename to car/src/DecisionSystem/CentralisedDecision/commander.py diff --git a/car/DecisionSystem/CentralisedDecision/messenger.py b/car/src/DecisionSystem/CentralisedDecision/messenger.py similarity index 100% rename from car/DecisionSystem/CentralisedDecision/messenger.py rename to car/src/DecisionSystem/CentralisedDecision/messenger.py diff --git a/car/DecisionSystem/CentralisedDecision/videoget.py b/car/src/DecisionSystem/CentralisedDecision/videoget.py similarity index 100% rename from car/DecisionSystem/CentralisedDecision/videoget.py rename to car/src/DecisionSystem/CentralisedDecision/videoget.py diff --git a/car/DecisionSystem/DecentralisedActivityFusion/voter.py b/car/src/DecisionSystem/DecentralisedActivityFusion/voter.py similarity index 100% rename from car/DecisionSystem/DecentralisedActivityFusion/voter.py rename to car/src/DecisionSystem/DecentralisedActivityFusion/voter.py diff --git a/car/DecisionSystem/__init__.py b/car/src/DecisionSystem/__init__.py similarity index 100% rename from car/DecisionSystem/__init__.py rename to car/src/DecisionSystem/__init__.py diff --git a/car/DecisionSystem/messages.py b/car/src/DecisionSystem/messages.py similarity index 100% rename from car/DecisionSystem/messages.py rename to car/src/DecisionSystem/messages.py diff --git a/car/GestureRecognition/HandRecHSV.py b/car/src/GestureRecognition/HandRecHSV.py similarity index 100% rename from car/GestureRecognition/HandRecHSV.py rename to car/src/GestureRecognition/HandRecHSV.py diff --git a/car/GestureRecognition/HandRecV2.py b/car/src/GestureRecognition/HandRecV2.py similarity index 100% rename from car/GestureRecognition/HandRecV2.py rename to car/src/GestureRecognition/HandRecV2.py diff --git a/car/GestureRecognition/IMG_0818.png b/car/src/GestureRecognition/IMG_0818.png similarity index 100% rename from car/GestureRecognition/IMG_0818.png rename to car/src/GestureRecognition/IMG_0818.png diff --git a/car/GestureRecognition/IMG_0825.jpg b/car/src/GestureRecognition/IMG_0825.jpg similarity index 100% rename from car/GestureRecognition/IMG_0825.jpg rename to car/src/GestureRecognition/IMG_0825.jpg diff --git a/car/GestureRecognition/Neural Network hand Tracking.pdf b/car/src/GestureRecognition/Neural Network hand Tracking.pdf similarity index 100% rename from car/GestureRecognition/Neural Network hand Tracking.pdf rename to car/src/GestureRecognition/Neural Network hand Tracking.pdf diff --git a/car/GestureRecognition/SimpleHandRecogniser.py b/car/src/GestureRecognition/SimpleHandRecogniser.py similarity index 100% rename from car/GestureRecognition/SimpleHandRecogniser.py rename to car/src/GestureRecognition/SimpleHandRecogniser.py diff --git a/car/GestureRecognition/__init__.py b/car/src/GestureRecognition/__init__.py similarity index 100% rename from car/GestureRecognition/__init__.py rename to car/src/GestureRecognition/__init__.py diff --git a/car/GestureRecognition/frozen_inference_graph.pb b/car/src/GestureRecognition/frozen_inference_graph.pb similarity index 100% rename from car/GestureRecognition/frozen_inference_graph.pb rename to car/src/GestureRecognition/frozen_inference_graph.pb diff --git a/car/GestureRecognition/graph.pbtxt b/car/src/GestureRecognition/graph.pbtxt similarity index 100% rename from car/GestureRecognition/graph.pbtxt rename to car/src/GestureRecognition/graph.pbtxt diff --git a/car/GestureRecognition/handrecogniser.py b/car/src/GestureRecognition/handrecogniser.py similarity index 100% rename from car/GestureRecognition/handrecogniser.py rename to car/src/GestureRecognition/handrecogniser.py diff --git a/car/GestureRecognition/kaleidoscope.py b/car/src/GestureRecognition/kaleidoscope.py similarity index 100% rename from car/GestureRecognition/kaleidoscope.py rename to car/src/GestureRecognition/kaleidoscope.py diff --git a/car/GestureRecognition/keras_ex.py b/car/src/GestureRecognition/keras_ex.py similarity index 100% rename from car/GestureRecognition/keras_ex.py rename to car/src/GestureRecognition/keras_ex.py diff --git a/car/GestureRecognition/opencvtensorflowex.py b/car/src/GestureRecognition/opencvtensorflowex.py similarity index 100% rename from car/GestureRecognition/opencvtensorflowex.py rename to car/src/GestureRecognition/opencvtensorflowex.py diff --git a/car/GestureRecognition/starkaleid.py b/car/src/GestureRecognition/starkaleid.py similarity index 100% rename from car/GestureRecognition/starkaleid.py rename to car/src/GestureRecognition/starkaleid.py diff --git a/car/Messaging/__init__.py b/car/src/Messaging/__init__.py similarity index 100% rename from car/Messaging/__init__.py rename to car/src/Messaging/__init__.py diff --git a/car/Messaging/message_factory.py b/car/src/Messaging/message_factory.py similarity index 100% rename from car/Messaging/message_factory.py rename to car/src/Messaging/message_factory.py diff --git a/car/Messaging/messages.py b/car/src/Messaging/messages.py similarity index 100% rename from car/Messaging/messages.py rename to car/src/Messaging/messages.py diff --git a/car/Messaging/mqttsession.py b/car/src/Messaging/mqttsession.py similarity index 100% rename from car/Messaging/mqttsession.py rename to car/src/Messaging/mqttsession.py diff --git a/car/__init__.py b/car/src/__init__.py similarity index 100% rename from car/__init__.py rename to car/src/__init__.py diff --git a/car/control/PythonRemoteController.py b/car/src/control/PythonRemoteController.py similarity index 100% rename from car/control/PythonRemoteController.py rename to car/src/control/PythonRemoteController.py diff --git a/car/control/__init__.py b/car/src/control/__init__.py similarity index 100% rename from car/control/__init__.py rename to car/src/control/__init__.py diff --git a/car/control/gpio/__init__.py b/car/src/control/gpio/__init__.py similarity index 100% rename from car/control/gpio/__init__.py rename to car/src/control/gpio/__init__.py diff --git a/car/control/gpio/mockvehicle.py b/car/src/control/gpio/mockvehicle.py similarity index 100% rename from car/control/gpio/mockvehicle.py rename to car/src/control/gpio/mockvehicle.py diff --git a/car/control/gpio/vehicle.py b/car/src/control/gpio/vehicle.py similarity index 100% rename from car/control/gpio/vehicle.py rename to car/src/control/gpio/vehicle.py diff --git a/car/control/motor_servicer.py b/car/src/control/motor_servicer.py similarity index 100% rename from car/control/motor_servicer.py rename to car/src/control/motor_servicer.py diff --git a/car/controller.py b/car/src/controller.py similarity index 100% rename from car/controller.py rename to car/src/controller.py diff --git a/car/slam/__init__.py b/car/src/slam/__init__.py similarity index 100% rename from car/slam/__init__.py rename to car/src/slam/__init__.py diff --git a/car/slam/slam_servicer.py b/car/src/slam/slam_servicer.py similarity index 100% rename from car/slam/slam_servicer.py rename to car/src/slam/slam_servicer.py diff --git a/car/slam/slam_streamer.py b/car/src/slam/slam_streamer.py similarity index 100% rename from car/slam/slam_streamer.py rename to car/src/slam/slam_streamer.py diff --git a/car/slam/zmq_pair_testing/pair.py b/car/src/slam/zmq_pair_testing/pair.py similarity index 100% rename from car/slam/zmq_pair_testing/pair.py rename to car/src/slam/zmq_pair_testing/pair.py diff --git a/car/tracking/__init__.py b/car/src/tracking/__init__.py similarity index 100% rename from car/tracking/__init__.py rename to car/src/tracking/__init__.py diff --git a/car/tracking/algorithms.py b/car/src/tracking/algorithms.py similarity index 100% rename from car/tracking/algorithms.py rename to car/src/tracking/algorithms.py diff --git a/car/tracking/all_scans.txt b/car/src/tracking/all_scans.txt similarity index 100% rename from car/tracking/all_scans.txt rename to car/src/tracking/all_scans.txt diff --git a/car/tracking/animate.py b/car/src/tracking/animate.py similarity index 100% rename from car/tracking/animate.py rename to car/src/tracking/animate.py diff --git a/car/tracking/animate_alg.py b/car/src/tracking/animate_alg.py similarity index 100% rename from car/tracking/animate_alg.py rename to car/src/tracking/animate_alg.py diff --git a/car/tracking/devices/__init__.py b/car/src/tracking/devices/__init__.py similarity index 100% rename from car/tracking/devices/__init__.py rename to car/src/tracking/devices/__init__.py diff --git a/car/tracking/devices/factory.py b/car/src/tracking/devices/factory.py similarity index 100% rename from car/tracking/devices/factory.py rename to car/src/tracking/devices/factory.py diff --git a/car/tracking/devices/mock_lidar.py b/car/src/tracking/devices/mock_lidar.py similarity index 100% rename from car/tracking/devices/mock_lidar.py rename to car/src/tracking/devices/mock_lidar.py diff --git a/car/tracking/lidar_cache.py b/car/src/tracking/lidar_cache.py similarity index 100% rename from car/tracking/lidar_cache.py rename to car/src/tracking/lidar_cache.py diff --git a/car/tracking/lidar_loader.py b/car/src/tracking/lidar_loader.py similarity index 100% rename from car/tracking/lidar_loader.py rename to car/src/tracking/lidar_loader.py diff --git a/car/tracking/lidar_servicer.py b/car/src/tracking/lidar_servicer.py similarity index 100% rename from car/tracking/lidar_servicer.py rename to car/src/tracking/lidar_servicer.py diff --git a/car/tracking/lidar_tester.py b/car/src/tracking/lidar_tester.py similarity index 100% rename from car/tracking/lidar_tester.py rename to car/src/tracking/lidar_tester.py diff --git a/car/tracking/out.pickle b/car/src/tracking/out.pickle similarity index 100% rename from car/tracking/out.pickle rename to car/src/tracking/out.pickle diff --git a/car/tracking/readme.txt b/car/src/tracking/readme.txt similarity index 100% rename from car/tracking/readme.txt rename to car/src/tracking/readme.txt