From cd69f91546fe4e813d8a3bcce2310d6032546800 Mon Sep 17 00:00:00 2001 From: asv Date: Fri, 28 Jan 2005 12:46:13 +0000 Subject: [PATCH] Fix for bug PAL7845: main->Editing() is called NOT before opening "Browse" node dialog or "Set Value" of input port dialog, but only after pressing "OK" in these dialogs. --- src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx | 3 +++ src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx | 3 ++- src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx b/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx index 655c710..57ba909 100644 --- a/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx +++ b/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx @@ -204,6 +204,7 @@ void SUPERVGUI_BrowseNodeDlg::setValues() { * Set inputed values of editable ports and then closes and destroys dialog */ void SUPERVGUI_BrowseNodeDlg::accept() { + myNodeCanvas->getMain()->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag if ( myIsEditable ) { SUPERVGUI_PortField* aField; for ( aField = myPortsList.first(); aField; aField = myPortsList.next() ) { @@ -359,6 +360,7 @@ SUPERVGUI_GetValueDlg::~SUPERVGUI_GetValueDlg() { * Set entered value into port and then closes and destroys dialog */ void SUPERVGUI_GetValueDlg::accept() { + myPortCanvas->getMain()->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag if ( myField->setNewValue() ) { myPortCanvas->sync(); @@ -517,6 +519,7 @@ void SUPERVGUI_StreamInDlg::setData() { } void SUPERVGUI_StreamInDlg::accept() { + myPortCanvas->getMain()->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag myPortCanvas->getStreamEngine()->SetParams((SUPERV::KindOfSchema) mySchemaCombo->currentItem(), (SUPERV::KindOfInterpolation) myInterCombo->currentItem(), (SUPERV::KindOfExtrapolation) myExterCombo->currentItem()); diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx index 7bd5d65..1cbe56f 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx +++ b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx @@ -514,7 +514,8 @@ void SUPERVGUI_CanvasNode::setVerbose(bool b) void SUPERVGUI_CanvasNode::browse() { - myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + // asv 28.01.05 : set "Editing" flag only on "OK" pressed in BrowseDlg + //myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag if (!myBrowseDlg) { myBrowseDlg = new SUPERVGUI_BrowseNodeDlg(this); myBrowseDlg->installEventFilter(this); diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx index 756bd00..e5cd954 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx +++ b/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx @@ -221,7 +221,8 @@ void SUPERVGUI_CanvasPortIn::setValue(const char* theValue) void SUPERVGUI_CanvasPortIn::setInput() { - getMain()->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag + // asv 28.01.05 : set "Editing" flag only on "OK" pressed in BrowseDlg + //getMain()->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag if (!myDlg) { myDlg = new SUPERVGUI_GetValueDlg(this); myDlg->installEventFilter(this); -- 2.39.2