Welding/WeldingSpotPerformance
9
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 2 Wiki Activity

style: Цвет "Oncoming" и исправление опечаток

Browse Source
This commit is contained in:
Леонид Титов 2024-12-06 12:29:27 +03:00
parent 9a8f8abbe4
commit b9fe95a4aa
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
params/operator_params.json
View File

@ -167,13 +167,13 @@
0.418,
0.454,
0.458,
0.54,
0.440,
0.49,
0.47,
0.44,
0.425,
0.464,
0.2
0.5
],
"object_thickness": [
0.0045,

4
src/controller/passportFormer.py
View File

@ -17,8 +17,8 @@ class idealDataBuilder(BaseIdealDataBuilder):
def get_weldingDF(self) -> pd.DataFrame:
data = []
X1, X2, V1, V2, F = self.calcPhaseGrow(self.Ts['tgrow'])
data.append({"time":0, "Posicion FE":X1,"Posicion ME":X2, "Rotor Speed FE":V1, "Rotor Speed ME":V2, "Force":F})
data.append({"time":self.welding_time, "Posicion FE":X1,"Posicion ME":X2, "Rotor Speed FE":V1, "Rotor Speed ME":V2, "Force":F})
data.append({"time":0, "Position FE":X1,"Position ME":X2, "Rotor Speed FE":V1, "Rotor Speed ME":V2, "Force":F})
data.append({"time":self.welding_time, "Position FE":X1,"Position ME":X2, "Rotor Speed FE":V1, "Rotor Speed ME":V2, "Force":F})
return pd.DataFrame(data)
def get_ideal_timings(self) -> list[float]:

22
src/utils/base/base.py
View File

@ -116,7 +116,7 @@ class BasePlotWidget:
"Squeeze": [45, 51, 89, 150],
"Welding": [64, 64, 64, 100],
"Relief": [0, 134, 88, 100],
"Oncomming": [255, 79, 0, 100]
"Oncomming": [0, 79, 0, 100]
}
self._plt_channels = {
"Electrode Force, N & Welding Current, kA": {
@ -147,7 +147,7 @@ class BasePlotWidget:
}
]
},
"Electrode Posicion, mm": {
"Electrode Position, mm": {
"Settings": {
"zoom": False,
"stages": True,
@ -157,21 +157,21 @@ class BasePlotWidget:
"Real_signals": [
{
"name": "Rotor Position, mm ME",
"pen": 'r',
"pen": {'color': 'r', 'width':2},
},
{
"name": "Rotor Position, mm FE",
"pen": 'w',
"pen": {'color': 'w', 'width':2},
}
],
"Ideal_signals": [
{
"name": "Posicion ME",
"pen": {'color': 'g', 'width':3},
"name": "Position ME",
"pen": {'color': 'g', 'width':4},
},
{
"name": "Posicion FE",
"pen": {'color': 'b', 'width':3},
"name": "Position FE",
"pen": {'color': 'b', 'width':4},
}
]
},
@ -197,12 +197,12 @@ class BasePlotWidget:
"Ideal_signals": [
{
"name": "Rotor Speed ME",
"pen": {'color': 'y', 'width':3},
"pen": {'color': 'g', 'width':3},
"zoom": False
},
{
"name": "Rotor Speed FE",
"pen": {'color': 'g', 'width':3},
"pen": {'color': 'b', 'width':3},
"zoom": False
}
]
@ -251,7 +251,7 @@ class BaseIdealDataBuilder(OptAlgorithm):
for i in range (0, int(end_timestamp*self.mul)):
time = i/self.mul
X1, X2, V1, V2, F = func(time)
data.append({"time":time, "Posicion FE":X1*1000,"Posicion ME":X2*1000, "Rotor Speed FE":V1*1000, "Rotor Speed ME":V2*1000, "Force":F})
data.append({"time":time, "Position FE":X1*1000,"Position ME":X2*1000, "Rotor Speed FE":V1*1000, "Rotor Speed ME":V2*1000, "Force":F})
return pd.DataFrame(data)
def get_closingDF(self) -> pd.DataFrame: