diff --git a/requirements.txt b/requirements.txt index b9aaa6d..5623a1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pillow==11.0.0 plantuml==0.3.0 pyparsing==3.2.0 PyQt5==5.15.11 -PyQt5-Qt5==5.15.15 +PyQt5-Qt5==5.15.2 PyQt5_sip==12.15.0 pyqtgraph==0.13.7 python-dateutil==2.9.0.post0 diff --git a/src/OptAlgorithm/ConstantCalculator.py b/src/OptAlgorithm/ConstantCalculator.py index 7146fa2..3a9dfe7 100644 --- a/src/OptAlgorithm/ConstantCalculator.py +++ b/src/OptAlgorithm/ConstantCalculator.py @@ -1,4 +1,4 @@ -from src.OptAlgorithm.AutoConfigClass import AutoConfigClass +from OptAlgorithm.AutoConfigClass import AutoConfigClass from numpy import sqrt class ConstantCalculator(AutoConfigClass): diff --git a/src/OptAlgorithm/OptAlgorithm.py b/src/OptAlgorithm/OptAlgorithm.py index c86e411..e9dbc34 100644 --- a/src/OptAlgorithm/OptAlgorithm.py +++ b/src/OptAlgorithm/OptAlgorithm.py @@ -1,7 +1,7 @@ -from src.OptAlgorithm.PhaseCalc import PhaseCalc -from src.OptAlgorithm.OptTimeCalculator import OptTimeCalculator -from src.OptAlgorithm.AutoConfigClass import AutoConfigClass -from src.OptAlgorithm.ConstantCalculator import ConstantCalculator +from OptAlgorithm.PhaseCalc import PhaseCalc +from OptAlgorithm.OptTimeCalculator import OptTimeCalculator +from OptAlgorithm.AutoConfigClass import AutoConfigClass +from OptAlgorithm.ConstantCalculator import ConstantCalculator from numpy import cos, sin, sqrt, cbrt, arcsin diff --git a/src/OptAlgorithm/OptTimeCalculator.py b/src/OptAlgorithm/OptTimeCalculator.py index aa1d9ce..3b954be 100644 --- a/src/OptAlgorithm/OptTimeCalculator.py +++ b/src/OptAlgorithm/OptTimeCalculator.py @@ -1,7 +1,7 @@ from numpy import sqrt, arcsin, arccos, cos, sin -from src.OptAlgorithm.AutoConfigClass import AutoConfigClass -from src.OptAlgorithm.ConstantCalculator import ConstantCalculator +from OptAlgorithm.AutoConfigClass import AutoConfigClass +from OptAlgorithm.ConstantCalculator import ConstantCalculator class OptTimeCalculator(AutoConfigClass): diff --git a/src/OptAlgorithm/__pycache__/AutoConfigClass.cpython-310.pyc b/src/OptAlgorithm/__pycache__/AutoConfigClass.cpython-310.pyc new file mode 100644 index 0000000..d27e969 Binary files /dev/null and b/src/OptAlgorithm/__pycache__/AutoConfigClass.cpython-310.pyc differ diff --git a/src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc b/src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc new file mode 100644 index 0000000..002933b Binary files /dev/null and b/src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc differ diff --git a/src/OptAlgorithm/__pycache__/OptAlgorithm.cpython-310.pyc b/src/OptAlgorithm/__pycache__/OptAlgorithm.cpython-310.pyc new file mode 100644 index 0000000..d41c35b Binary files /dev/null and b/src/OptAlgorithm/__pycache__/OptAlgorithm.cpython-310.pyc differ diff --git a/src/OptAlgorithm/__pycache__/OptTimeCalculator.cpython-310.pyc b/src/OptAlgorithm/__pycache__/OptTimeCalculator.cpython-310.pyc new file mode 100644 index 0000000..cfe359f Binary files /dev/null and b/src/OptAlgorithm/__pycache__/OptTimeCalculator.cpython-310.pyc differ diff --git a/src/OptAlgorithm/__pycache__/PhaseCalc.cpython-310.pyc b/src/OptAlgorithm/__pycache__/PhaseCalc.cpython-310.pyc new file mode 100644 index 0000000..137f017 Binary files /dev/null and b/src/OptAlgorithm/__pycache__/PhaseCalc.cpython-310.pyc differ diff --git a/src/OptAlgorithm/__pycache__/__init__.cpython-310.pyc b/src/OptAlgorithm/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..a874aab Binary files /dev/null and b/src/OptAlgorithm/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/gui/__pycache__/__init__.cpython-310.pyc b/src/gui/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..f91d31e Binary files /dev/null and b/src/gui/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/gui/__pycache__/plot_window.cpython-310.pyc b/src/gui/__pycache__/plot_window.cpython-310.pyc new file mode 100644 index 0000000..1433394 Binary files /dev/null and b/src/gui/__pycache__/plot_window.cpython-310.pyc differ diff --git a/src/gui/__pycache__/qt_settings.cpython-310.pyc b/src/gui/__pycache__/qt_settings.cpython-310.pyc new file mode 100644 index 0000000..02debb7 Binary files /dev/null and b/src/gui/__pycache__/qt_settings.cpython-310.pyc differ diff --git a/src/gui/plot_window.py b/src/gui/plot_window.py index 0343766..8b77ed4 100644 --- a/src/gui/plot_window.py +++ b/src/gui/plot_window.py @@ -1,8 +1,8 @@ import pyqtgraph as pg import numpy as np -from src.gui import qt_settings as qts -from src.OptAlgorithm import OptAlgorithm +from gui import qt_settings as qts +from OptAlgorithm import OptAlgorithm class PlotWindow: @@ -169,8 +169,8 @@ class PlotWindow: def _makeFiller(self, x1, y1, x2, y2, color): alpha = self.alpha - eq1 = pg.PlotDataItem(x1, y1, pen=pg.mkPen(color='#000000', width=2)) - eq2 = pg.PlotDataItem(x2, y2, pen=pg.mkPen(color='#000000', width=2)) + eq1 = pg.PlotDataItem(x1, y1, pen=pg.mkPen(color='#000000', width=1)) + eq2 = pg.PlotDataItem(x2, y2, pen=pg.mkPen(color='#000000', width=1)) bg = pg.FillBetweenItem(eq1, eq2, qts.RGBA[color]+(alpha,)) return eq1, eq2, bg diff --git a/src/main.py b/src/main.py index a782bec..14346ab 100644 --- a/src/main.py +++ b/src/main.py @@ -1,9 +1,9 @@ import pyqtgraph as pg -from src.utils import read_json, DiagramParser -from src.uml import Request, UMLCreator -from src.OptAlgorithm import OptAlgorithm -from src.gui import PlotWindow +from utils import read_json, DiagramParser +from uml import Request, UMLCreator +from OptAlgorithm import OptAlgorithm +from gui import PlotWindow def get_ideal_timings(opt: OptAlgorithm) -> list[float]: diff --git a/src/uml/__pycache__/__init__.cpython-310.pyc b/src/uml/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..d8643a5 Binary files /dev/null and b/src/uml/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/uml/__pycache__/creator.cpython-310.pyc b/src/uml/__pycache__/creator.cpython-310.pyc new file mode 100644 index 0000000..7c1ed5b Binary files /dev/null and b/src/uml/__pycache__/creator.cpython-310.pyc differ diff --git a/src/uml/__pycache__/request_generator.cpython-310.pyc b/src/uml/__pycache__/request_generator.cpython-310.pyc new file mode 100644 index 0000000..67a75b5 Binary files /dev/null and b/src/uml/__pycache__/request_generator.cpython-310.pyc differ diff --git a/src/uml/creator.py b/src/uml/creator.py index e3d43ff..f07b915 100644 --- a/src/uml/creator.py +++ b/src/uml/creator.py @@ -1,4 +1,4 @@ -from src.uml.request_generator import Request +from uml.request_generator import Request class UMLCreator: diff --git a/src/utils/__pycache__/__init__.cpython-310.pyc b/src/utils/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..34e14df Binary files /dev/null and b/src/utils/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/utils/__pycache__/diagram_parser.cpython-310.pyc b/src/utils/__pycache__/diagram_parser.cpython-310.pyc new file mode 100644 index 0000000..19b6158 Binary files /dev/null and b/src/utils/__pycache__/diagram_parser.cpython-310.pyc differ diff --git a/src/utils/__pycache__/json_tools.cpython-310.pyc b/src/utils/__pycache__/json_tools.cpython-310.pyc new file mode 100644 index 0000000..1d2234b Binary files /dev/null and b/src/utils/__pycache__/json_tools.cpython-310.pyc differ