diff --git a/MethodicConfigurator/ardupilot_methodic_configurator.py b/MethodicConfigurator/ardupilot_methodic_configurator.py index 3e3c0ea..ff97460 100755 --- a/MethodicConfigurator/ardupilot_methodic_configurator.py +++ b/MethodicConfigurator/ardupilot_methodic_configurator.py @@ -17,18 +17,18 @@ from logging import error as logging_error from sys import exit as sys_exit -from backend_filesystem import LocalFilesystem -from backend_flightcontroller import FlightController +from MethodicConfigurator.backend_filesystem import LocalFilesystem +from MethodicConfigurator.backend_flightcontroller import FlightController -from frontend_tkinter_connection_selection import ConnectionSelectionWindow +from MethodicConfigurator.frontend_tkinter_connection_selection import ConnectionSelectionWindow -from frontend_tkinter_directory_selection import VehicleDirectorySelectionWindow +from MethodicConfigurator.frontend_tkinter_directory_selection import VehicleDirectorySelectionWindow -from frontend_tkinter_component_editor import ComponentEditorWindow +from MethodicConfigurator.frontend_tkinter_component_editor import ComponentEditorWindow -from frontend_tkinter_parameter_editor import ParameterEditorWindow +from MethodicConfigurator.frontend_tkinter_parameter_editor import ParameterEditorWindow -from version import VERSION +from MethodicConfigurator.version import VERSION # pylint: disable=duplicate-code diff --git a/MethodicConfigurator/backend_filesystem.py b/MethodicConfigurator/backend_filesystem.py index 27370f2..786f086 100644 --- a/MethodicConfigurator/backend_filesystem.py +++ b/MethodicConfigurator/backend_filesystem.py @@ -42,15 +42,15 @@ from platformdirs import site_config_dir from platformdirs import user_config_dir -from annotate_params import BASE_URL, PARAM_DEFINITION_XML_FILE, Par -from annotate_params import get_xml_data -from annotate_params import create_doc_dict -from annotate_params import format_columns -from annotate_params import split_into_lines -from annotate_params import update_parameter_documentation - -from backend_filesystem_vehicle_components import VehicleComponents -from backend_filesystem_configuration_steps import ConfigurationSteps +from MethodicConfigurator.annotate_params import BASE_URL, PARAM_DEFINITION_XML_FILE, Par +from MethodicConfigurator.annotate_params import get_xml_data +from MethodicConfigurator.annotate_params import create_doc_dict +from MethodicConfigurator.annotate_params import format_columns +from MethodicConfigurator.annotate_params import split_into_lines +from MethodicConfigurator.annotate_params import update_parameter_documentation + +from MethodicConfigurator.backend_filesystem_vehicle_components import VehicleComponents +from MethodicConfigurator.backend_filesystem_configuration_steps import ConfigurationSteps TOOLTIP_MAX_LENGTH = 105 diff --git a/MethodicConfigurator/backend_filesystem_configuration_steps.py b/MethodicConfigurator/backend_filesystem_configuration_steps.py index b3ef7b5..c36ff50 100644 --- a/MethodicConfigurator/backend_filesystem_configuration_steps.py +++ b/MethodicConfigurator/backend_filesystem_configuration_steps.py @@ -21,7 +21,7 @@ from typing import Tuple -from annotate_params import Par +from MethodicConfigurator.annotate_params import Par class ConfigurationSteps: diff --git a/MethodicConfigurator/backend_flightcontroller.py b/MethodicConfigurator/backend_flightcontroller.py index e8cc122..2e83f2c 100644 --- a/MethodicConfigurator/backend_flightcontroller.py +++ b/MethodicConfigurator/backend_flightcontroller.py @@ -25,7 +25,7 @@ import serial.tools.list_ports_common from serial.serialutil import SerialException -from annotate_params import Par +from MethodicConfigurator.annotate_params import Par # adding all this allows pyinstaller to build a working windows executable # note that using --hidden-import does not work for these modules diff --git a/MethodicConfigurator/backend_mavftp.py b/MethodicConfigurator/backend_mavftp.py index 5031f6f..0fbd252 100644 --- a/MethodicConfigurator/backend_mavftp.py +++ b/MethodicConfigurator/backend_mavftp.py @@ -33,11 +33,11 @@ from io import BytesIO as SIO # from param_ftp import ParamData -from param_ftp import ftp_param_decode +from MethodicConfigurator.param_ftp import ftp_param_decode -from common_arguments import add_common_arguments_and_parse +from MethodicConfigurator.common_arguments import add_common_arguments_and_parse -from backend_flightcontroller import FlightController +from MethodicConfigurator.backend_flightcontroller import FlightController # adding all this allows pyinstaller to build a working Windows executable # note that using --hidden-import does not work for these modules diff --git a/MethodicConfigurator/common_arguments.py b/MethodicConfigurator/common_arguments.py index 9c88962..1e0f268 100644 --- a/MethodicConfigurator/common_arguments.py +++ b/MethodicConfigurator/common_arguments.py @@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3 ''' -from version import VERSION +from MethodicConfigurator.version import VERSION def add_common_arguments_and_parse(parser): diff --git a/MethodicConfigurator/frontend_tkinter_base.py b/MethodicConfigurator/frontend_tkinter_base.py index 77123f6..2af7a02 100644 --- a/MethodicConfigurator/frontend_tkinter_base.py +++ b/MethodicConfigurator/frontend_tkinter_base.py @@ -22,7 +22,7 @@ from PIL import Image from PIL import ImageTk -from backend_filesystem import LocalFilesystem +from MethodicConfigurator.backend_filesystem import LocalFilesystem def show_error_message(title: str, message: str): diff --git a/MethodicConfigurator/frontend_tkinter_component_editor.py b/MethodicConfigurator/frontend_tkinter_component_editor.py index 601e635..214f840 100644 --- a/MethodicConfigurator/frontend_tkinter_component_editor.py +++ b/MethodicConfigurator/frontend_tkinter_component_editor.py @@ -18,18 +18,18 @@ import tkinter as tk from tkinter import ttk -from common_arguments import add_common_arguments_and_parse +from MethodicConfigurator.common_arguments import add_common_arguments_and_parse -from backend_filesystem import LocalFilesystem +from MethodicConfigurator.backend_filesystem import LocalFilesystem -from battery_cell_voltages import BatteryCell +from MethodicConfigurator.battery_cell_voltages import BatteryCell -from frontend_tkinter_component_editor_base import ComponentEditorWindowBase +from MethodicConfigurator.frontend_tkinter_component_editor_base import ComponentEditorWindowBase -#from frontend_tkinter_base import show_tooltip -from frontend_tkinter_base import show_error_message +#from MethodicConfigurator.frontend_tkinter_base import show_tooltip +from MethodicConfigurator.frontend_tkinter_base import show_error_message -from version import VERSION +from MethodicConfigurator.version import VERSION def argument_parser(): diff --git a/MethodicConfigurator/frontend_tkinter_component_editor_base.py b/MethodicConfigurator/frontend_tkinter_component_editor_base.py index e2be5af..d85b526 100644 --- a/MethodicConfigurator/frontend_tkinter_component_editor_base.py +++ b/MethodicConfigurator/frontend_tkinter_component_editor_base.py @@ -18,16 +18,16 @@ import tkinter as tk from tkinter import ttk -from common_arguments import add_common_arguments_and_parse +from MethodicConfigurator.common_arguments import add_common_arguments_and_parse -from backend_filesystem import LocalFilesystem +from MethodicConfigurator.backend_filesystem import LocalFilesystem -from frontend_tkinter_base import show_tooltip -from frontend_tkinter_base import show_error_message -from frontend_tkinter_base import ScrollFrame -from frontend_tkinter_base import BaseWindow +from MethodicConfigurator.frontend_tkinter_base import show_tooltip +from MethodicConfigurator.frontend_tkinter_base import show_error_message +from MethodicConfigurator.frontend_tkinter_base import ScrollFrame +from MethodicConfigurator.frontend_tkinter_base import BaseWindow -from version import VERSION +from MethodicConfigurator.version import VERSION def argument_parser(): diff --git a/MethodicConfigurator/frontend_tkinter_connection_selection.py b/MethodicConfigurator/frontend_tkinter_connection_selection.py index 91b8727..9329c96 100644 --- a/MethodicConfigurator/frontend_tkinter_connection_selection.py +++ b/MethodicConfigurator/frontend_tkinter_connection_selection.py @@ -22,15 +22,15 @@ from tkinter import ttk from tkinter import simpledialog -from common_arguments import add_common_arguments_and_parse +from MethodicConfigurator.common_arguments import add_common_arguments_and_parse -from backend_flightcontroller import FlightController +from MethodicConfigurator.backend_flightcontroller import FlightController -from frontend_tkinter_base import show_no_connection_error -from frontend_tkinter_base import show_tooltip -from frontend_tkinter_base import update_combobox_width -from frontend_tkinter_base import ProgressWindow -from frontend_tkinter_base import BaseWindow +from MethodicConfigurator.frontend_tkinter_base import show_no_connection_error +from MethodicConfigurator.frontend_tkinter_base import show_tooltip +from MethodicConfigurator.frontend_tkinter_base import update_combobox_width +from MethodicConfigurator.frontend_tkinter_base import ProgressWindow +from MethodicConfigurator.frontend_tkinter_base import BaseWindow # https://dev.to/geraldew/python-tkinter-an-exercise-in-wrapping-the-combobox-ndb diff --git a/MethodicConfigurator/frontend_tkinter_directory_selection.py b/MethodicConfigurator/frontend_tkinter_directory_selection.py index 55a9549..acece0c 100644 --- a/MethodicConfigurator/frontend_tkinter_directory_selection.py +++ b/MethodicConfigurator/frontend_tkinter_directory_selection.py @@ -24,14 +24,14 @@ from tkinter import ttk from tkinter import filedialog -from common_arguments import add_common_arguments_and_parse +from MethodicConfigurator.common_arguments import add_common_arguments_and_parse -from backend_filesystem import LocalFilesystem +from MethodicConfigurator.backend_filesystem import LocalFilesystem -from frontend_tkinter_base import show_error_message -from frontend_tkinter_base import show_no_param_files_error -from frontend_tkinter_base import show_tooltip -from frontend_tkinter_base import BaseWindow +from MethodicConfigurator.frontend_tkinter_base import show_error_message +from MethodicConfigurator.frontend_tkinter_base import show_no_param_files_error +from MethodicConfigurator.frontend_tkinter_base import show_tooltip +from MethodicConfigurator.frontend_tkinter_base import BaseWindow class DirectorySelectionWidgets(): diff --git a/MethodicConfigurator/frontend_tkinter_parameter_editor.py b/MethodicConfigurator/frontend_tkinter_parameter_editor.py index 9c67cc8..4f014be 100644 --- a/MethodicConfigurator/frontend_tkinter_parameter_editor.py +++ b/MethodicConfigurator/frontend_tkinter_parameter_editor.py @@ -24,23 +24,23 @@ from webbrowser import open as webbrowser_open # to open the blog post documentation -from backend_filesystem import LocalFilesystem -from backend_filesystem import is_within_tolerance +from MethodicConfigurator.backend_filesystem import LocalFilesystem +from MethodicConfigurator.backend_filesystem import is_within_tolerance -from backend_flightcontroller import FlightController +from MethodicConfigurator.backend_flightcontroller import FlightController -from frontend_tkinter_base import show_tooltip -from frontend_tkinter_base import AutoResizeCombobox -from frontend_tkinter_base import ProgressWindow -from frontend_tkinter_base import BaseWindow +from MethodicConfigurator.frontend_tkinter_base import show_tooltip +from MethodicConfigurator.frontend_tkinter_base import AutoResizeCombobox +from MethodicConfigurator.frontend_tkinter_base import ProgressWindow +from MethodicConfigurator.frontend_tkinter_base import BaseWindow -from frontend_tkinter_connection_selection import ConnectionSelectionWidgets +from MethodicConfigurator.frontend_tkinter_connection_selection import ConnectionSelectionWidgets -from frontend_tkinter_directory_selection import VehicleDirectorySelectionWidgets +from MethodicConfigurator.frontend_tkinter_directory_selection import VehicleDirectorySelectionWidgets -from frontend_tkinter_parameter_editor_table import ParameterEditorTable +from MethodicConfigurator.frontend_tkinter_parameter_editor_table import ParameterEditorTable -from tempcal_imu import IMUfit +from MethodicConfigurator.tempcal_imu import IMUfit class DocumentationFrame: # pylint: disable=too-few-public-methods diff --git a/MethodicConfigurator/frontend_tkinter_parameter_editor_table.py b/MethodicConfigurator/frontend_tkinter_parameter_editor_table.py index d89b36d..a382a76 100644 --- a/MethodicConfigurator/frontend_tkinter_parameter_editor_table.py +++ b/MethodicConfigurator/frontend_tkinter_parameter_editor_table.py @@ -20,14 +20,14 @@ #from logging import error as logging_error from logging import critical as logging_critical -#from backend_filesystem import LocalFilesystem -from backend_filesystem import is_within_tolerance +#from MethodicConfigurator.backend_filesystem import LocalFilesystem +from MethodicConfigurator.backend_filesystem import is_within_tolerance -#from backend_flightcontroller import FlightController +#from MethodicConfigurator.backend_flightcontroller import FlightController -from frontend_tkinter_base import show_tooltip -#from frontend_tkinter_base import AutoResizeCombobox -from frontend_tkinter_base import ScrollFrame +from MethodicConfigurator.frontend_tkinter_base import show_tooltip +#from MethodicConfigurator.frontend_tkinter_base import AutoResizeCombobox +from MethodicConfigurator.frontend_tkinter_base import ScrollFrame