Compare commits

..

No commits in common. "45de3c76fc7b9d0a71e2cf0fb4f9369534bdf1e2" and "6a244afadd9edc517cc3ad0e1d22f5c30f67ecef" have entirely different histories.

8 changed files with 35 additions and 19 deletions

1
.gitignore vendored
View File

@ -5,4 +5,3 @@
/venv /venv
*.txt *.txt
*.svg *.svg
/test.py

View File

@ -344,19 +344,32 @@
], ],
"Tesla summary time": [ "Tesla summary time": [
2.34 , 1.824,
2.652 , 0.516,
2.796, 2.160,
2.4 , 0.492,
2.208 , 2.160,
2.34 , 0.636,
2.256 , 1.908,
2.544 , 0.492,
2.405 , 1.788,
2.405 , 0.420,
2.358 , 1.800,
2.37 , 0.540,
2.442 , 1.812,
0.444,
1.884,
0.660,
1.884,
0.521,
1.848,
0.557,
1.848,
0.510,
1.860,
0.510,
1.908,
0.534,
1.908 1.908
] ]

Binary file not shown.

View File

@ -46,7 +46,11 @@ class settingsWindow(QWidget):
self._num_points.editingFinished.connect(self._expand) self._num_points.editingFinished.connect(self._expand)
self._param_table = QTableWidget() self._param_table = QTableWidget()
self._restore() self._param_table.setColumnCount(2)
self._param_table.setRowCount(len(self._data))
for i, (key, items) in enumerate(self._data.items()):
self._param_table.setItem(i, 0, QTableWidgetItem(key))
self._param_table.setItem(i, 1, QTableWidgetItem(str(items[0])))
layout = QVBoxLayout() layout = QVBoxLayout()
header = QLabel(self._name) header = QLabel(self._name)
@ -74,8 +78,8 @@ class settingsWindow(QWidget):
def _restore(self) -> None: def _restore(self) -> None:
self._param_table.setRowCount(len(self._data)) self._param_table.setRowCount(len(self._data))
key = next(iter(self._data)) keys = self._data.keys()
self._param_table.setColumnCount(len(self._data[key])+1) self._param_table.setColumnCount(len(self._data[keys[0]])+1)
for i, (key, items) in enumerate(self._data.items()): for i, (key, items) in enumerate(self._data.items()):
self._param_table.setColumnCount(len(self._data[key])+1) self._param_table.setColumnCount(len(self._data[key])+1)
self._param_table.setItem(i, 0, QTableWidgetItem(key)) self._param_table.setItem(i, 0, QTableWidgetItem(key))

View File

@ -367,7 +367,7 @@ class BasePointPassportFormer:
start_idx, finish_idx = self._find_indexes(signal, dataframe) start_idx, finish_idx = self._find_indexes(signal, dataframe)
if start_idx[0] > finish_idx[0]: if start_idx[0] > finish_idx[0]:
start_idx = np.insert(start_idx, 0, 0) start_idx = np.insert(start_idx, 0, 0)
#print (start_idx) print (start_idx)
start_list = times.loc[start_idx].tolist() start_list = times.loc[start_idx].tolist()
end_list = times.loc[finish_idx].tolist() end_list = times.loc[finish_idx].tolist()
if len(start_list) - len(end_list) == 1: if len(start_list) - len(end_list) == 1:

BIN
weldingSpotPerformance.7z Normal file

Binary file not shown.