Skip to content
Snippets Groups Projects
Commit 66a635f7 authored by Ivo Peterek's avatar Ivo Peterek
Browse files

FIX: results visualisation if only main region is selected.

parent 6cece5e9
No related branches found
No related tags found
No related merge requests found
......@@ -74,10 +74,11 @@ class Window(QtWidgets.QDialog):
self.combo_reg = QtWidgets.QComboBox(self)
self.combo_reg.addItem('Overall summary')
#TODO - multiple measurements handling (2 in range is ad hoc)
for i in range(0,len(self.d["nested_regions_report_data"]),2):
comboItem = "REGION - {}".format(self.d["nested_regions_report_data"][i]["nested_region"])
if comboItem not in [self.combo_reg.itemText(i) for i in range(self.combo_reg.count())]:
self.combo_reg.addItem(comboItem)
if "nested_regions_report_data" in self.d.keys():
for i in range(0,len(self.d["nested_regions_report_data"]),2):
comboItem = "REGION - {}".format(self.d["nested_regions_report_data"][i]["nested_region"])
if comboItem not in [self.combo_reg.itemText(i) for i in range(self.combo_reg.count())]:
self.combo_reg.addItem(comboItem)
if len(self.data) > 1:
self.combo = QtWidgets.QComboBox(self)
......
......@@ -79,10 +79,11 @@ class Window(QtWidgets.QDialog):
self.combo_reg = QtWidgets.QComboBox(self)
self.combo_reg.addItem('Overall summary')
#TODO - multiple measurements handling (2 in range is ad hoc)
for i in range(0,len(self.d["nested_regions_report_data"]),2):
comboItem = "REGION - {}".format(self.d["nested_regions_report_data"][i]["nested_region"])
if comboItem not in [self.combo_reg.itemText(i) for i in range(self.combo_reg.count())]:
self.combo_reg.addItem(comboItem)
if "nested_regions_report_data" in self.d.keys():
for i in range(0,len(self.d["nested_regions_report_data"]),2):
comboItem = "REGION - {}".format(self.d["nested_regions_report_data"][i]["nested_region"])
if comboItem not in [self.combo_reg.itemText(i) for i in range(self.combo_reg.count())]:
self.combo_reg.addItem(comboItem)
if len(self.D) > 1:
......
......@@ -71,6 +71,13 @@ class MainMenu(QtWidgets.QFrame, design_main_menu.Ui_MainMenu):
self.radar_data = DataHandler(self.config_path)
self.sub_windows = []
if "nested_regions_report_data" not in self.radar_data.raw_data.keys():
self.pushButton_average_start.setEnabled(0)
self.pushButton_table_nested_region.setEnabled(0)
self.pushButton_tree.setEnabled(0)
self.__print_success_msg('Some analysis options were disabled because analyzed measurement contains only'
' main region.', 'Info')
def __plot(self):
self.plot_window = data_plot.Window(ownData=self.radar_data.raw_data)
self.plot_window.show()
......@@ -90,25 +97,25 @@ class MainMenu(QtWidgets.QFrame, design_main_menu.Ui_MainMenu):
self.dictForTex[objType].append(entry)
def __tree(self):
self.tree_window = pydot_example.regionTree(pathToData = self.radar_data.raw_data['root_folder_lst'][0], ownData=self.radar_data.raw_data, defaultDPI='300')
self.tree_window.show()
self.tree_window.sendInfo.connect(partial(self.__getTeXInfo,'tree'))
#pydot_example.browse_dir(self.radar_data.raw_data['root_folder_lst'][0], ownData=self.radar_data.raw_data)
self.sub_windows.append(self.tree_window)
self.tree_window = pydot_example.regionTree(pathToData = self.radar_data.raw_data['root_folder_lst'][0], ownData=self.radar_data.raw_data, defaultDPI='300')
self.tree_window.show()
self.tree_window.sendInfo.connect(partial(self.__getTeXInfo,'tree'))
#pydot_example.browse_dir(self.radar_data.raw_data['root_folder_lst'][0], ownData=self.radar_data.raw_data)
self.sub_windows.append(self.tree_window)
def __average_start(self):
self.average_start_window = all_tables.IndicSelectWindow(table="regions", ownData=self.radar_data.raw_data)
self.average_start_window.createTable()
self.average_start_window.show()
self.average_start_window.sendInfo.connect(partial(self.__getTeXInfo,'regions'))
self.sub_windows.append(self.average_start_window)
self.average_start_window = all_tables.IndicSelectWindow(table="regions", ownData=self.radar_data.raw_data)
self.average_start_window.createTable()
self.average_start_window.show()
self.average_start_window.sendInfo.connect(partial(self.__getTeXInfo,'regions'))
self.sub_windows.append(self.average_start_window)
def __table_nested_region(self):
self.nested_region_window = all_tables.IndicSelectWindow(table="onereg", ownData=self.radar_data.raw_data)
self.nested_region_window.createTable()
self.nested_region_window.show()
self.nested_region_window.sendInfo.connect(partial(self.__getTeXInfo,'nested'))
self.sub_windows.append(self.nested_region_window)
self.nested_region_window = all_tables.IndicSelectWindow(table="onereg", ownData=self.radar_data.raw_data)
self.nested_region_window.createTable()
self.nested_region_window.show()
self.nested_region_window.sendInfo.connect(partial(self.__getTeXInfo,'nested'))
self.sub_windows.append(self.nested_region_window)
def __overall(self):
self.overall_window = all_tables.IndicSelectWindow(table="overall", ownData=self.radar_data.raw_data)
......@@ -149,7 +156,7 @@ class MainMenu(QtWidgets.QFrame, design_main_menu.Ui_MainMenu):
'/.gui_tmp_config_{}.py'.format(os.getpid()), config_file_path)
self.__print_success_msg('File has been saved successfully.', 'File Saved')
except:
self.__print_error_msg('Something went wrong.', 'Error')
self.__print_error_msg('Something went wrong. Config not saved.', 'Error')
def close_sub_windows(self):
if self.sub_windows:
......
......@@ -351,8 +351,13 @@ class TabWidget(QtWidgets.QTabWidget, design_radarGUI_analyze.Ui_TabWidget):
def __show_tree(self):
self.tree_window = pydot_example.regionTree(pathToData=self.data_path, ownData=self.tree_data_selected, addButtonIncluded = False)
self.tree_window.show()
if len(self.regions) > 1:
self.tree_window = pydot_example.regionTree(pathToData=self.data_path, ownData=self.tree_data_selected,
addButtonIncluded = False)
self.tree_window.show()
else:
self.__print_info_msg('Unable to show region tree because there is only one region available'
' in selected measurement.')
def __filter(self):
threshold = float(self.doubleSpinBox.text().replace(',', '.'))
......@@ -391,6 +396,14 @@ class TabWidget(QtWidgets.QTabWidget, design_radarGUI_analyze.Ui_TabWidget):
msg.setStandardButtons(QtWidgets.QMessageBox.Close)
msg.exec_()
def __print_info_msg(self, text):
msg = QtWidgets.QMessageBox()
msg.setIcon(QtWidgets.QMessageBox.Information)
msg.setText(text)
msg.setWindowTitle("Unable to show region tree.")
msg.setStandardButtons(QtWidgets.QMessageBox.Close)
msg.exec_()
def __next(self):
self.tab_widget.setCurrentIndex(self.tab_widget.currentIndex() + 1)
......
......@@ -735,8 +735,13 @@ class Ui_TabWidget(object):
TabWidget_p.setTabText(TabWidget_p.indexOf(self.tab_AddOptions), _translate("TabWidget", "Additional options"))
def __show_tree(self):
self.tree_window = pydot_example.regionTree(pathToData=self.data_path, ownData=self.tree_data_selected, addButtonIncluded=False)
self.tree_window.show()
if len(self.regions) > 1:
self.tree_window = pydot_example.regionTree(pathToData=self.data_path, ownData=self.tree_data_selected,
addButtonIncluded=False)
self.tree_window.show()
else:
self.__print_info_msg('Unable to show region tree because there is only one region available'
' in selected measurement.')
def __filter(self):
threshold = float(self.doubleSpinBox.text().replace(',', '.'))
......@@ -779,7 +784,13 @@ class Ui_TabWidget(object):
msg.buttonClicked.connect(self.msgbtn)
msg.exec_()
def __print_info_msg(self, text):
msg = QtWidgets.QMessageBox()
msg.setIcon(QtWidgets.QMessageBox.Information)
msg.setText(text)
msg.setWindowTitle("Unable to show region tree.")
msg.setStandardButtons(QtWidgets.QMessageBox.Close)
msg.exec_()
def __next(self):
self.tab_widget.setCurrentIndex(self.tab_widget.currentIndex() + 1)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment