Skip to content

Commit

Permalink
FOR_DEV_ONLY: Use local instead of installed code
Browse files Browse the repository at this point in the history
  • Loading branch information
amilcarlucas committed Sep 4, 2024
1 parent 3a988a8 commit 7ff07de
Show file tree
Hide file tree
Showing 15 changed files with 98 additions and 98 deletions.
20 changes: 10 additions & 10 deletions MethodicConfigurator/ardupilot_methodic_configurator.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@
from logging import error as logging_error
from sys import exit as sys_exit

from MethodicConfigurator.backend_filesystem import LocalFilesystem
from MethodicConfigurator.backend_flightcontroller import FlightController
from backend_filesystem import LocalFilesystem
from backend_flightcontroller import FlightController

from MethodicConfigurator.frontend_tkinter_base import show_error_message
from frontend_tkinter_base import show_error_message

from MethodicConfigurator.frontend_tkinter_connection_selection import ConnectionSelectionWindow
from frontend_tkinter_connection_selection import ConnectionSelectionWindow

from MethodicConfigurator.frontend_tkinter_flightcontroller_info import FlightControllerInfoWindow
from frontend_tkinter_flightcontroller_info import FlightControllerInfoWindow

from MethodicConfigurator.frontend_tkinter_directory_selection import VehicleDirectorySelectionWindow
from frontend_tkinter_directory_selection import VehicleDirectorySelectionWindow

from MethodicConfigurator.frontend_tkinter_component_editor import ComponentEditorWindow
from frontend_tkinter_component_editor import ComponentEditorWindow

from MethodicConfigurator.frontend_tkinter_parameter_editor import ParameterEditorWindow
from frontend_tkinter_parameter_editor import ParameterEditorWindow

from MethodicConfigurator.common_arguments import add_common_arguments_and_parse
from common_arguments import add_common_arguments_and_parse

from MethodicConfigurator.version import VERSION
from version import VERSION


def argument_parser():
Expand Down
24 changes: 12 additions & 12 deletions MethodicConfigurator/backend_filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@

from requests import get as requests_get

from MethodicConfigurator.annotate_params import PARAM_DEFINITION_XML_FILE, Par
from MethodicConfigurator.annotate_params import get_xml_url
from MethodicConfigurator.annotate_params import get_xml_dir
from MethodicConfigurator.annotate_params import load_default_param_file
from MethodicConfigurator.annotate_params import parse_parameter_metadata
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
from MethodicConfigurator.backend_filesystem_program_settings import ProgramSettings
from annotate_params import PARAM_DEFINITION_XML_FILE, Par
from annotate_params import get_xml_url
from annotate_params import get_xml_dir
from annotate_params import load_default_param_file
from annotate_params import parse_parameter_metadata
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 backend_filesystem_program_settings import ProgramSettings

TOOLTIP_MAX_LENGTH = 105

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

from typing import Tuple

from MethodicConfigurator.annotate_params import Par
from annotate_params import Par


class ConfigurationSteps:
Expand Down
4 changes: 2 additions & 2 deletions MethodicConfigurator/backend_filesystem_vehicle_components.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
from json import dump as json_dump
from json import JSONDecodeError

from MethodicConfigurator.backend_filesystem_program_settings import ProgramSettings
from backend_filesystem_program_settings import ProgramSettings

from MethodicConfigurator.middleware_template_overview import TemplateOverview
from middleware_template_overview import TemplateOverview


class VehicleComponents:
Expand Down
8 changes: 4 additions & 4 deletions MethodicConfigurator/backend_flightcontroller.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

from serial.serialutil import SerialException

from MethodicConfigurator.annotate_params import Par
from annotate_params import Par

from MethodicConfigurator.backend_flightcontroller_info import BackendFlightcontrollerInfo
from MethodicConfigurator.backend_mavftp import MAVFTP
from backend_flightcontroller_info import BackendFlightcontrollerInfo
from backend_mavftp import MAVFTP

from MethodicConfigurator.argparse_check_range import CheckRange
from argparse_check_range import CheckRange


# adding all this allows pyinstaller to build a working windows executable
Expand Down
2 changes: 1 addition & 1 deletion MethodicConfigurator/common_arguments.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
SPDX-License-Identifier: GPL-3.0-or-later
'''

from MethodicConfigurator.version import VERSION
from version import VERSION


def add_common_arguments_and_parse(parser):
Expand Down
2 changes: 1 addition & 1 deletion MethodicConfigurator/frontend_tkinter_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from PIL import Image
from PIL import ImageTk

from MethodicConfigurator.backend_filesystem import LocalFilesystem
from backend_filesystem import LocalFilesystem


def show_error_message(title: str, message: str):
Expand Down
16 changes: 8 additions & 8 deletions MethodicConfigurator/frontend_tkinter_component_editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@
from tkinter import ttk
from math import log2

from MethodicConfigurator.common_arguments import add_common_arguments_and_parse
from common_arguments import add_common_arguments_and_parse

from MethodicConfigurator.backend_filesystem import LocalFilesystem
from backend_filesystem import LocalFilesystem

from MethodicConfigurator.backend_filesystem_vehicle_components import VehicleComponents
from backend_filesystem_vehicle_components import VehicleComponents

from MethodicConfigurator.battery_cell_voltages import BatteryCell
from battery_cell_voltages import BatteryCell

from MethodicConfigurator.frontend_tkinter_component_editor_base import ComponentEditorWindowBase
from frontend_tkinter_component_editor_base import ComponentEditorWindowBase

#from MethodicConfigurator.frontend_tkinter_base import show_tooltip
from MethodicConfigurator.frontend_tkinter_base import show_error_message
#from frontend_tkinter_base import show_tooltip
from frontend_tkinter_base import show_error_message

from MethodicConfigurator.version import VERSION
from version import VERSION


def argument_parser():
Expand Down
14 changes: 7 additions & 7 deletions MethodicConfigurator/frontend_tkinter_component_editor_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
import tkinter as tk
from tkinter import ttk

from MethodicConfigurator.common_arguments import add_common_arguments_and_parse
from common_arguments import add_common_arguments_and_parse

from MethodicConfigurator.backend_filesystem import LocalFilesystem
from backend_filesystem import LocalFilesystem

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 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.version import VERSION
from version import VERSION


def argument_parser():
Expand Down
14 changes: 7 additions & 7 deletions MethodicConfigurator/frontend_tkinter_connection_selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
from tkinter import ttk
from tkinter import simpledialog

from MethodicConfigurator.common_arguments import add_common_arguments_and_parse
from common_arguments import add_common_arguments_and_parse

from MethodicConfigurator.backend_flightcontroller import FlightController
from backend_flightcontroller import FlightController

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
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


# https://dev.to/geraldew/python-tkinter-an-exercise-in-wrapping-the-combobox-ndb
Expand Down
16 changes: 8 additions & 8 deletions MethodicConfigurator/frontend_tkinter_directory_selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
from tkinter import ttk
from tkinter import filedialog

from MethodicConfigurator.version import VERSION
from version import VERSION

from MethodicConfigurator.common_arguments import add_common_arguments_and_parse
from common_arguments import add_common_arguments_and_parse

from MethodicConfigurator.backend_filesystem import LocalFilesystem
from MethodicConfigurator.backend_filesystem_program_settings import ProgramSettings
from backend_filesystem import LocalFilesystem
from backend_filesystem_program_settings import ProgramSettings

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
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_template_overview import TemplateOverviewWindow
from frontend_tkinter_template_overview import TemplateOverviewWindow


class DirectorySelectionWidgets():
Expand Down
12 changes: 6 additions & 6 deletions MethodicConfigurator/frontend_tkinter_flightcontroller_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
import tkinter as tk
from tkinter import ttk

from MethodicConfigurator.backend_flightcontroller import FlightController
#from MethodicConfigurator.backend_flightcontroller_info import BackendFlightcontrollerInfo
from backend_flightcontroller import FlightController
#from backend_flightcontroller_info import BackendFlightcontrollerInfo

#from MethodicConfigurator.frontend_tkinter_base import show_tooltip
from MethodicConfigurator.frontend_tkinter_base import ProgressWindow
from MethodicConfigurator.frontend_tkinter_base import BaseWindow
#from frontend_tkinter_base import show_tooltip
from frontend_tkinter_base import ProgressWindow
from frontend_tkinter_base import BaseWindow

from MethodicConfigurator.version import VERSION
from version import VERSION


class FlightControllerInfoWindow(BaseWindow):
Expand Down
28 changes: 14 additions & 14 deletions MethodicConfigurator/frontend_tkinter_parameter_editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,27 @@

from webbrowser import open as webbrowser_open # to open the blog post documentation

from MethodicConfigurator.annotate_params import Par
from annotate_params import Par

from MethodicConfigurator.common_arguments import add_common_arguments_and_parse
from common_arguments import add_common_arguments_and_parse

from MethodicConfigurator.backend_filesystem import LocalFilesystem
from MethodicConfigurator.backend_filesystem import is_within_tolerance
from backend_filesystem import LocalFilesystem
from backend_filesystem import is_within_tolerance

from MethodicConfigurator.backend_flightcontroller import FlightController
from backend_flightcontroller import FlightController

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 MethodicConfigurator.frontend_tkinter_base import RichText
from MethodicConfigurator.frontend_tkinter_base import get_widget_font
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 frontend_tkinter_base import RichText
from frontend_tkinter_base import get_widget_font

from MethodicConfigurator.frontend_tkinter_directory_selection import VehicleDirectorySelectionWidgets
from frontend_tkinter_directory_selection import VehicleDirectorySelectionWidgets

from MethodicConfigurator.frontend_tkinter_parameter_editor_table import ParameterEditorTable
from frontend_tkinter_parameter_editor_table import ParameterEditorTable

from MethodicConfigurator.tempcal_imu import IMUfit
from tempcal_imu import IMUfit

from MethodicConfigurator.version import VERSION

Expand Down
22 changes: 11 additions & 11 deletions MethodicConfigurator/frontend_tkinter_parameter_editor_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@

from platform import system as platform_system

#from MethodicConfigurator.backend_filesystem import LocalFilesystem
from MethodicConfigurator.backend_filesystem import is_within_tolerance
#from backend_filesystem import LocalFilesystem
from backend_filesystem import is_within_tolerance

#from MethodicConfigurator.backend_flightcontroller import FlightController
#from backend_flightcontroller import FlightController

from MethodicConfigurator.frontend_tkinter_base import show_tooltip
#from MethodicConfigurator.frontend_tkinter_base import AutoResizeCombobox
from MethodicConfigurator.frontend_tkinter_base import ScrollFrame
from MethodicConfigurator.frontend_tkinter_base import get_widget_font
from MethodicConfigurator.frontend_tkinter_base import BaseWindow
from frontend_tkinter_base import show_tooltip
#from frontend_tkinter_base import AutoResizeCombobox
from frontend_tkinter_base import ScrollFrame
from frontend_tkinter_base import get_widget_font
from frontend_tkinter_base import BaseWindow

from MethodicConfigurator.frontend_tkinter_connection_selection import PairTupleCombobox
from frontend_tkinter_connection_selection import PairTupleCombobox

from MethodicConfigurator.frontend_tkinter_entry_dynamic import EntryWithDynamicalyFilteredListbox
from frontend_tkinter_entry_dynamic import EntryWithDynamicalyFilteredListbox

from MethodicConfigurator.annotate_params import Par
from annotate_params import Par


class ParameterEditorTable(ScrollFrame): # pylint: disable=too-many-ancestors
Expand Down
12 changes: 6 additions & 6 deletions MethodicConfigurator/frontend_tkinter_template_overview.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
import tkinter as tk
from tkinter import ttk

from MethodicConfigurator.middleware_template_overview import TemplateOverview
from middleware_template_overview import TemplateOverview

from MethodicConfigurator.backend_filesystem_program_settings import ProgramSettings
from MethodicConfigurator.backend_filesystem_vehicle_components import VehicleComponents
from backend_filesystem_program_settings import ProgramSettings
from backend_filesystem_vehicle_components import VehicleComponents

from MethodicConfigurator.common_arguments import add_common_arguments_and_parse
from common_arguments import add_common_arguments_and_parse

from MethodicConfigurator.frontend_tkinter_base import BaseWindow
from frontend_tkinter_base import BaseWindow

from MethodicConfigurator.version import VERSION
from version import VERSION

class TemplateOverviewWindow(BaseWindow):
"""
Expand Down

0 comments on commit 7ff07de

Please sign in to comment.