Fix for bug PAL7845: main->Editing() is called NOT before opening "Browse" node dialo...

diff --git a/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx b/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx
index 655c710ecf877bcc68c48459629339938a208e44..57ba90952b384f0822fd0258ac1c7df57575d900 100644 (file)
--- 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 7bd5d6500a92a793451c652aecae29a8fd0cd91c..1cbe56f3c59b927f8535eaa294b268a802dc0d68 100644 (file)
--- 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 756bd008dd9dd6fa745a758cd9f8e2a4364e8071..e5cd95440f6780afbffd5dd032f77db7b9169ac7 100644 (file)
--- 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);