X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_StreamOp.cxx;h=b36158151611c1accfcefcde8d58ec0b0355e919;hb=474c2cd65280d793f1c81ca528bc92e1cff988e6;hp=1557a79444f00e2eea7d37579aa3afd5d784a1a7;hpb=2d99821157e770385d7af917b2d22d6aa3cacb7e;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_StreamOp.cxx b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
index 1557a794..b3615815 100755
--- a/src/HYDROGUI/HYDROGUI_StreamOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,6 +23,7 @@
 #include "HYDROGUI_StreamOp.h"
 
 #include "HYDROGUI_Module.h"
+#include <HYDROGUI_DataObject.h>
 #include "HYDROGUI_Shape.h"
 #include "HYDROGUI_StreamDlg.h"
 #include "HYDROGUI_Tool.h"
@@ -52,10 +53,35 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
+
+void insertProfileInToOrder( const QString& theProfileName,
+                             const double&  theProfilePar,
+                             QStringList&   theProfiles,
+                             QList<double>& theProfileParams )
+{
+  bool anIsInserted = false;
+  for ( int k = 0; k < theProfileParams.length(); ++k )
+  {
+    const double& aParam = theProfileParams.value( k );
+    if ( theProfilePar < aParam )
+    {
+      theProfiles.insert( k, theProfileName );
+      theProfileParams.insert( k, theProfilePar );
+      anIsInserted = true;
+      break;
+    }
+  }
+  
+  if ( !anIsInserted )
+  {
+    theProfiles << theProfileName;
+    theProfileParams << theProfilePar;
+  }
+}
+
 HYDROGUI_StreamOp::HYDROGUI_StreamOp( HYDROGUI_Module* theModule, bool theIsEdit )
 : HYDROGUI_Operation( theModule ), 
   myIsEdit( theIsEdit ),
-  myViewManager( NULL ),
   myPreviewPrs( NULL )
 {
   setName( theIsEdit ? tr( "EDIT_STREAM" ) : tr( "CREATE_STREAM" ) );
@@ -70,33 +96,62 @@ void HYDROGUI_StreamOp::startOperation()
 {
   HYDROGUI_Operation::startOperation();
 
-  // We start operation in the document
-  startDocOperation();
+  myEditedObject.Nullify();
+  myHydAxis.clear();
+  myProfiles.clear();
+  myProfileParams.clear();
 
   // Get panel and reset its state
   HYDROGUI_StreamDlg* aPanel = (HYDROGUI_StreamDlg*)inputPanel();
   aPanel->reset();
 
-  // Get/create the edited object
-  if( myIsEdit ) {
-    myEditedObject = Handle(HYDROData_Stream)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
-  } else {
-    myEditedObject = Handle(HYDROData_Stream)::DownCast( doc()->CreateObject( KIND_STREAM ) );
-  }
-
-  // Get the edited object name
-  QString anObjectName; 
-  if ( !myIsEdit ) {
-    anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_STREAM_NAME" ) );
-  } else if ( !myEditedObject.IsNull() ) {
-    anObjectName = myEditedObject->GetName();
+  QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_STREAM_NAME" ) );
+  if ( myIsEdit )
+  {
+    myEditedObject =
+      Handle(HYDROData_Stream)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+    if ( !myEditedObject.IsNull() )
+    {
+      anObjectName = myEditedObject->GetName();
+
+      // Hydraulic axis
+      Handle(HYDROData_PolylineXY) aHydraulicAxis = myEditedObject->GetHydraulicAxis();
+      if ( !aHydraulicAxis.IsNull() )
+      {
+        myHydAxis = aHydraulicAxis->GetName();
+
+        TopoDS_Face aPlane;
+        if ( HYDROData_Stream::BuildFace( aHydraulicAxis, aPlane ) )
+        {
+          // Stream profiles
+          HYDROData_SequenceOfObjects aStreamProfiles = myEditedObject->GetProfiles();
+          for ( int i = 1, n = aStreamProfiles.Length(); i <= n; ++i )
+          {
+            Handle(HYDROData_Profile) aProfile = 
+              Handle(HYDROData_Profile)::DownCast( aStreamProfiles.Value( i ) );
+            if ( aProfile.IsNull() )
+              continue;
+
+            QString aProfileName = aProfile->GetName();
+
+            Standard_Real aProfilePar = 0.0;
+            HYDROData_Stream::HasIntersection( aHydraulicAxis, aProfile, aPlane, aProfilePar );
+
+            myProfiles      << aProfileName;
+            myProfileParams << aProfilePar;
+          }
+        }
+      }
+    }
   }
 
   // Update the panel
   // set the edited object name
   aPanel->setObjectName( anObjectName );
+
   // set the existing 2D polylines names to the panel
   aPanel->setAxisNames( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_POLYLINEXY ) );
+
   // synchronize the panel state with the edited object state
   updatePanelData();
 
@@ -107,15 +162,12 @@ void HYDROGUI_StreamOp::startOperation()
 void HYDROGUI_StreamOp::abortOperation()
 {
   erasePreview();
-  abortDocOperation();
-
   HYDROGUI_Operation::abortOperation();
 }
 
 void HYDROGUI_StreamOp::commitOperation()
 {
   erasePreview();
-
   HYDROGUI_Operation::commitOperation();
 }
 
@@ -133,40 +185,58 @@ HYDROGUI_InputPanel* HYDROGUI_StreamOp::createInputPanel() const
 }
 
 bool HYDROGUI_StreamOp::processApply( int& theUpdateFlags,
-                                      QString& theErrorMsg )
+                                      QString& theErrorMsg,
+                                      QStringList& theBrowseObjectsEntries )
 {
   HYDROGUI_StreamDlg* aPanel = ::qobject_cast<HYDROGUI_StreamDlg*>( inputPanel() );
-  if ( !aPanel || myEditedObject.IsNull() ) {
+  if ( !aPanel )
     return false;
-  }
 
   // Check whether the object name is not empty
   QString anObjectName = aPanel->getObjectName().simplified();
-  if ( anObjectName.isEmpty() ) {
+  if ( anObjectName.isEmpty() )
+  {
     theErrorMsg = tr( "INCORRECT_OBJECT_NAME" );
     return false;
   }
 
   // Check that there are no other objects with the same name in the document
-  if( myEditedObject->GetName() != anObjectName )
+  if ( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anObjectName ) )
   {
     Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), anObjectName );
-    if( !anObject.IsNull() ) {
+    if( !anObject.IsNull() )
+    {
       theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anObjectName );
       return false;
     }
   }
 
+  if ( myEditedObject.IsNull() ) // Create new data model object
+    myEditedObject = Handle(HYDROData_Stream)::DownCast( doc()->CreateObject( KIND_STREAM ) );
+
   // Check if the axis is set
-  Handle(HYDROData_PolylineXY) aHydraulicAxis = myEditedObject->GetHydraulicAxis();
-  if ( aHydraulicAxis.IsNull() ) {
+  Handle(HYDROData_PolylineXY) aHydAxis = Handle(HYDROData_PolylineXY)::DownCast(
+    HYDROGUI_Tool::FindObjectByName( module(), myHydAxis, KIND_POLYLINEXY ) );
+  if ( aHydAxis.IsNull() )
+  {
     theErrorMsg = tr( "AXIS_NOT_DEFINED" );
     return false;
   }
 
   // Check if at least 2 profiles is set
-  HYDROData_SequenceOfObjects aProfiles = myEditedObject->GetProfiles();
-  if ( aProfiles.Length() < 2 ) {
+  HYDROData_SequenceOfObjects aRefProfiles;
+  for ( int i = 0; i < myProfiles.length(); ++i )
+  {
+    QString aProfileName = myProfiles.value( i );
+
+    Handle(HYDROData_Profile) aProfile = Handle(HYDROData_Profile)::DownCast(
+      HYDROGUI_Tool::FindObjectByName( module(), aProfileName, KIND_PROFILE ) );
+    if ( !aProfile.IsNull() )
+      aRefProfiles.Append( aProfile );
+  }
+
+  if ( aRefProfiles.Length() < 2 )
+  {
     theErrorMsg = tr( "PROFILES_NOT_DEFINED" );
     return false;
   }
@@ -174,6 +244,12 @@ bool HYDROGUI_StreamOp::processApply( int& theUpdateFlags,
   // Set the object name
   myEditedObject->SetName( anObjectName );
 
+  myEditedObject->SetHydraulicAxis( aHydAxis );
+  myEditedObject->SetProfiles( aRefProfiles, false );
+
+  if ( myEditedObject->IsMustBeUpdated() )
+    myEditedObject->Update();
+
   if ( !myIsEdit )
   {
     myEditedObject->SetFillingColor( HYDROData_Stream::DefaultFillingColor() );
@@ -186,43 +262,82 @@ bool HYDROGUI_StreamOp::processApply( int& theUpdateFlags,
   // Show the object in case of creation mode of the operation
   if( !myIsEdit ) {
     module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), myEditedObject, true );
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( myEditedObject );
+    theBrowseObjectsEntries.append( anEntry );
   }
 
+  module()->setIsToUpdate( myEditedObject );
+
   // Set update flags
-  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;
+  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
 
   return true;
 }
 
 void HYDROGUI_StreamOp::createPreview()
 {
-  if ( myEditedObject.IsNull() ) {
-    return;
-  }
-
   LightApp_Application* anApp = module()->getApp();
-  if ( !myViewManager ) {
-    myViewManager = ::qobject_cast<OCCViewer_ViewManager*>( 
-      anApp->getViewManager( OCCViewer_Viewer::Type(), true ) );
+  if ( !getPreviewManager() )
+  {
+    setPreviewManager( ::qobject_cast<OCCViewer_ViewManager*>( 
+                       anApp->getViewManager( OCCViewer_Viewer::Type(), true ) ) );
   }
 
-  if ( myViewManager && !myPreviewPrs ) {
-    if ( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() ) {
+  OCCViewer_ViewManager* aViewManager = getPreviewManager();
+  if ( aViewManager && !myPreviewPrs )
+  {
+    if ( OCCViewer_Viewer* aViewer = aViewManager->getOCCViewer() )
+    {
       Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
-      if ( !aCtx.IsNull() ) {
-        myPreviewPrs = new HYDROGUI_Shape( aCtx, myEditedObject );
+      if ( !aCtx.IsNull() )
+      {
+        myPreviewPrs = new HYDROGUI_Shape( aCtx, NULL, getPreviewZLayer() );
+
+        QColor aFillingColor = HYDROData_Stream::DefaultFillingColor();
+        QColor aBorderColor = HYDROData_Stream::DefaultBorderColor();
+        if ( !myEditedObject.IsNull() )
+        {
+          aFillingColor = myEditedObject->GetFillingColor();
+          aBorderColor = myEditedObject->GetBorderColor();
+        }
+
+        myPreviewPrs->setFillingColor( aFillingColor, false, false );
+        myPreviewPrs->setBorderColor( aBorderColor, false, false );
       }
     }
   }
 
-  if ( myPreviewPrs ) {
-    myPreviewPrs->update();  
+  if ( !aViewManager || !myPreviewPrs )
+    return;
+
+  Handle(HYDROData_PolylineXY) aHydAxis = Handle(HYDROData_PolylineXY)::DownCast(
+    HYDROGUI_Tool::FindObjectByName( module(), myHydAxis, KIND_POLYLINEXY ) );
+
+  HYDROData_SequenceOfObjects aRefProfiles;
+  for ( int i = 0; i < myProfiles.length(); ++i )
+  {
+    QString aProfileName = myProfiles.value( i );
+
+    Handle(HYDROData_Profile) aProfile = Handle(HYDROData_Profile)::DownCast(
+      HYDROGUI_Tool::FindObjectByName( module(), aProfileName, KIND_PROFILE ) );
+    if ( !aProfile.IsNull() )
+      aRefProfiles.Append( aProfile );
+  }
+
+  HYDROData_Stream::PrsDefinition aPrsDef;
+  if ( !HYDROData_Stream::CreatePresentations( aHydAxis, aRefProfiles, aPrsDef ) )
+  {
+    erasePreview();
+    return;
   }
+
+  myPreviewPrs->setShape( aPrsDef.myPrs2D );
 }
 
 void HYDROGUI_StreamOp::erasePreview()
 {
-  if( myPreviewPrs ) {
+  if( myPreviewPrs )
+  {
     delete myPreviewPrs;
     myPreviewPrs = 0;
   }
@@ -230,67 +345,78 @@ void HYDROGUI_StreamOp::erasePreview()
 
 void HYDROGUI_StreamOp::onAddProfiles()
 {
-  if ( myEditedObject.IsNull() ) {
+  Handle(HYDROData_PolylineXY) aHydAxis = Handle(HYDROData_PolylineXY)::DownCast(
+    HYDROGUI_Tool::FindObjectByName( module(), myHydAxis, KIND_POLYLINEXY ) );
+  if ( aHydAxis.IsNull() )
+    return;
+
+  TopoDS_Face aPlane;
+  if ( !HYDROData_Stream::BuildFace( aHydAxis, aPlane ) )
     return;
-  }
 
   // Get the current profiles list
-  HYDROData_SequenceOfObjects aProfiles = myEditedObject->GetProfiles();
-
-  // TODO: to be optimized
-  QStringList aCurrentProfiles;
-  for( int i = 1, n = aProfiles.Length(); i <= n; i++ ) {
-    Handle(HYDROData_Profile) aProfile =
-      Handle(HYDROData_Profile)::DownCast( aProfiles.Value( i ) );
-    if ( !aProfile.IsNull() ) {
-      aCurrentProfiles << aProfile->GetName();
-    }
-  }
+  QStringList aCurrentProfiles = myProfiles;
     
   // Get the selected profiles ( in the Object Browser )
-  QStringList anInvalidProfiles, anExistingProfiles, aHasNoIntersectionProfiles;
+  QStringList anInvalidProfiles;
+  QStringList anExistingProfiles;
+  QStringList aHasNoIntersectionProfiles;
+  QStringList aVerifiedProfiles;
 
-  HYDROData_SequenceOfObjects aVerifiedProfiles;
   HYDROData_SequenceOfObjects aSelectedProfiles = HYDROGUI_Tool::GetSelectedObjects( module() ); 
-  Handle(HYDROData_PolylineXY) aHydAxis = myEditedObject->GetHydraulicAxis();
-  if ( aHydAxis.IsNull() )
-    return; 
-  TopoDS_Face aPlane;
-  if(!myEditedObject->BuildFace(aHydAxis, aPlane))
-    return;
-  Standard_Real aPar(.0);
-  for( int i = 1, n = aSelectedProfiles.Length(); i <= n; i++ ) {
+
+  for( int i = 1, n = aSelectedProfiles.Length(); i <= n; i++ )
+  {
     Handle(HYDROData_Profile) aProfile = 
       Handle(HYDROData_Profile)::DownCast( aSelectedProfiles.Value( i ) );
-    if ( !aProfile.IsNull() ) {
-      QString aProfileName = aProfile->GetName();
-
-      // Check the profile, if all is ok - add it to the list
-      if ( !aProfile->IsValid() ) { // check whether the profile is valid
-        anInvalidProfiles << aProfileName;
-      } else if ( aCurrentProfiles.contains( aProfileName ) ) { // check whether the profile is already added
-        anExistingProfiles << aProfileName;
-      } else if ( !myEditedObject->HasIntersection( aProfile, aPlane, aPar ) ) {  // check whether the profile has intersection
-        aHasNoIntersectionProfiles << aProfileName;
-      } else {
-        aVerifiedProfiles.Append( aProfile );
-      }
+    if ( aProfile.IsNull() )
+      continue;
+
+    QString aProfileName = aProfile->GetName();
+    Standard_Real aProfilePar = 0.0;
+
+    // Check the profile, if all is ok - add it to the list
+    if ( !aProfile->IsValid() )
+    {
+      // check whether the profile is valid
+      anInvalidProfiles << aProfileName;
+    }
+    else if ( aCurrentProfiles.contains( aProfileName ) )
+    {
+      // check whether the profile is already added
+      anExistingProfiles << aProfileName;
+    }
+    else if ( !HYDROData_Stream::HasIntersection( aHydAxis, aProfile, aPlane, aProfilePar ) )
+    {
+      // check whether the profile has intersection
+      aHasNoIntersectionProfiles << aProfileName;
+    }
+    else
+    {
+      // Insert profile in correct place
+      insertProfileInToOrder( aProfileName, aProfilePar, myProfiles, myProfileParams );
+      aVerifiedProfiles << aProfileName;
     }
   }
  
   // Show message box with the ignored profiles
-  if ( !anInvalidProfiles.isEmpty() || !anExistingProfiles.isEmpty() ||
-       !aHasNoIntersectionProfiles.isEmpty() ) {
+  if ( !anInvalidProfiles.isEmpty() ||
+       !anExistingProfiles.isEmpty() ||
+       !aHasNoIntersectionProfiles.isEmpty() )
+  {
     QString aMessage = tr( "IGNORED_PROFILES" );
-    if ( !anInvalidProfiles.isEmpty() ) {
+    if ( !anInvalidProfiles.isEmpty() )
+    {
       aMessage.append( "\n\n" );
       aMessage.append( tr("INVALID_PROFILES").arg( anInvalidProfiles.join( "\n" ) ) );
     }
-    if ( !anExistingProfiles.isEmpty() ) {
+    if ( !anExistingProfiles.isEmpty() )
+    {
       aMessage.append( "\n\n" );
       aMessage.append( tr("EXISTING_PROFILES").arg( anExistingProfiles.join( "\n" ) ) );
     }
-    if ( !aHasNoIntersectionProfiles.isEmpty() ) {
+    if ( !aHasNoIntersectionProfiles.isEmpty() )
+    {
       aMessage.append( "\n\n" );
       aMessage.append( tr("NOT_INTERSECTED_PROFILES").arg( aHasNoIntersectionProfiles.join( "\n" ) ) );
     }
@@ -298,13 +424,8 @@ void HYDROGUI_StreamOp::onAddProfiles()
     SUIT_MessageBox::warning( module()->getApp()->desktop(), tr( "WARNING" ), aMessage );
   }
 
-  // Update the stream object
-  for( int i = 1, n = aVerifiedProfiles.Length(); i <= n; i++ ) {
-    Handle(HYDROData_Profile) aProfile =
-      Handle(HYDROData_Profile)::DownCast( aVerifiedProfiles.Value( i ) );
-    myEditedObject->AddProfile( aProfile );
-  }
-  myEditedObject->Update();
+  if ( aVerifiedProfiles.isEmpty() )
+    return;
 
   // Update the panel
   updatePanelData();
@@ -315,49 +436,99 @@ void HYDROGUI_StreamOp::onAddProfiles()
 
 void HYDROGUI_StreamOp::onRemoveProfiles( const QStringList& theProfilesToRemove )
 {
-  if ( myEditedObject.IsNull() ) {
-    return;
+  QStringList aToRemove = theProfilesToRemove;
+
+  // Take the Object Browser selection into account
+  HYDROData_SequenceOfObjects aSelectedObjects = HYDROGUI_Tool::GetSelectedObjects( module() ); 
+  for( int i = 1, n = aSelectedObjects.Length(); i <= n; i++ )
+  {
+    Handle(HYDROData_Profile) aProfile = 
+      Handle(HYDROData_Profile)::DownCast( aSelectedObjects.Value( i ) );
+    if ( aProfile.IsNull() )
+      continue;
+
+    QString aProfileName = aProfile->GetName();
+    aToRemove.append( aProfileName );
   }
 
+  aToRemove.removeDuplicates();
+  if ( aToRemove.isEmpty() )
+    return;
+
+  bool isRemoved = false;
+
   // Remove profiles
-  foreach( const QString& aProfileName, theProfilesToRemove ) {
-    Handle(HYDROData_Profile) aProfile = Handle(HYDROData_Profile)::DownCast(
-      HYDROGUI_Tool::FindObjectByName( module(), aProfileName, KIND_PROFILE ) );
-    myEditedObject->RemoveProfile( aProfile );
+  for ( int i = 0; i < aToRemove.length(); ++i )
+  {
+    const QString& aProfileName = aToRemove.value( i );
+
+    int aProfileId = myProfiles.indexOf( aProfileName );
+    if ( aProfileId < 0 )
+      continue;
+
+    myProfiles.removeAt( aProfileId );
+    myProfileParams.removeAt( aProfileId );
+    isRemoved = true;
   }
-  myEditedObject->Update();
 
-  // Update the panel
-  updatePanelData();
+  if ( isRemoved )
+  {
+    // Update the panel
+    updatePanelData();
 
-  // Update preview
-  createPreview();
+    // Update preview
+    createPreview();
+  }
 }
 
 void HYDROGUI_StreamOp::onAxisChanged( const QString& theNewAxis )
 {
-  if ( myEditedObject.IsNull() ) {
+  // Get axis object   
+  Handle(HYDROData_PolylineXY) aNewAxis = Handle(HYDROData_PolylineXY)::DownCast(
+    HYDROGUI_Tool::FindObjectByName( module(), theNewAxis, KIND_POLYLINEXY ) );
+
+  // Prepare data for intersection check
+  TopoDS_Face aPlane;
+  if ( !HYDROData_Stream::BuildFace( aNewAxis, aPlane ) )
+  {
+    SUIT_MessageBox::critical( module()->getApp()->desktop(), 
+                              tr( "BAD_SELECTED_POLYLINE_TLT" ),
+                              tr( "BAD_SELECTED_POLYLINE_MSG" ).arg( theNewAxis ) );
+    // To restore the old axis
+    updatePanelData();
     return;
   }
 
-  // Get axis object   
-  Handle(HYDROData_PolylineXY) anAxis = Handle(HYDROData_PolylineXY)::DownCast(
-    HYDROGUI_Tool::FindObjectByName( module(), theNewAxis, KIND_POLYLINEXY ) );
+  QStringList   aNewProfiles;
+  QList<double> aNewProfileParams;
+  QStringList   aHasNoIntersectionProfiles;
 
   // Get list of profiles which do not intersect the axis
-  QStringList aHasNoIntersectionProfiles;
-  HYDROData_SequenceOfObjects aCurrentProfiles = myEditedObject->GetProfiles();
-  for( int anIndex = 1, aLength = aCurrentProfiles.Length(); anIndex <= aLength; anIndex++ ) {
-    Handle(HYDROData_Profile) aProfile =
-      Handle(HYDROData_Profile)::DownCast( aCurrentProfiles.Value( anIndex ) );
-    if ( !aProfile.IsNull() ) {
-      // TODO check intersection
+  for ( int i = 0; i < myProfiles.length(); ++i )
+  {
+    QString aProfileName = myProfiles.value( i );
+
+    Handle(HYDROData_Profile) aProfile = Handle(HYDROData_Profile)::DownCast(
+      HYDROGUI_Tool::FindObjectByName( module(), aProfileName, KIND_PROFILE ) );
+    if ( aProfile.IsNull() )
+      continue;
+      
+    Standard_Real aProfilePar = 0.0;
+    if ( HYDROData_Stream::HasIntersection( aNewAxis, aProfile, aPlane, aProfilePar ) )
+    {
+      // Insert profile in correct place
+      insertProfileInToOrder( aProfileName, aProfilePar, aNewProfiles, aNewProfileParams );
+    }
+    else
+    {
+      aHasNoIntersectionProfiles << aProfile->GetName();
     }
   }
 
   // If there are profiles which don't intersect the new axis - show confirmation message box
   bool isConfirmed = true;
-  if ( !aHasNoIntersectionProfiles.isEmpty() ) {
+  if ( !aHasNoIntersectionProfiles.isEmpty() )
+  {
     SUIT_MessageBox::StandardButtons aButtons = 
       SUIT_MessageBox::Yes | SUIT_MessageBox::No;
 
@@ -370,13 +541,17 @@ void HYDROGUI_StreamOp::onAxisChanged( const QString& theNewAxis )
   }
 
   // Check if the user has confirmed axis change
-  if ( !isConfirmed ) {
+  if ( !isConfirmed )
+  {
     // To restore the old axis
     updatePanelData();
-  } else {
-    // Set axis
-    myEditedObject->SetHydraulicAxis( anAxis );
-    myEditedObject->Update();
+  }
+  else
+  {
+    // Update data
+    myHydAxis = theNewAxis;
+    myProfiles = aNewProfiles;
+    myProfileParams = aNewProfileParams;
 
     // Update the panel
     updatePanelData();
@@ -389,30 +564,9 @@ void HYDROGUI_StreamOp::onAxisChanged( const QString& theNewAxis )
 void HYDROGUI_StreamOp::updatePanelData()
 {
   HYDROGUI_StreamDlg* aPanel = ::qobject_cast<HYDROGUI_StreamDlg*>( inputPanel() );
-  if ( !aPanel ) {
+  if ( !aPanel )
     return;
-  }
-
-  // Hydraulic axis
-  Handle(HYDROData_PolylineXY) aHydraulicAxis = myEditedObject->GetHydraulicAxis();
-  if ( !aHydraulicAxis.IsNull() ) {
-    aPanel->setAxisName( aHydraulicAxis->GetName() );
-  } else {
-    aPanel->setAxisName( "" );
-  }
-
-  // Stream profiles
-  QStringList aProfiles;
-
-  HYDROData_SequenceOfObjects aStreamProfiles = myEditedObject->GetProfiles();
-  for ( int i = 1, n = aStreamProfiles.Length(); i <= n; ++i ) {
-    Handle(HYDROData_Profile) aProfile = 
-      Handle(HYDROData_Profile)::DownCast( aStreamProfiles.Value( i ) );
-    if ( !aProfile.IsNull() ) {
-      QString aProfileName = aProfile->GetName();
-      aProfiles << aProfileName;      
-    }
-  }
 
-  aPanel->setProfiles( aProfiles );
+  aPanel->setAxisName( myHydAxis );
+  aPanel->setProfiles( myProfiles );
 }