#187 integrate prototype code into original codeline

aws-deepracer-community · Mar 12, 2023 · 463d34f · 463d34f
1 parent 5ba6f3c
commit 463d34f
Show file tree

Hide file tree

Showing 24 changed files with 186 additions and 1,535 deletions.
diff --git a/src/analyze/util/heatmap.py b/src/analyze/util/heatmap.py
@@ -9,7 +9,7 @@
 import typing
 import numpy as np
 
-from src.graphics.track_graphics import TrackGraphics
+from src.graphics.track_graphics_old_v3 import TrackGraphics
 from src.utils.colors import get_color_for_data, ColorPalette
 
 

diff --git a/src/analyze/util/visitor.py b/src/analyze/util/visitor.py
@@ -6,8 +6,7 @@
 # Copyright (c) 2021 dmh23
 #
 
-from src.graphics.track_graphics import TrackGraphics
-import math
+from src.graphics.track_graphics_old_v3 import TrackGraphics
 
 from src.utils.colors import get_color_for_data, ColorPalette
 

diff --git a/src/prototype_ui/canvas.py → src/graphics/canvas.py b/src/prototype_ui/canvas.py → src/graphics/canvas.py
@@ -1,3 +1,6 @@
+# v4 UI STATUS - BRAND NEW
+# ************************
+
 from abc import abstractmethod
 
 from PyQt6.QtWidgets import QGraphicsScene, QGraphicsView, QGraphicsRectItem, QGraphicsPixmapItem, \

diff --git a/src/prototype_ui/track_analysis_canvas.py → src/graphics/track_analysis_canvas.py b/src/prototype_ui/track_analysis_canvas.py → src/graphics/track_analysis_canvas.py
@@ -1,11 +1,12 @@
-from abc import ABC
+# v4 UI STATUS - BRAND NEW
+# ************************
 
-from PyQt6.uic.properties import QtGui
+from abc import ABC
 
-from prototype_ui.canvas import Canvas
-from PyQt6.QtWidgets import QGraphicsRectItem, QAbstractGraphicsShapeItem
-from PyQt6.QtGui import QBrush, QPen, QPainter, QColor
-from PyQt6.QtCore import Qt, QPointF, QPoint
+from graphics.canvas import Canvas
+from PyQt6.QtWidgets import QAbstractGraphicsShapeItem
+from PyQt6.QtGui import QPen, QPainter
+from PyQt6.QtCore import Qt
 
 Point = (float | int, float | int)     # Typedef which we will use a lot for graphics
 

diff --git a/src/graphics/track_annotations.py b/src/graphics/track_annotations.py
@@ -6,12 +6,14 @@
 # Copyright (c) 2021 dmh23
 #
 
-from src.graphics.track_graphics import TrackGraphics
+from src.graphics.track_graphics_old_v3 import TrackGraphics
+
 
 class Annotation:
     def draw(self, track_graphics: TrackGraphics, track_drawing_points, track_width):
         pass # Override in child classes
 
+
 def get_exact_point_(drawing_points, track_width, waypoint_id: int, side, distance_from_centre):
     points = drawing_points[waypoint_id]
 

diff --git a/src/graphics/track_graphics.py → src/graphics/track_graphics_old_v3.py b/src/graphics/track_graphics.py → src/graphics/track_graphics_old_v3.py
diff --git a/src/log/log_meta.py b/src/log/log_meta.py
@@ -14,7 +14,7 @@
 from src.action_space.action_space import ActionSpace
 from src.log.meta_field import MetaField, MetaFields, Optionality
 
-LOG_META_VERSION = "4.0.0.DRAFT"
+LOG_META_VERSION = "4.0.0.DRAFTxx"
 
 MANDATORY = Optionality.MANDATORY
 OPTIONAL = Optionality.OPTIONAL

diff --git a/src/log/log_utils.py b/src/log/log_utils.py
@@ -1,3 +1,6 @@
+# v4 UI STATUS - CONVERSION IN PROGRESS
+# *************************************
+
 #
 # DeepRacer Guru
 #

diff --git a/src/main/version.py b/src/main/version.py
@@ -6,4 +6,4 @@
 # Copyright (c) 2021 dmh23
 #
 
-VERSION = "3.2.18"
+VERSION = "VERSION 4 PROTOTYPE"
diff --git a/src/prototype_ui/hot_rod_super_speedway_cw_track.py b/src/prototype_ui/hot_rod_super_speedway_cw_track.py