fix: модифицированы эквидистанты графика силы
This commit is contained in:
parent
8a611998c0
commit
d158aa449c
@ -11,7 +11,7 @@ pillow==11.0.0
|
|||||||
plantuml==0.3.0
|
plantuml==0.3.0
|
||||||
pyparsing==3.2.0
|
pyparsing==3.2.0
|
||||||
PyQt5==5.15.11
|
PyQt5==5.15.11
|
||||||
PyQt5-Qt5==5.15.15
|
PyQt5-Qt5==5.15.2
|
||||||
PyQt5_sip==12.15.0
|
PyQt5_sip==12.15.0
|
||||||
pyqtgraph==0.13.7
|
pyqtgraph==0.13.7
|
||||||
python-dateutil==2.9.0.post0
|
python-dateutil==2.9.0.post0
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
from src.OptAlgorithm.AutoConfigClass import AutoConfigClass
|
from OptAlgorithm.AutoConfigClass import AutoConfigClass
|
||||||
from numpy import sqrt
|
from numpy import sqrt
|
||||||
|
|
||||||
class ConstantCalculator(AutoConfigClass):
|
class ConstantCalculator(AutoConfigClass):
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
from src.OptAlgorithm.PhaseCalc import PhaseCalc
|
from OptAlgorithm.PhaseCalc import PhaseCalc
|
||||||
from src.OptAlgorithm.OptTimeCalculator import OptTimeCalculator
|
from OptAlgorithm.OptTimeCalculator import OptTimeCalculator
|
||||||
from src.OptAlgorithm.AutoConfigClass import AutoConfigClass
|
from OptAlgorithm.AutoConfigClass import AutoConfigClass
|
||||||
from src.OptAlgorithm.ConstantCalculator import ConstantCalculator
|
from OptAlgorithm.ConstantCalculator import ConstantCalculator
|
||||||
|
|
||||||
from numpy import cos, sin, sqrt, cbrt, arcsin
|
from numpy import cos, sin, sqrt, cbrt, arcsin
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
from numpy import sqrt, arcsin, arccos, cos, sin
|
from numpy import sqrt, arcsin, arccos, cos, sin
|
||||||
|
|
||||||
from src.OptAlgorithm.AutoConfigClass import AutoConfigClass
|
from OptAlgorithm.AutoConfigClass import AutoConfigClass
|
||||||
from src.OptAlgorithm.ConstantCalculator import ConstantCalculator
|
from OptAlgorithm.ConstantCalculator import ConstantCalculator
|
||||||
|
|
||||||
class OptTimeCalculator(AutoConfigClass):
|
class OptTimeCalculator(AutoConfigClass):
|
||||||
|
|
||||||
|
|||||||
BIN
src/OptAlgorithm/__pycache__/AutoConfigClass.cpython-310.pyc
Normal file
BIN
src/OptAlgorithm/__pycache__/AutoConfigClass.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc
Normal file
BIN
src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/OptAlgorithm/__pycache__/OptAlgorithm.cpython-310.pyc
Normal file
BIN
src/OptAlgorithm/__pycache__/OptAlgorithm.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/OptAlgorithm/__pycache__/OptTimeCalculator.cpython-310.pyc
Normal file
BIN
src/OptAlgorithm/__pycache__/OptTimeCalculator.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/OptAlgorithm/__pycache__/PhaseCalc.cpython-310.pyc
Normal file
BIN
src/OptAlgorithm/__pycache__/PhaseCalc.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/OptAlgorithm/__pycache__/__init__.cpython-310.pyc
Normal file
BIN
src/OptAlgorithm/__pycache__/__init__.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/gui/__pycache__/__init__.cpython-310.pyc
Normal file
BIN
src/gui/__pycache__/__init__.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/gui/__pycache__/plot_window.cpython-310.pyc
Normal file
BIN
src/gui/__pycache__/plot_window.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/gui/__pycache__/qt_settings.cpython-310.pyc
Normal file
BIN
src/gui/__pycache__/qt_settings.cpython-310.pyc
Normal file
Binary file not shown.
@ -1,8 +1,8 @@
|
|||||||
import pyqtgraph as pg
|
import pyqtgraph as pg
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
|
||||||
from src.gui import qt_settings as qts
|
from gui import qt_settings as qts
|
||||||
from src.OptAlgorithm import OptAlgorithm
|
from OptAlgorithm import OptAlgorithm
|
||||||
|
|
||||||
|
|
||||||
class PlotWindow:
|
class PlotWindow:
|
||||||
@ -169,8 +169,8 @@ class PlotWindow:
|
|||||||
|
|
||||||
def _makeFiller(self, x1, y1, x2, y2, color):
|
def _makeFiller(self, x1, y1, x2, y2, color):
|
||||||
alpha = self.alpha
|
alpha = self.alpha
|
||||||
eq1 = pg.PlotDataItem(x1, y1, 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=2))
|
eq2 = pg.PlotDataItem(x2, y2, pen=pg.mkPen(color='#000000', width=1))
|
||||||
bg = pg.FillBetweenItem(eq1, eq2, qts.RGBA[color]+(alpha,))
|
bg = pg.FillBetweenItem(eq1, eq2, qts.RGBA[color]+(alpha,))
|
||||||
return eq1, eq2, bg
|
return eq1, eq2, bg
|
||||||
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
import pyqtgraph as pg
|
import pyqtgraph as pg
|
||||||
|
|
||||||
from src.utils import read_json, DiagramParser
|
from utils import read_json, DiagramParser
|
||||||
from src.uml import Request, UMLCreator
|
from uml import Request, UMLCreator
|
||||||
from src.OptAlgorithm import OptAlgorithm
|
from OptAlgorithm import OptAlgorithm
|
||||||
from src.gui import PlotWindow
|
from gui import PlotWindow
|
||||||
|
|
||||||
|
|
||||||
def get_ideal_timings(opt: OptAlgorithm) -> list[float]:
|
def get_ideal_timings(opt: OptAlgorithm) -> list[float]:
|
||||||
|
|||||||
BIN
src/uml/__pycache__/__init__.cpython-310.pyc
Normal file
BIN
src/uml/__pycache__/__init__.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/uml/__pycache__/creator.cpython-310.pyc
Normal file
BIN
src/uml/__pycache__/creator.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/uml/__pycache__/request_generator.cpython-310.pyc
Normal file
BIN
src/uml/__pycache__/request_generator.cpython-310.pyc
Normal file
Binary file not shown.
@ -1,4 +1,4 @@
|
|||||||
from src.uml.request_generator import Request
|
from uml.request_generator import Request
|
||||||
|
|
||||||
|
|
||||||
class UMLCreator:
|
class UMLCreator:
|
||||||
|
|||||||
BIN
src/utils/__pycache__/__init__.cpython-310.pyc
Normal file
BIN
src/utils/__pycache__/__init__.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/utils/__pycache__/diagram_parser.cpython-310.pyc
Normal file
BIN
src/utils/__pycache__/diagram_parser.cpython-310.pyc
Normal file
Binary file not shown.
BIN
src/utils/__pycache__/json_tools.cpython-310.pyc
Normal file
BIN
src/utils/__pycache__/json_tools.cpython-310.pyc
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user