From 4aae9e153da15229e9130f28c6df2210a253901a Mon Sep 17 00:00:00 2001 From: mistangl Date: Tue, 27 Jan 2026 19:00:27 +0100 Subject: [PATCH] lib und Elemente Ordner mit __init__ versehen, so dass man beim import die Verzeichnisse durch Punktpfade angeben kann --- lib/Elemente/Eckrad.py | 2 +- lib/Elemente/Gefaellestrecke.py | 4 ++-- lib/Elemente/Kreisel.py | 4 ++-- lib/Elemente/Omniflo.py | 4 ++-- lib/Elemente/VarioFoerderer.py | 2 +- lib/Elemente/VarioFoerderer_tests.py | 2 +- lib/Elemente/__init__.py | 0 lib/__init__.py | 0 lib/arbeiten_mit_csv.py | 6 +++--- lib/as_es_methoden.py | 4 ++-- lib/block_methoden.py | 2 +- lib/plant2dxf.py | 12 ++++++------ 12 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 lib/Elemente/__init__.py create mode 100644 lib/__init__.py diff --git a/lib/Elemente/Eckrad.py b/lib/Elemente/Eckrad.py index 419842a..6d10845 100644 --- a/lib/Elemente/Eckrad.py +++ b/lib/Elemente/Eckrad.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from pydantic import BaseModel, Field, field_validator from typing import Optional -import block_methoden +from lib import block_methoden RADIUS = 400 diff --git a/lib/Elemente/Gefaellestrecke.py b/lib/Elemente/Gefaellestrecke.py index 02d41bc..4a00696 100644 --- a/lib/Elemente/Gefaellestrecke.py +++ b/lib/Elemente/Gefaellestrecke.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- from pydantic import BaseModel, Field, field_validator import re -import plant2dxf import math from ezdxf.math import Matrix44 -import block_methoden +from lib import plant2dxf +from lib import block_methoden class Gefaellestrecke(BaseModel): diff --git a/lib/Elemente/Kreisel.py b/lib/Elemente/Kreisel.py index d2662d5..fbc9244 100644 --- a/lib/Elemente/Kreisel.py +++ b/lib/Elemente/Kreisel.py @@ -3,8 +3,8 @@ from ezdxf.entities import Line import math from pydantic import BaseModel, Field, field_validator from typing import Optional -import plant2dxf -import block_methoden +from lib import plant2dxf +from lib import block_methoden ATTR_TAG = "TeileId" # Attributtag im Block diff --git a/lib/Elemente/Omniflo.py b/lib/Elemente/Omniflo.py index 70b2514..711046e 100644 --- a/lib/Elemente/Omniflo.py +++ b/lib/Elemente/Omniflo.py @@ -3,8 +3,8 @@ from ezdxf.entities import Line import math from pydantic import BaseModel, Field, field_validator from typing import Optional -import plant2dxf -import block_methoden +from lib import plant2dxf +from lib import block_methoden class Omniflo(BaseModel): diff --git a/lib/Elemente/VarioFoerderer.py b/lib/Elemente/VarioFoerderer.py index 5693366..f83b044 100644 --- a/lib/Elemente/VarioFoerderer.py +++ b/lib/Elemente/VarioFoerderer.py @@ -21,7 +21,7 @@ from ezdxf.entities import Line from ezdxf.math import Matrix44 from pydantic import BaseModel, Field -import block_methoden +from lib import block_methoden # ============================================================================ diff --git a/lib/Elemente/VarioFoerderer_tests.py b/lib/Elemente/VarioFoerderer_tests.py index 1d8fe60..771243e 100644 --- a/lib/Elemente/VarioFoerderer_tests.py +++ b/lib/Elemente/VarioFoerderer_tests.py @@ -9,7 +9,7 @@ oder als separate Test-Datei ausgeführt werden. import unittest import math from unittest.mock import Mock, MagicMock -from VarioFoerderer import ( +from .VarioFoerderer import ( VarioFoerderer, Foerderrichtung, MotorUmlenkConfig, diff --git a/lib/Elemente/__init__.py b/lib/Elemente/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lib/__init__.py b/lib/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lib/arbeiten_mit_csv.py b/lib/arbeiten_mit_csv.py index 9930c7f..52f0335 100644 --- a/lib/arbeiten_mit_csv.py +++ b/lib/arbeiten_mit_csv.py @@ -6,8 +6,8 @@ import json import re import configparser from pathlib import Path -from utils import check_environment_var, setup_logger -from Elemente import Kreisel, VarioFoerderer,Gefaellestrecke,Angetriebene_Kurve,Bt_element,Omniflo, Eckrad +from lib.utils import check_environment_var, setup_logger +from lib.Elemente import Kreisel, VarioFoerderer,Gefaellestrecke,Angetriebene_Kurve,Bt_element,Omniflo, Eckrad # --------------------------------------------------------- CFG-Leser für shapes.cfg def get_shape_cfg(teileart, cfg_path, logger=None): parser = configparser.ConfigParser() @@ -219,4 +219,4 @@ def normalize_func_name(name): .replace('.', '_') .replace('-', '_') .lower() - ) \ No newline at end of file + ) diff --git a/lib/as_es_methoden.py b/lib/as_es_methoden.py index 6049311..7af5b38 100644 --- a/lib/as_es_methoden.py +++ b/lib/as_es_methoden.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from ezdxf.entities import Line import math -import plant2dxf -import block_methoden +from lib import plant2dxf +from lib import block_methoden RADIUS = 400 diff --git a/lib/block_methoden.py b/lib/block_methoden.py index ca22b62..1781939 100644 --- a/lib/block_methoden.py +++ b/lib/block_methoden.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import math -import plant2dxf +from lib import plant2dxf from ezdxf import units from ezdxf.entities import Line from ezdxf.addons import importer diff --git a/lib/plant2dxf.py b/lib/plant2dxf.py index ae8bb02..d2f83e0 100644 --- a/lib/plant2dxf.py +++ b/lib/plant2dxf.py @@ -14,9 +14,9 @@ from ezdxf import units from ezdxf.entities import Line from pathlib import Path import math -from utils import check_environment_var, setup_logger -from handler_context import HandlerContext -from Elemente import ( +from lib.utils import check_environment_var, setup_logger +from lib.handler_context import HandlerContext +from lib.Elemente import ( Kreisel, VarioFoerderer, Gefaellestrecke, @@ -25,9 +25,9 @@ from Elemente import ( Omniflo, Eckrad, ) -import as_es_methoden -import block_methoden -import arbeiten_mit_csv +from lib import as_es_methoden +from lib import block_methoden +from lib import arbeiten_mit_csv # --------------------------------------------------------- Konstante Parameter ATTR_TAG = "TeileId" # Attributtag im Block