refs #1832

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_StreamOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_StreamOp.cxx b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
index 2a178d83f96d97b3fb4936f6331e8c98c96f3b48..89f44d9997b97399b97559e2d379a1deb63634f7 100755 (executable)
--- a/src/HYDROGUI/HYDROGUI_StreamOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
@@ -385,7 +385,7 @@ void HYDROGUI_StreamOp::createPreview()
     HYDROGUI_Tool::FindObjectByName( module(), myHydAxis, KIND_POLYLINEXY ) );
 
   HYDROData_SequenceOfObjects aRefProfiles;
-  //std::vector<Handle_HYDROData_Profile> aRefProfiles;
+  //std::vector<Handle(HYDROData_Profile)> aRefProfiles;
   int plen = myProfiles.length();
   for ( int i = 0; i < plen; ++i )
   {
@@ -420,24 +420,24 @@ void HYDROGUI_StreamOp::createPreview()
 
   HYDROData_Bathymetry::AltitudePoints points;
 
-  bool WireIntersections = false;
+  bool ProjStat = true;
   HYDROData_DTM::CreateProfilesFromDTM( aRefProfiles, ddz, ss, points, Out3dPres, Out2dPres, OutLeftB, OutRightB,
-    OutInlet, OutOutlet, true, true, InvInd, MAX_POINTS_IN_PREVIEW, WireIntersections );
+    OutInlet, OutOutlet, true, true, InvInd, MAX_POINTS_IN_PREVIEW, ProjStat );
 
   aPanel->clearAllBackgroundColorsForProfileList();
   for (std::set<int>::const_iterator it = InvInd.begin(); it != InvInd.end(); it++)
     aPanel->setBackgroundColorForProfileList(*it, QColor(Qt::yellow));
 
-  aPrsDef.myInlet = TopoDS::Wire(OutInlet);
-  aPrsDef.myOutlet = TopoDS::Wire(OutOutlet);
-  aPrsDef.myLeftBank = TopoDS::Wire(OutLeftB);
-  aPrsDef.myRightBank = TopoDS::Wire(OutRightB);
-  if (!WireIntersections)
+  aPrsDef.myInlet = OutInlet;
+  aPrsDef.myOutlet = OutOutlet;
+  aPrsDef.myLeftBank = OutLeftB;
+  aPrsDef.myRightBank = OutRightB;
+  if (ProjStat)
     aPrsDef.myPrs2D = Out2dPres;
   aPrsDef.myPrs3D = Out3dPres;
 
-  if (WireIntersections)
-    aPanel->addWarning(tr("STREAM_SELF_INTERSECTIONS"));
+  if (!ProjStat)
+    aPanel->addWarning(tr("STREAM_PROJECTION_FAILED"));
 
   myPreviewPrs->setShape( aPrsDef.myPrs2D );
 }