From 18d40fcebdb1dc69291128b790301b9bff29cc37 Mon Sep 17 00:00:00 2001 From: Uriy13 Date: Wed, 11 Sep 2019 20:47:57 +0400 Subject: [PATCH 1/4] add_1 --- src/gui.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gui.py b/src/gui.py index adcfaa2..70e83dd 100755 --- a/src/gui.py +++ b/src/gui.py @@ -285,6 +285,10 @@ def __init__(self, parent=None): self.setupUi(self) self.pushButton_2.clicked.connect(self.close) #self.destroy() + self.main_config = "./config.json" + self.main_array = load_json(self.main_config) + + class LogsWindow(QtWidgets.QMainWindow, ui.LogsWindow.Ui_LogsWindow): def __init__(self, parent=None): @@ -352,7 +356,7 @@ def __init__(self): # self.setStyleSheet(open("./ui/MainWindow.qss", 'r').read()) # except Exception as ex: # print(str(ex)) - + self.statusbar.showMessage("Ready") @@ -446,7 +450,7 @@ def add_records(self, records): # for label, item in file.iteritems(): # # https://pythonworld.ru/tipy-dannyx-v-python/slovari-dict-funkcii-i-metody-slovarej.html # # https://stackoverflow.com/questions/10458437/what-is-the-difference-between-dict-items-and-dict-iteritems - + new_row_index = self.tableFiles.rowCount() self.tableFiles.insertRow(new_row_index) @@ -516,7 +520,7 @@ def initDevices(self): my_list.append(getattr(__import__(cl), cl).to_string(dev["args"])) except Exception as ex: print(ex) - + self.comboBox_Source.addItems(my_list) self.comboBox_Target.addItems(my_list) @@ -531,7 +535,7 @@ def getPos(arr, item): iter += 1 return flag, iter - + s_f, s_i = getPos(self.devices_array, self.main_array["source"]) if s_f: self.comboBox_Source.setCurrentIndex(s_i) else: From ec5ed4d30c10e9c1a1847f6016823794caa1e8fd Mon Sep 17 00:00:00 2001 From: Uriy13 Date: Wed, 11 Sep 2019 20:49:27 +0400 Subject: [PATCH 2/4] add_2_rename --- src/gui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui.py b/src/gui.py index 70e83dd..cf2f78b 100755 --- a/src/gui.py +++ b/src/gui.py @@ -285,8 +285,8 @@ def __init__(self, parent=None): self.setupUi(self) self.pushButton_2.clicked.connect(self.close) #self.destroy() - self.main_config = "./config.json" - self.main_array = load_json(self.main_config) + self.rules_config = "./config.json" + self.rules_array = load_json(self.rules_config) From 95e900c008dc4e878113ba7a127b54e7df8d4644 Mon Sep 17 00:00:00 2001 From: Uriy13 Date: Thu, 12 Sep 2019 20:25:47 +0400 Subject: [PATCH 3/4] the end --- src/gui.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gui.py b/src/gui.py index cf2f78b..673b6d7 100755 --- a/src/gui.py +++ b/src/gui.py @@ -285,8 +285,15 @@ def __init__(self, parent=None): self.setupUi(self) self.pushButton_2.clicked.connect(self.close) #self.destroy() + #open config.json self.rules_config = "./config.json" self.rules_array = load_json(self.rules_config) + # field Include: + for i in range(len(rules_array["rules"]["include"])): + self.plainTextEdit.appendPlainText(rules_array["rules"]["include"][i]) + #field Exclude: + for i in range(len(rules_array["rules"]["exclude"])): + self.plainTextEdit_2.appendPlainText(rules_array["rules"]["exclude"][i]) From bd192c2ac85da6835f8128eba27452c206eb0453 Mon Sep 17 00:00:00 2001 From: Uriy13 Date: Thu, 12 Sep 2019 20:34:19 +0400 Subject: [PATCH 4/4] bag1 --- src/gui.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui.py b/src/gui.py index 673b6d7..05d9f99 100755 --- a/src/gui.py +++ b/src/gui.py @@ -289,11 +289,11 @@ def __init__(self, parent=None): self.rules_config = "./config.json" self.rules_array = load_json(self.rules_config) # field Include: - for i in range(len(rules_array["rules"]["include"])): - self.plainTextEdit.appendPlainText(rules_array["rules"]["include"][i]) + for i in range(len(self.rules_array["rules"]["include"])): + self.plainTextEdit.appendPlainText(self.rules_array["rules"]["include"][i]) #field Exclude: - for i in range(len(rules_array["rules"]["exclude"])): - self.plainTextEdit_2.appendPlainText(rules_array["rules"]["exclude"][i]) + for i in range(len(self.rules_array["rules"]["exclude"])): + self.plainTextEdit_2.appendPlainText(self.rules_array["rules"]["exclude"][i])