fixed imports by running as a module

This commit is contained in:
Félix Boisselier
2024-04-20 19:15:24 +02:00
parent 94e110736a
commit 99b719051c
10 changed files with 25 additions and 21 deletions

View File

View File

@@ -10,7 +10,7 @@ import optparse
import numpy as np
from scipy.signal import butter, filtfilt
from helpers.locale_utils import print_with_c_locale
from ..helpers.locale_utils import print_with_c_locale
NUM_POINTS = 500

View File

@@ -20,14 +20,14 @@ from scipy.interpolate import griddata
matplotlib.use('Agg')
from helpers.common_func import (
from ..helpers.common_func import (
compute_curve_similarity_factor,
compute_spectrogram,
detect_peaks,
parse_log,
setup_klipper_import,
)
from helpers.locale_utils import print_with_c_locale, set_locale
from ..helpers.locale_utils import print_with_c_locale, set_locale
ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' # For paired peaks names

View File

@@ -20,14 +20,14 @@ import numpy as np
matplotlib.use('Agg')
from helpers.common_func import (
from ..helpers.common_func import (
compute_mechanical_parameters,
compute_spectrogram,
detect_peaks,
parse_log,
setup_klipper_import,
)
from helpers.locale_utils import print_with_c_locale, set_locale
from ..helpers.locale_utils import print_with_c_locale, set_locale
PEAKS_DETECTION_THRESHOLD = 0.05
PEAKS_EFFECT_THRESHOLD = 0.12

View File

@@ -21,14 +21,14 @@ import numpy as np
matplotlib.use('Agg')
from helpers.common_func import (
from ..helpers.common_func import (
compute_mechanical_parameters,
detect_peaks,
identify_low_energy_zones,
parse_log,
setup_klipper_import,
)
from helpers.locale_utils import print_with_c_locale, set_locale
from ..helpers.locale_utils import print_with_c_locale, set_locale
PEAKS_DETECTION_THRESHOLD = 0.05
PEAKS_RELATIVE_HEIGHT_THRESHOLD = 0.04

View File

Before

Width:  |  Height:  |  Size: 607 KiB

After

Width:  |  Height:  |  Size: 607 KiB

0
src/helpers/__init__.py Normal file
View File

View File

@@ -6,8 +6,6 @@
import time
from pathlib import Path
from is_workflow import Config
def wait_file_ready(filepath: Path) -> None:
file_busy = True
@@ -37,7 +35,6 @@ def wait_file_ready(filepath: Path) -> None:
time.sleep(1)
def ensure_folders_exist() -> None:
for subfolder in Config.RESULTS_SUBFOLDERS.values():
folder = Config.RESULTS_BASE_FOLDER / subfolder
Path(folder).mkdir(parents=True, exist_ok=True)
def ensure_folders_exist(folders: list[Path]) -> None:
for folder in folders:
folder.mkdir(parents=True, exist_ok=True)

View File

@@ -20,12 +20,12 @@ from typing import Callable, Optional
from git import GitCommandError, Repo
from matplotlib.figure import Figure
import helpers.filemanager as fm
from graph_creators.analyze_axesmap import axesmap_calibration
from graph_creators.graph_belts import belts_calibration
from graph_creators.graph_shaper import shaper_calibration
from graph_creators.graph_vibrations import vibrations_profile
from helpers.locale_utils import print_with_c_locale
import src.helpers.filemanager as fm
from src.graph_creators.analyze_axesmap import axesmap_calibration
from src.graph_creators.graph_belts import belts_calibration
from src.graph_creators.graph_shaper import shaper_calibration
from src.graph_creators.graph_vibrations import vibrations_profile
from src.helpers.locale_utils import print_with_c_locale
class Config:
@@ -358,7 +358,9 @@ class AxesMapFinder:
def main():
options = Config.parse_arguments()
fm.ensure_folders_exist()
fm.ensure_folders_exist(
folders=[Config.RESULTS_BASE_FOLDER / subfolder for subfolder in Config.RESULTS_SUBFOLDERS.values()]
)
print_with_c_locale(f'Shake&Tune version: {Config.get_git_version()}')