From 6400f04f1caeba9e02415db5fad877182317931c Mon Sep 17 00:00:00 2001 From: Artemiy Date: Wed, 27 May 2026 23:32:11 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=20=D1=80=D0=B0=D1=81=D1=87=D1=91=D1=82=20?= =?UTF-8?q?=D1=80=D0=B0=D1=81=D1=82=D0=B2=D0=BE=D1=80=D0=B8=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=B2=20=D0=BC=D0=B0=D1=82=D1=80=D0=B8=D1=86?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=BB=D0=B0=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calculations/.INFO.py.kate-swp | Bin 101 -> 0 bytes gui.py | 20 ++++++++++++++------ main.py | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 calculations/.INFO.py.kate-swp diff --git a/calculations/.INFO.py.kate-swp b/calculations/.INFO.py.kate-swp deleted file mode 100644 index 4834a674933ccf419d625900c3b333065dd4de07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vnd3v-lTzBS<+NE#w?riv~^y~TLCZ^y} jpbVpHa1f9J0WKisb`ACfbAWn)G@}wi8YC?08te)Hj&K$# diff --git a/gui.py b/gui.py index a5d5701..935580e 100644 --- a/gui.py +++ b/gui.py @@ -270,7 +270,6 @@ class MainWindow(QMainWindow): ) self.info_label.setText(solvent_text) self.info_label.setStyleSheet("background-color: #d5f5e3; padding: 8px; border-radius: 5px;") - print(result) # Сохраняем результаты для передачи в DoE self.last_medium_result = result @@ -572,19 +571,23 @@ class MainWindow(QMainWindow): n_exp = len(design) n_factors = len(factors) n_i_factors = len(i_factors) + solvent_name = self.exp_solvent.text() + total_volume = self.exp_total_volume.value() + solvent_unit = self.exp_volume_unit.currentText() self.design_matrix.setRowCount(n_exp) - self.design_matrix.setColumnCount(n_factors + 3) - headers = [f['name'] for f in factors] + [f['name'] for f in i_factors] + ["Растворитель"] +["Тип"] +["Отклик"] + self.design_matrix.setColumnCount(n_factors + 4) + headers = [f['name'] for f in factors] + [f['name'] for f in i_factors] + [solvent_name] +["Тип"] +["Отклик"] self.design_matrix.setHorizontalHeaderLabels(headers) for exp_idx, exp in enumerate(design): - + solvent = convert_units(total_volume,solvent_unit) for f_idx in range(n_factors): key = f"Фактор_{f_idx+1}" if key not in exp: continue value = exp[key]['natural'] unit = factors[f_idx]['unit'] + solvent -= convert_units(value,unit) display = self._format_number(value) if unit: display += f" {unit}" @@ -604,13 +607,18 @@ class MainWindow(QMainWindow): item.setBackground(QColor(255, 255, 200)) self.design_matrix.setItem(exp_idx, n_factors + f_idx, item) - + solvent = convert_units(solvent, "мкл", solvent_unit) + display = self._format_number(solvent) + if solvent_unit: + display += f" {solvent_unit}" + item = QTableWidgetItem(display) + self.design_matrix.setItem(exp_idx, n_factors+n_i_factors, item) if exp.get('is_center', False): type_item = QTableWidgetItem(f"Центр #{exp['center_num']}") type_item.setBackground(QColor(255, 255, 200)) else: type_item = QTableWidgetItem("Факторная") - self.design_matrix.setItem(exp_idx, n_factors+n_i_factors, type_item) + self.design_matrix.setItem(exp_idx, n_factors+n_i_factors + 1, type_item) self.design_matrix.resizeColumnsToContents() diff --git a/main.py b/main.py index 4a7c163..4237ddd 100644 --- a/main.py +++ b/main.py @@ -2,7 +2,7 @@ """ Биохимический помощник - точка входа в приложение TODO: -- Добавить информацию о количестве раствора в DOE +- Добавить информацию о количестве раствора в DOE ОК - Не считать фактор, если его шаг 0 ОК - Добавить столбец в матрицу планирования с информацией о количестве добавленного растворителя, учитывая все реагенты - Начать делать анализ