From: apo <apo@opencascade.com>
Date: Wed, 23 May 2007 12:48:01 +0000 (+0000)
Subject: Fix for Bug IPAL16041
X-Git-Tag: V4_0~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=650030ebc62fdbdbbc4abd8a6b1e0463e1033c63;p=modules%2Fvisu.git

Fix for Bug IPAL16041
 - IOLS. Regressions with selection
---

diff --git a/src/VISUGUI/VisuGUI_Prs3dTools.h b/src/VISUGUI/VisuGUI_Prs3dTools.h
index f169e8fc..0ae3d9d1 100644
--- a/src/VISUGUI/VisuGUI_Prs3dTools.h
+++ b/src/VISUGUI/VisuGUI_Prs3dTools.h
@@ -73,7 +73,6 @@ namespace VISU
 	     QObject::tr("BUT_OK"));
 	}
 	if (theViewWindow) {
-	  theViewWindow->highlight(theIO, 1);
 	  theViewWindow->getRenderer()->ResetCameraClippingRange();
 	  theViewWindow->Repaint();
 	}
@@ -86,7 +85,7 @@ namespace VISU
 	QApplication::restoreOverrideCursor();
       }
       delete aDlg;
-      RestoreSelection(theModule, NULL/*thePrs3d*/);
+      RestoreSelection(theModule);
     }
   }
 
@@ -241,32 +240,31 @@ namespace VISU
       if (!aValue) {
 	if (TDlg* aDlg = new TDlg(theModule)) { // dialog box in creation mode
 	  aDlg->initFromPrsObject(aPrs3d);
-
-	    if (runAndWait(aDlg,IsDlgModal) && (aDlg->storeToPrsObject(aPrs3d))) {
-	      if(aResourceMgr->booleanValue("VISU","display_only",false)){
-		if(SPlot2d_Viewer* aPlot2d = GetPlot2dViewer(theModule, false)) aPlot2d->EraseAll();
-	      } 
-	      // Optionally, create table and curves for cut lines
-	      QApplication::setOverrideCursor(Qt::waitCursor);
-	      CreateCurves( theModule,
-			    dynamic_cast<VISU::CutLines_i*>( aPrs3d ),
-			    aDlg,
-			    true ); // in creation mode
-	      UpdateObjBrowser(theModule,true,theTimeStamp);
-	      QApplication::restoreOverrideCursor();
-	      delete aDlg;
-	    } else {
-	      DeletePrs3d(theModule,aPrs3d);
-	      QApplication::restoreOverrideCursor();
-	      delete aDlg;
-	      return NULL;
-	    }
+	  if (runAndWait(aDlg,IsDlgModal) && (aDlg->storeToPrsObject(aPrs3d))) {
+	    if(aResourceMgr->booleanValue("VISU","display_only",false)){
+	      if(SPlot2d_Viewer* aPlot2d = GetPlot2dViewer(theModule, false)) aPlot2d->EraseAll();
+	    } 
+	    // Optionally, create table and curves for cut lines
+	    QApplication::setOverrideCursor(Qt::waitCursor);
+	    CreateCurves( theModule,
+			  dynamic_cast<VISU::CutLines_i*>( aPrs3d ),
+			  aDlg,
+			  true ); // in creation mode
+	    UpdateObjBrowser(theModule,true,theTimeStamp);
+	    QApplication::restoreOverrideCursor();
+	    delete aDlg;
+	  } else {
+	    DeletePrs3d(theModule,aPrs3d);
+	    QApplication::restoreOverrideCursor();
+	    delete aDlg;
+	    return NULL;
+	  }
 	}
       }
       aViewWindow = GetViewWindow<TViewer>(theModule);
       // Display created presentation.
       if (aViewWindow) {
-	PublishInView(theModule, aPrs3d, aViewWindow, /*highlight = */true);
+	PublishInView(theModule, aPrs3d, aViewWindow);
 	aViewWindow->onFitAll();
 
 	AddScalarBarPosition(theModule, aViewWindow, aPrs3d, aPos);
@@ -294,7 +292,7 @@ namespace VISU
     TPrs3d_i* aPrs3d = CreateAndEditPrs3d<TPrs3d_i,TViewer,TDlg,IsDlgModal>
       (theModule,theTimeStampSObj,thePublishInStudyMode);
 
-    RestoreSelection(theModule, aPrs3d);
+    RestoreSelection(theModule);
 
     theModule->application()->putInfo(QObject::tr("INF_DONE"));
   }