X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_StreamOp.cxx;h=bd7085f4efd7aa086b947998ae6fbd69c69bdfdb;hb=a1431f03eac1d1aed4203d0568d987c41ce939b3;hp=103d8bd3247d2e0526bc158f6fa695623d31b07d;hpb=7293e4989b4e85a3531cd6c77b14e5129ee617aa;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_StreamOp.cxx b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
index 103d8bd3..bd7085f4 100755
--- a/src/HYDROGUI/HYDROGUI_StreamOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
@@ -42,7 +42,16 @@
 #include <OCCViewer_ViewManager.h>
 #include <OCCViewer_ViewModel.h>
 #include <OCCViewer_ViewWindow.h>
-
+#include <gp_Ax1.hxx>
+#include <gp_Ax2.hxx>
+#include <gp_Ax3.hxx>
+#include <gp_Vec.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Pln.hxx>
+#include <gp.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
 HYDROGUI_StreamOp::HYDROGUI_StreamOp( HYDROGUI_Module* theModule, bool theIsEdit )
 : HYDROGUI_Operation( theModule ), 
   myIsEdit( theIsEdit ),
@@ -64,33 +73,35 @@ void HYDROGUI_StreamOp::startOperation()
   // We start operation in the document
   startDocOperation();
 
+  // Get panel and reset its state
   HYDROGUI_StreamDlg* aPanel = (HYDROGUI_StreamDlg*)inputPanel();
+  aPanel->reset();
 
-  if( myIsEdit )
+  // Get/create the edited object
+  if( myIsEdit ) {
     myEditedObject = Handle(HYDROData_Stream)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
-  else 
+  } else {
     myEditedObject = Handle(HYDROData_Stream)::DownCast( doc()->CreateObject( KIND_STREAM ) );
+  }
 
-  QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_STREAM_NAME" ) );
-  if ( myIsEdit && !myEditedObject.IsNull() ) {
+  // 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();
   }
 
-  // Update panel data
-  aPanel->blockSignals( true );
-  aPanel->reset();
+  // 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 ) );
-  aPanel->blockSignals( false );
-
-  if ( myIsEdit ) {
-    updatePanel();
-  } else {
-    onAxisChanged( aPanel->getAxisName() );
-  }
+  // synchronize the panel state with the edited object state
+  updatePanelData();
 
   // Create preview
-  onCreatePreview();
+  createPreview();
 }
 
 void HYDROGUI_StreamOp::abortOperation()
@@ -111,12 +122,13 @@ void HYDROGUI_StreamOp::commitOperation()
 HYDROGUI_InputPanel* HYDROGUI_StreamOp::createInputPanel() const
 {
   HYDROGUI_StreamDlg* aPanel = new HYDROGUI_StreamDlg( module(), getName() );
-  //TODO connect( aPanel, SIGNAL( CreatePreview() ), this, SLOT( onCreatePreview() ) );
+
   connect( aPanel, SIGNAL( AddProfiles() ), this, SLOT( onAddProfiles() ) );
   connect( aPanel, SIGNAL( RemoveProfiles( const QStringList& ) ), 
            this, SLOT( onRemoveProfiles( const QStringList& ) ) );
   connect( aPanel, SIGNAL( AxisChanged( const QString& ) ), 
            this, SLOT( onAxisChanged( const QString& ) ) );
+
   return aPanel;
 }
 
@@ -124,30 +136,27 @@ bool HYDROGUI_StreamOp::processApply( int& theUpdateFlags,
                                       QString& theErrorMsg )
 {
   HYDROGUI_StreamDlg* aPanel = ::qobject_cast<HYDROGUI_StreamDlg*>( inputPanel() );
-  if ( !aPanel )
+  if ( !aPanel || myEditedObject.IsNull() ) {
     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;
   }
 
-  if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anObjectName ) )
+  // Check that there are no other objects with the same name in the document
+  if( myEditedObject->GetName() != anObjectName )
   {
-    // check that there are no other objects with the same name in the document
     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() )
-    return false;
-
   // Check if the axis is set
   Handle(HYDROData_PolylineXY) aHydraulicAxis = myEditedObject->GetHydraulicAxis();
   if ( aHydraulicAxis.IsNull() ) {
@@ -155,55 +164,67 @@ bool HYDROGUI_StreamOp::processApply( int& theUpdateFlags,
     return false;
   }
 
-  // Check if the axis is set
+  // Check if at least 2 profiles is set
   HYDROData_SequenceOfObjects aProfiles = myEditedObject->GetProfiles();
   if ( aProfiles.Length() < 2 ) {
     theErrorMsg = tr( "PROFILES_NOT_DEFINED" );
     return false;
   }
 
+  // Set the object name
   myEditedObject->SetName( anObjectName );
 
+  if ( !myIsEdit )
+  {
+    myEditedObject->SetFillingColor( HYDROData_Stream::DefaultFillingColor() );
+    myEditedObject->SetBorderColor( HYDROData_Stream::DefaultBorderColor() );
+  }
+
+  // Erase preview
   erasePreview();
 
-  if( !myIsEdit )
+  // Show the object in case of creation mode of the operation
+  if( !myIsEdit ) {
     module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), myEditedObject, true );
+  }
 
-  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;
+  module()->setIsToUpdate( myEditedObject );
+
+  // Set update flags
+  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
 
   return true;
 }
 
-void HYDROGUI_StreamOp::onCreatePreview()
+void HYDROGUI_StreamOp::createPreview()
 {
-  if ( myEditedObject.IsNull() )
+  if ( myEditedObject.IsNull() ) {
     return;
+  }
 
   LightApp_Application* anApp = module()->getApp();
-  if ( !myViewManager )
+  if ( !myViewManager ) {
     myViewManager = ::qobject_cast<OCCViewer_ViewManager*>( 
       anApp->getViewManager( OCCViewer_Viewer::Type(), true ) );
+  }
 
-  if ( myViewManager && !myPreviewPrs )
-  {
-    if ( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
-    {
+  if ( myViewManager && !myPreviewPrs ) {
+    if ( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() ) {
       Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
-      if ( !aCtx.IsNull() )
+      if ( !aCtx.IsNull() ) {
         myPreviewPrs = new HYDROGUI_Shape( aCtx, myEditedObject );
+      }
     }
   }
 
-  if ( !myViewManager || !myPreviewPrs )
-    return;
-
-  myPreviewPrs->update();
+  if ( myPreviewPrs ) {
+    myPreviewPrs->update();  
+  }
 }
 
 void HYDROGUI_StreamOp::erasePreview()
 {
-  if( myPreviewPrs )
-  {
+  if( myPreviewPrs ) {
     delete myPreviewPrs;
     myPreviewPrs = 0;
   }
@@ -220,9 +241,9 @@ void HYDROGUI_StreamOp::onAddProfiles()
 
   // TODO: to be optimized
   QStringList aCurrentProfiles;
-  for( int anIndex = 1, aLength = aProfiles.Length(); anIndex <= aLength; anIndex++ ) {
+  for( int i = 1, n = aProfiles.Length(); i <= n; i++ ) {
     Handle(HYDROData_Profile) aProfile =
-      Handle(HYDROData_Profile)::DownCast( aProfiles.Value( anIndex ) );
+      Handle(HYDROData_Profile)::DownCast( aProfiles.Value( i ) );
     if ( !aProfile.IsNull() ) {
       aCurrentProfiles << aProfile->GetName();
     }
@@ -231,11 +252,18 @@ void HYDROGUI_StreamOp::onAddProfiles()
   // Get the selected profiles ( in the Object Browser )
   QStringList anInvalidProfiles, anExistingProfiles, aHasNoIntersectionProfiles;
 
-  HYDROData_SequenceOfObjects aSeqOfProfiles;
-  HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( module() );
-  for( int anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ ) {
-    Handle(HYDROData_Profile) aProfile =
-      Handle(HYDROData_Profile)::DownCast( aSeq.Value( anIndex ) );
+  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++ ) {
+    Handle(HYDROData_Profile) aProfile = 
+      Handle(HYDROData_Profile)::DownCast( aSelectedProfiles.Value( i ) );
     if ( !aProfile.IsNull() ) {
       QString aProfileName = aProfile->GetName();
 
@@ -244,35 +272,47 @@ void HYDROGUI_StreamOp::onAddProfiles()
         anInvalidProfiles << aProfileName;
       } else if ( aCurrentProfiles.contains( aProfileName ) ) { // check whether the profile is already added
         anExistingProfiles << aProfileName;
-      } else if ( !myEditedObject->HasIntersection( aProfile ) ) {  // check whether the profile has intersection
-        aHasNoIntersectionProfiles << aProfile->GetName();
+      } else if ( !myEditedObject->HasIntersection( aProfile, aPlane, aPar ) ) {  // check whether the profile has intersection
+        aHasNoIntersectionProfiles << aProfileName;
       } else {
-        aSeqOfProfiles.Append( aProfile );
+        aVerifiedProfiles.Append( aProfile );
       }
     }
   }
  
   // Show message box with the ignored profiles
-  QStringList anIgnoredProfiles;
-  anIgnoredProfiles << anInvalidProfiles << anExistingProfiles << aHasNoIntersectionProfiles;
-  if ( !anIgnoredProfiles.isEmpty() ) {
-    QString aMessage = tr( "IGNORED_PROFILES" ).arg( anIgnoredProfiles.join( "\n" ) );
+  if ( !anInvalidProfiles.isEmpty() || !anExistingProfiles.isEmpty() ||
+       !aHasNoIntersectionProfiles.isEmpty() ) {
+    QString aMessage = tr( "IGNORED_PROFILES" );
+    if ( !anInvalidProfiles.isEmpty() ) {
+      aMessage.append( "\n\n" );
+      aMessage.append( tr("INVALID_PROFILES").arg( anInvalidProfiles.join( "\n" ) ) );
+    }
+    if ( !anExistingProfiles.isEmpty() ) {
+      aMessage.append( "\n\n" );
+      aMessage.append( tr("EXISTING_PROFILES").arg( anExistingProfiles.join( "\n" ) ) );
+    }
+    if ( !aHasNoIntersectionProfiles.isEmpty() ) {
+      aMessage.append( "\n\n" );
+      aMessage.append( tr("NOT_INTERSECTED_PROFILES").arg( aHasNoIntersectionProfiles.join( "\n" ) ) );
+    }
+
     SUIT_MessageBox::warning( module()->getApp()->desktop(), tr( "WARNING" ), aMessage );
   }
-  
+
   // Update the stream object
-  for( int anIndex = 1, aLength = aSeqOfProfiles.Length(); anIndex <= aLength; anIndex++ ) {
+  for( int i = 1, n = aVerifiedProfiles.Length(); i <= n; i++ ) {
     Handle(HYDROData_Profile) aProfile =
-      Handle(HYDROData_Profile)::DownCast( aSeqOfProfiles.Value( anIndex ) );
+      Handle(HYDROData_Profile)::DownCast( aVerifiedProfiles.Value( i ) );
     myEditedObject->AddProfile( aProfile );
   }
   myEditedObject->Update();
 
   // Update the panel
-  updatePanel();
+  updatePanelData();
 
   // Update preview
-  onCreatePreview();
+  createPreview();
 }
 
 void HYDROGUI_StreamOp::onRemoveProfiles( const QStringList& theProfilesToRemove )
@@ -281,19 +321,39 @@ void HYDROGUI_StreamOp::onRemoveProfiles( const QStringList& theProfilesToRemove
     return;
   }
 
+  bool isRemoved = false;
+
+  // 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() && !theProfilesToRemove.contains(aProfile->GetName()) ) {
+      if ( myEditedObject->RemoveProfile( aProfile ) ) {
+        isRemoved = true;
+      }
+    }
+  }
+
   // 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 );
+    if ( myEditedObject->RemoveProfile( aProfile ) ) {
+      isRemoved = true;
+    }
   }
-  myEditedObject->Update();
 
-  // Update the panel
-  updatePanel();
+  if ( isRemoved ) {
+    // Update the edited stream object
+    myEditedObject->Update();
 
-  // Update preview
-  onCreatePreview();
+    // Update the panel
+    updatePanelData();
+
+    // Update preview
+    createPreview();
+  }
 }
 
 void HYDROGUI_StreamOp::onAxisChanged( const QString& theNewAxis )
@@ -306,6 +366,19 @@ void HYDROGUI_StreamOp::onAxisChanged( const QString& theNewAxis )
   Handle(HYDROData_PolylineXY) anAxis = Handle(HYDROData_PolylineXY)::DownCast(
     HYDROGUI_Tool::FindObjectByName( module(), theNewAxis, KIND_POLYLINEXY ) );
 
+  // Prepare data for intersection check
+  TopoDS_Face aPlane;
+  if ( !myEditedObject->BuildFace(anAxis, 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;
+  }
+
+  Standard_Real aPar(.0);
+
   // Get list of profiles which do not intersect the axis
   QStringList aHasNoIntersectionProfiles;
   HYDROData_SequenceOfObjects aCurrentProfiles = myEditedObject->GetProfiles();
@@ -313,33 +386,44 @@ void HYDROGUI_StreamOp::onAxisChanged( const QString& theNewAxis )
     Handle(HYDROData_Profile) aProfile =
       Handle(HYDROData_Profile)::DownCast( aCurrentProfiles.Value( anIndex ) );
     if ( !aProfile.IsNull() ) {
-      // TODO check intersection
+      if ( !HYDROData_Stream::HasIntersection( anAxis, aProfile, aPlane, aPar ) ) {
+        aHasNoIntersectionProfiles << aProfile->GetName();
+      }
     }
   }
 
-  // Show message box to confirm
+  // If there are profiles which don't intersect the new axis - show confirmation message box
   bool isConfirmed = true;
   if ( !aHasNoIntersectionProfiles.isEmpty() ) {
-    // TODO show message box
+    SUIT_MessageBox::StandardButtons aButtons = 
+      SUIT_MessageBox::Yes | SUIT_MessageBox::No;
+
+    QString aMsg = aHasNoIntersectionProfiles.join( "\n" );
+    isConfirmed = SUIT_MessageBox::question( module()->getApp()->desktop(),
+                                             tr( "CONFIRMATION" ),
+                                             tr( "CONFIRM_AXIS_CHANGE" ).arg( aMsg ),
+                                             aButtons, 
+                                             SUIT_MessageBox::Yes) == SUIT_MessageBox::Yes;
   }
 
   // Check if the user has confirmed axis change
   if ( !isConfirmed ) {
-    updatePanel();
+    // To restore the old axis
+    updatePanelData();
   } else {
     // Set axis
     myEditedObject->SetHydraulicAxis( anAxis );
     myEditedObject->Update();
 
     // Update the panel
-    updatePanel();
+    updatePanelData();
 
     // Update preview
-    onCreatePreview();
+    createPreview();
   }
 }
 
-void HYDROGUI_StreamOp::updatePanel()
+void HYDROGUI_StreamOp::updatePanelData()
 {
   HYDROGUI_StreamDlg* aPanel = ::qobject_cast<HYDROGUI_StreamDlg*>( inputPanel() );
   if ( !aPanel ) {
@@ -350,22 +434,22 @@ void HYDROGUI_StreamOp::updatePanel()
   Handle(HYDROData_PolylineXY) aHydraulicAxis = myEditedObject->GetHydraulicAxis();
   if ( !aHydraulicAxis.IsNull() ) {
     aPanel->setAxisName( aHydraulicAxis->GetName() );
+  } else {
+    aPanel->setAxisName( "" );
   }
 
   // Stream profiles
-  QStringList aSelectedProfiles;
+  QStringList aProfiles;
 
-  HYDROData_SequenceOfObjects aProfiles = myEditedObject->GetProfiles();
-  for ( int i = 1, n = aProfiles.Length(); i <= n; ++i ) {
+  HYDROData_SequenceOfObjects aStreamProfiles = myEditedObject->GetProfiles();
+  for ( int i = 1, n = aStreamProfiles.Length(); i <= n; ++i ) {
     Handle(HYDROData_Profile) aProfile = 
-      Handle(HYDROData_Profile)::DownCast( aProfiles.Value( i ) );
-    if ( aProfile.IsNull() ) {
-      continue;
+      Handle(HYDROData_Profile)::DownCast( aStreamProfiles.Value( i ) );
+    if ( !aProfile.IsNull() ) {
+      QString aProfileName = aProfile->GetName();
+      aProfiles << aProfileName;      
     }
-
-    QString aProfileName = aProfile->GetName();
-    aSelectedProfiles << aProfileName;
   }
 
-  aPanel->setSelectedProfiles( aSelectedProfiles );
+  aPanel->setProfiles( aProfiles );
 }