Merge pull request #5 from Tesla2000/feature/text

Tesla2000 · web-flow · commit 90b288083838 · 2024-03-23T23:14:41.000+01:00
Feature/text
diff --git a/Config.py b/Config.py
@@ -12,6 +12,9 @@ class _VideoElements:
 
 
 class Config(_VideoElements):
+    font_size = 12
+    font_path = "DejaVuSans"
+    color = "black"
     default_height = 100
     default_width = 50
     symbol_write_speed = 10
@@ -22,20 +25,20 @@ class Config(_VideoElements):
     # start_x = -300
     start_y = 280
 
-    model = "tts-1-hd"
-    voice = "nova"
+    model = "tts-1"
+    voice = "alloy"
 
     root = Path(__file__).parent
-    open_ai_token = root.joinpath('open_ai_token').read_text()
+    open_ai_token = root.joinpath("open_ai_token").read_text()
     os.environ.setdefault("OPENAI_API_KEY", open_ai_token)
     temporary_picture = root / ".ps"
-    temp_filename = str(root / '.mp4')
-    images = root / 'images'
-    output_videos = root / 'output_videos'
-    output_audios = root / 'output_audios'
-    last_frames = root / 'last_frames'
-    first_frame = root / 'first_frame.jpg'
-    final_videos = root / 'final_videos'
+    temp_filename = str(root / ".mp4")
+    images = root / "images"
+    output_videos = root / "output_videos"
+    output_audios = root / "output_audios"
+    last_frames = root / "last_frames"
+    first_frame = root / "first_frame.jpg"
+    final_videos = root / "final_videos"
     scripts_package = root / "scripts"
     output_videos.mkdir(exist_ok=True)
     images.mkdir(exist_ok=True)
@@ -52,16 +55,21 @@ class Config(_VideoElements):
     @staticmethod
     def audio_name_normalization(text: str) -> str:
         polish_to_english = {
-            'ą': 'a',
-            'ć': 'c',
-            'ę': 'e',
-            'ł': 'l',
-            'ń': 'n',
-            'ó': 'o',
-            'ś': 's',
-            'ż': 'z',
-            'ź': 'z',
-            ' ': '_',
+            "ą": "a",
+            "ć": "c",
+            "ę": "e",
+            "ł": "l",
+            "ń": "n",
+            "ó": "o",
+            "ś": "s",
+            "ż": "z",
+            "ź": "z",
+            " ": "_",
         }
-        return ''.join(
-            polish_to_english.get(letter, letter) for letter in re.sub(r'[,\.?!]', '', text.strip()).lower()) + ".mp3"
+        return (
+            "".join(
+                polish_to_english.get(letter, letter)
+                for letter in re.sub(r"[,.?!]", "", text.strip()).lower()
+            )
+            + ".mp3"
+        )
diff --git a/PassedVariables.py b/PassedVariables.py
@@ -0,0 +1,4 @@
+class PassedVariables:
+    texts_to_translate = tuple()
+    record = False
+    texts = []
diff --git a/audio/generate_audio.py b/audio/generate_audio.py
@@ -6,7 +6,9 @@
 
 
 def generate_audio(text_to_translate: str):
-    speech_file_path = Config.output_audios.joinpath(Config.audio_name_normalization(text_to_translate))
+    speech_file_path = Config.output_audios.joinpath(
+        Config.audio_name_normalization(text_to_translate)
+    )
     if speech_file_path.exists():
         return
     response = client.audio.speech.create(
@@ -17,5 +19,5 @@ def generate_audio(text_to_translate: str):
     response.stream_to_file(speech_file_path)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     generate_audio("Przeniesienie wykładnika z ułamka na licznik i mianownik.")
diff --git a/figures/Emphasize.py b/figures/Emphasize.py
@@ -0,0 +1,46 @@
+from math import cos, sin, radians
+from turtle import color
+
+from Config import Config
+from PassedVariables import PassedVariables
+from figures.Figure import Figure
+from recording.record_turtle import pu, goto, pd
+
+
+class Emphasize(Figure):
+    def __init__(
+        self, inner: Figure, width: int = None, height: int = None, color: str = "red"
+    ):
+        super().__init__(width, height)
+        self.inner = inner
+        self.color = color
+
+    def draw(
+        self,
+        width: int = None,
+        height: int = None,
+        border_width: int = None,
+        border_height: int = None,
+    ):
+        self.x_coor = self.inner.x_coor
+        self.y_coor = self.inner.y_coor
+        self.width = self.inner.width
+        self.height = self.inner.height
+        super().draw(width, height, border_width, border_height)
+
+    def _draw(self, width: int, height: int):
+        color(self.color)
+        self._draw_ellipse(self.inner.width * 3 // 4, self.inner.height * 3 // 4)
+        color(Config.color)
+
+    def _draw_ellipse(self, a, b):
+        pu()
+        goto(self.x_coor + self.width // 2 + a, self.y_coor - self.height // 2)
+        pd()
+        for i in range(361):
+            PassedVariables.record = False
+            if i % 90 == 0:
+                PassedVariables.record = True
+            x = self.x_coor + a * cos(radians(i)) + self.width // 2
+            y = self.y_coor + b * sin(radians(i)) - self.height // 2
+            goto(x, y)
diff --git a/figures/Figure.py b/figures/Figure.py
@@ -3,7 +3,7 @@
 
 from Config import Config
 from figures import moveto
-from recording.record_turtle import pu, pd, fd, rt, lt
+from recording.record_turtle import pu, pd
 
 
 class Figure(ABC):
@@ -12,15 +12,27 @@ class Figure(ABC):
     width = Config.default_width
     height = Config.default_height
 
-    def __init__(self, width: int = None, height: int = None, x_coor: int = None, y_coor: int = None):
+    def __init__(
+        self,
+        width: int = None,
+        height: int = None,
+        x_coor: int = None,
+        y_coor: int = None,
+    ):
         self.x_coor = x_coor
         self.y_coor = y_coor
         if height is not None:
             self.height = height
         if width is not None:
             self.width = width
 
-    def draw(self, width: int = None, height: int = None, border_width: int = None, border_height: int = None):
+    def draw(
+        self,
+        width: int = None,
+        height: int = None,
+        border_width: int = None,
+        border_height: int = None,
+    ):
         moveto(self.x_coor, self.y_coor)
         if width is None:
             width = self.width
@@ -34,10 +46,21 @@ def draw(self, width: int = None, height: int = None, border_width: int = None,
         self._draw(width - (border_width or 0), height - (border_height or 0))
         pu()
 
-    def undo(self, width: int = None, height: int = None, border_width: int = None, border_height: int = None):
+    def undo(
+        self,
+        width: int = None,
+        height: int = None,
+        border_width: int = None,
+        border_height: int = None,
+    ):
         color("white")
-        self.draw(width=width, height=height, border_width=border_width, border_height=border_height)
-        color("black")
+        self.draw(
+            width=width,
+            height=height,
+            border_width=border_width,
+            border_height=border_height,
+        )
+        color(Config.color)
 
     @abstractmethod
     def _draw(self, width: int, height: int):
diff --git a/figures/Fraction.py b/figures/Fraction.py
@@ -5,7 +5,13 @@
 
 
 class Fraction(Figure):
-    def __init__(self, numerator: Figure, denominator: Figure, width: int = Config.default_width, height: int = Config.default_height):
+    def __init__(
+        self,
+        numerator: Figure,
+        denominator: Figure,
+        width: int = Config.default_width,
+        height: int = Config.default_height,
+    ):
         super().__init__(width, height)
         self.numerator = numerator
         self.denominator = denominator
@@ -22,5 +28,7 @@ def _draw(self, width: int, height: int):
         lt(90)
         fd(width - Config.minimal_border_width)
         self.denominator.x_coor = self.x_coor
-        self.denominator.y_coor = self.y_coor - height // 2 - Config.minimal_border_width
+        self.denominator.y_coor = (
+            self.y_coor - height // 2 - Config.minimal_border_width
+        )
         self.denominator.draw(width, height // 2)
diff --git a/figures/One.py b/figures/One.py
@@ -6,7 +6,14 @@
 class One(Figure):
     width = Config.default_width // 2
 
-    def __init__(self, width: int = None, height: int = None, x_coor: int = None, y_coor: int = None, centered: bool = False):
+    def __init__(
+        self,
+        width: int = None,
+        height: int = None,
+        x_coor: int = None,
+        y_coor: int = None,
+        centered: bool = False,
+    ):
         super().__init__(width, height, x_coor, y_coor)
         self.centered = centered
 
diff --git a/figures/Parenthesized.py b/figures/Parenthesized.py
@@ -4,7 +4,6 @@
 
 
 class Parenthesized(Figure):
-
     def __init__(self, inner: Figure, width: int = None, height: int = None):
         super().__init__(width, height)
         self.inner = inner
diff --git a/figures/Plus.py b/figures/Plus.py
@@ -6,6 +6,7 @@
 
 class Plus(Figure):
     width = Config.default_width // 2
+
     def _draw(self, width: int, height: int):
         rt(90)
         pu()
diff --git a/figures/RaiseToPower.py b/figures/RaiseToPower.py
@@ -3,8 +3,9 @@
 
 
 class RaiseToPower(Figure):
-
-    def __init__(self, base: Figure, exponent: Figure, width: int = None, height: int = None):
+    def __init__(
+        self, base: Figure, exponent: Figure, width: int = None, height: int = None
+    ):
         super().__init__(width, height)
         self.base = base
         self.exponent = exponent
@@ -20,4 +21,3 @@ def _draw(self, width: int, height: int):
         self.exponent.width = width // 4
         self.exponent.height = height // 2
         self.exponent.draw()
-
diff --git a/figures/Root.py b/figures/Root.py
@@ -7,8 +7,13 @@
 
 
 class Root(Figure):
-
-    def __init__(self, radical: Figure, index: Figure = None, width: int = None, height: int = None):
+    def __init__(
+        self,
+        radical: Figure,
+        index: Figure = None,
+        width: int = None,
+        height: int = None,
+    ):
         super().__init__(width, height)
         self.index = index
         self.radical = radical
diff --git a/figures/Sequence.py b/figures/Sequence.py
@@ -11,7 +11,9 @@ def __init__(self, *figures: Figure, width: int = None, height: int = None):
     def _draw(self, width: int, height: int):
         x_coor = self.x_coor
         total_width = sum(figure.width for figure in self.figures)
-        element_widths = tuple((figure.width * width) // total_width for figure in self.figures)
+        element_widths = tuple(
+            (figure.width * width) // total_width for figure in self.figures
+        )
         for figure, element_width in zip(self.figures, element_widths):
             figure.x_coor = x_coor
             x_coor += element_width
diff --git a/figures/Seven.py b/figures/Seven.py
@@ -14,4 +14,3 @@ def _draw(self, width: int, height: int):
         setheading(0)
         fd(width // 4)
         bk(width // 2)
-
diff --git a/figures/Text.py b/figures/Text.py
@@ -0,0 +1,48 @@
+from typing import Callable
+
+from Config import Config
+from PassedVariables import PassedVariables
+from figures.Figure import Figure
+
+
+class Text(Figure):
+    def __init__(
+        self,
+        width: int = None,
+        height: int = None,
+        x_coor: int = None,
+        y_coor: int = None,
+        text: str = None,
+        font_size: str = None,
+    ):
+        super().__init__(width, height, x_coor, y_coor)
+        self.font_size = font_size
+        if self.font_size is None:
+            self.font_size = Config.font_size
+        self.text = text
+
+    def draw(
+        self,
+        width: int = None,
+        height: int = None,
+        border_width: int = None,
+        border_height: int = None,
+    ):
+        PassedVariables.texts.append(
+            (
+                self.x_coor - Config.start_x,
+                Config.start_y - self.y_coor,
+                self.text,
+                self.font_size,
+            )
+        )
+
+    def gen_add_text(self, text: str) -> Callable:
+        return lambda: setattr(self, "text", text)
+
+    @staticmethod
+    def clear():
+        PassedVariables.texts = []
+
+    def _draw(self, width: int, height: int):
+        pass
diff --git a/main.py b/main.py
@@ -1,14 +1,17 @@
 import shutil
 
 from Config import Config
+from PassedVariables import PassedVariables
 from audio.generate_audio import generate_audio
 from recording.concat2video import concat2video
 from recording.concat_videos import concat_videos
-from recording.record_turtle import Record
 from recording.save_screen import save_screen
 
-if __name__ == '__main__':
-    action_spaces = getattr(__import__(f"{Config.scripts_package.name}.{Config.lesson_name}"), Config.lesson_name).action_spaces
+if __name__ == "__main__":
+    action_spaces = getattr(
+        __import__(f"{Config.scripts_package.name}.{Config.lesson_name}"),
+        Config.lesson_name,
+    ).action_spaces
     first_iteration = True
     for action_space in action_spaces:
         for action in action_space:
@@ -17,10 +20,10 @@
             concat2video()
         else:
             first_iteration = False
-            Record.record = True
+            PassedVariables.record = True
             save_screen(Config.first_frame)
             shutil.rmtree(Config.images)
             Config.images.mkdir()
-    for text_translate in Config.texts_to_translate:
+    for text_translate in PassedVariables.texts_to_translate:
         generate_audio(text_translate)
     concat_videos()
diff --git a/recording/concat2video.py b/recording/concat2video.py
diff --git a/recording/concat_videos.py b/recording/concat_videos.py
diff --git a/recording/create_video_from_frame.py b/recording/create_video_from_frame.py
diff --git a/recording/record_turtle.py b/recording/record_turtle.py
diff --git a/recording/save_screen.py b/recording/save_screen.py
diff --git a/scripts/Znajdowanie_liczby_niewymiernej.py b/scripts/Znajdowanie_liczby_niewymiernej.py
