From 4a4f5e4248daeb6ad93f1101526bf53c1c24c8f6 Mon Sep 17 00:00:00 2001 From: brenda-br Date: Sun, 29 Jan 2023 11:45:16 +0530 Subject: Fix #32 Simulation window not shifting after submitting dock widget(More Fixes) --- DockWidgets/DockWidget.py | 6 ++++-- DockWidgets/DockWidgetCompoundSeparator.py | 3 +++ DockWidgets/DockWidgetCompressorExpander.py | 4 +++- DockWidgets/DockWidgetDistillationColumn.py | 3 +++ DockWidgets/DockWidgetFlash.py | 3 +++ DockWidgets/DockWidgetMaterialStream.py | 7 +++++-- DockWidgets/DockWidgetMixer.py | 3 +++ DockWidgets/DockWidgetShortcutColumn.py | 3 +++ DockWidgets/DockWidgetSplitter.py | 3 +++ .../DockWidgetMaterialStream.cpython-37.pyc | Bin 9123 -> 9230 bytes .../__pycache__/DockWidgetMixer.cpython-37.pyc | Bin 2384 -> 2384 bytes Redo.dat | Bin 26458 -> 0 bytes Undo.dat | Bin 0 -> 3471 bytes 13 files changed, 30 insertions(+), 5 deletions(-) diff --git a/DockWidgets/DockWidget.py b/DockWidgets/DockWidget.py index 68404c7..71e9624 100644 --- a/DockWidgets/DockWidget.py +++ b/DockWidgets/DockWidget.py @@ -90,7 +90,7 @@ class DockWidget(QDockWidget,ui_dialog): self.show_error() break - print("param ", self.dict) + #print("param ", self.dict) self.obj.param_setter(self.dict) for i in self.container.graphics.graphicsView.items(): try: @@ -98,7 +98,9 @@ class DockWidget(QDockWidget,ui_dialog): i.update_tooltip() except: pass - + if(self.isVisible()): + currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() + self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) self.hide() except Exception as e: diff --git a/DockWidgets/DockWidgetCompoundSeparator.py b/DockWidgets/DockWidgetCompoundSeparator.py index 710ba5e..57b1339 100644 --- a/DockWidgets/DockWidgetCompoundSeparator.py +++ b/DockWidgets/DockWidgetCompoundSeparator.py @@ -113,6 +113,9 @@ class DockWidgetCompoundSeparator(QDockWidget,ui_dialog): self.obj.param_setter(self.dict) + if(self.isVisible()): + currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() + self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) self.hide() except Exception as e: diff --git a/DockWidgets/DockWidgetCompressorExpander.py b/DockWidgets/DockWidgetCompressorExpander.py index 47f463d..e8e2b31 100644 --- a/DockWidgets/DockWidgetCompressorExpander.py +++ b/DockWidgets/DockWidgetCompressorExpander.py @@ -107,7 +107,9 @@ class DockWidgetCompressorExpander(QDockWidget,ui_dialog): i.update_tooltip() except: pass - + if(self.isVisible()): + currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() + self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) self.hide() except Exception as e: diff --git a/DockWidgets/DockWidgetDistillationColumn.py b/DockWidgets/DockWidgetDistillationColumn.py index 1c30309..e2e1031 100644 --- a/DockWidgets/DockWidgetDistillationColumn.py +++ b/DockWidgets/DockWidgetDistillationColumn.py @@ -179,6 +179,9 @@ class DockWidgetDistillationColumn(QDockWidget, ui_dialog): print("param ", self.dict) self.obj.param_setter(self.dict) + if(self.isVisible()): + currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() + self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) self.hide() except Exception as e: diff --git a/DockWidgets/DockWidgetFlash.py b/DockWidgets/DockWidgetFlash.py index 368a009..c75f950 100644 --- a/DockWidgets/DockWidgetFlash.py +++ b/DockWidgets/DockWidgetFlash.py @@ -65,6 +65,9 @@ class DockWidgetFlash(QDockWidget,ui_dialog): self.dict = [self.input_dict[0].currentText(),self.input_dict[1].isChecked(), float(self.input_dict[2].text()), self.input_dict[3].isChecked(), float(self.input_dict[4].text())] print("param ", self.dict) self.obj.param_setter(self.dict) + if(self.isVisible()): + currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() + self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) self.hide() except Exception as e: diff --git a/DockWidgets/DockWidgetMaterialStream.py b/DockWidgets/DockWidgetMaterialStream.py index b9acc95..a7f06df 100644 --- a/DockWidgets/DockWidgetMaterialStream.py +++ b/DockWidgets/DockWidgetMaterialStream.py @@ -174,7 +174,9 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): i.update_tooltip() except: pass - + if(self.isVisible()): + currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() + self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) self.hide() except Exception as e: @@ -358,4 +360,5 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): def closeEvent(self,event): scrollHVal = self.parent().container.graphics.graphicsView.horizontalScrollBarVal currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() - self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) \ No newline at end of file + self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) + \ No newline at end of file diff --git a/DockWidgets/DockWidgetMixer.py b/DockWidgets/DockWidgetMixer.py index c5f06fc..2d02f8c 100644 --- a/DockWidgets/DockWidgetMixer.py +++ b/DockWidgets/DockWidgetMixer.py @@ -46,6 +46,9 @@ class DockWidgetMixer(QDockWidget,ui_dialog): self.dict={} self.dict = [int(self.input_dict[0].text()), self.input_dict[1].currentText()] self.obj.param_setter(self.dict) + if(self.isVisible()): + currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() + self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) self.hide() except Exception as e: diff --git a/DockWidgets/DockWidgetShortcutColumn.py b/DockWidgets/DockWidgetShortcutColumn.py index d07f323..9b65021 100644 --- a/DockWidgets/DockWidgetShortcutColumn.py +++ b/DockWidgets/DockWidgetShortcutColumn.py @@ -90,6 +90,9 @@ class DockWidgetShortcutColumn(QDockWidget,ui_dialog): self.input_dict[4].currentText(), float(self.input_dict[5].text()), float(self.input_dict[6].text()), float(self.input_dict[7].text()), self.input_dict[8].currentText()] self.obj.param_setter(self.dict) + if(self.isVisible()): + currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() + self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) self.hide() except Exception as e: diff --git a/DockWidgets/DockWidgetSplitter.py b/DockWidgets/DockWidgetSplitter.py index 089b517..24a8ee2 100644 --- a/DockWidgets/DockWidgetSplitter.py +++ b/DockWidgets/DockWidgetSplitter.py @@ -65,6 +65,9 @@ class DockWidgetSplitter(QDockWidget,ui_dialog): self.dict={} self.dict = [int(self.input_dict[0].text()),self.input_dict[1].currentText(), float(self.input_dict[2].text()), float(self.input_dict[3].text())] self.obj.param_setter(self.dict) + if(self.isVisible()): + currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() + self.parent().container.graphics.graphicsView.horizontalScrollBar().setValue(currentVal-189) self.hide() except Exception as e: print(e) diff --git a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc index 00acef9..85ed32e 100644 Binary files a/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc and b/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc differ diff --git a/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc index d5e0ab0..e2ca618 100644 Binary files a/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc and b/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc differ diff --git a/Redo.dat b/Redo.dat index 0846630..e69de29 100644 Binary files a/Redo.dat and b/Redo.dat differ diff --git a/Undo.dat b/Undo.dat index e69de29..435cb62 100644 Binary files a/Undo.dat and b/Undo.dat differ -- cgit