X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_FilterDlg.cxx;h=4dfa5268b9de3e361e5180713fb853a541af1737;hp=37e1ae1b0cb0ceb0b24d6bcc7f58603650ad8006;hb=0631ddc21db91465a4fbf2b9b2e9f69b0d45f24f;hpb=59e7d429a032c21f27ac13c94977579854d0f45a

diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index 37e1ae1b0..4dfa5268b 100755
--- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -51,6 +51,7 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
 #include <SUIT_MessageBox.h>
+#include <SUIT_OverrideCursor.h>
 #include <QtxColorButton.h>
 
 #include <LightApp_Application.h>
@@ -61,8 +62,6 @@
 #include <SalomeApp_DoubleSpinBox.h>
 
 #include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
-#include <SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx>
 
 #include <SVTK_ViewWindow.h>
 
@@ -1148,7 +1147,7 @@ bool SMESHGUI_FilterTable::IsValid (const bool theMess, const int theEntityType)
       if (aTable->text(i, 2).isEmpty())
         errMsg = tr( "ERROR" );
     }
-    else
+    else // check correctness of a numeric value
     {
       bool aRes = false;
       bool isSignalsBlocked = aTable->signalsBlocked();
@@ -1158,10 +1157,6 @@ bool SMESHGUI_FilterTable::IsValid (const bool theMess, const int theEntityType)
 
       if (!aRes && aTable->isEditable(i, 2))
         errMsg = tr( "ERROR" );
-      else if (aType == SMESH::EDGE &&
-               GetCriterionType(i, aType) == SMESH::FT_MultiConnection &&
-               aThreshold == 1)
-        errMsg = tr( "MULTIEDGES_ERROR" );
     }
 
     if (!errMsg.isEmpty()) {
@@ -1813,7 +1808,7 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
   case SMESH::FT_EqualVolumes: break;
 
   case SMESH::FT_MultiConnection:
-  case SMESH::FT_MultiConnection2D: anIsIntCriterion = true; break;
+  case SMESH::FT_MultiConnection2D: anIsIntCriterion = true; nbCompareSigns = 3; break;
 
   case SMESH::FT_Length:
   case SMESH::FT_Length2D: anIsDoubleCriterion = true; break;
@@ -1935,7 +1930,6 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
       DoubleSpinItem* dblSpin = new DoubleSpinItem( 0 );
       dblSpin->setPrecision( aPrecision );
       aTable->setItem( row, 2, dblSpin );
-      nbCompareSigns = 3;
     }
     else // --------------------------------------------------------------QTableWidgetItem
     {
@@ -1944,6 +1938,8 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
   }
 
   // set Compare
+  if ( anIsDoubleCriterion )
+    nbCompareSigns = 3;
   if ( aCompareItem->count() != nbCompareSigns )
   {
     switch ( nbCompareSigns ) {
@@ -2656,7 +2652,9 @@ SMESHGUI_FilterDlg::SMESHGUI_FilterDlg( SMESHGUI*         theModule,
 : QDialog( SMESH::GetDesktop( theModule ) ),
   mySMESHGUI( theModule ),
   mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
-  myInitSourceWgOnApply( true )
+  myInitSourceWgOnApply( true ),
+  myInsertEnabled( true ),
+  myDiffSourcesEnabled( true )
 {
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     mySelector = aViewWindow->GetSelector();
@@ -2673,7 +2671,9 @@ SMESHGUI_FilterDlg::SMESHGUI_FilterDlg( SMESHGUI*   theModule,
 : QDialog( SMESH::GetDesktop( theModule ) ),
   mySMESHGUI( theModule ),
   mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
-  myInitSourceWgOnApply( true )
+  myInitSourceWgOnApply( true ),
+  myInsertEnabled( true ),
+  myDiffSourcesEnabled( true )
 {
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     mySelector = aViewWindow->GetSelector();
@@ -2732,6 +2732,7 @@ QWidget* SMESHGUI_FilterDlg::createMainFrame (QWidget* theParent)
   int rows = aLay->rowCount();
   int cols = aLay->columnCount();
 
+  // This line looks strange when all additional parameters and mySetInViewer are hidden
   QFrame* aLine = new QFrame(aGrp);
   aLine->setFrameStyle(QFrame::HLine | QFrame::Sunken);
   aLay->addWidget(aLine, rows++, 0, 1, cols);
@@ -3217,6 +3218,21 @@ void SMESHGUI_FilterDlg::SetSourceWg (QWidget* theWg,
   myInitSourceWgOnApply = initOnApply;
 }
 
+//=======================================================================
+//function : EnableFiltering
+//purpose  : Enables "Insert filter in the viewer"
+//           and different "Source"s (Mesh, Initial Selection, Current Group)
+//=======================================================================
+
+void SMESHGUI_FilterDlg::SetEnabled( bool setInViewer, bool diffSources )
+{
+  myInsertEnabled = setInViewer;
+  myDiffSourcesEnabled = diffSources;
+
+  mySetInViewer->setVisible( myInsertEnabled );
+  mySourceGrp->button(0)->parentWidget()->setVisible( myDiffSourcesEnabled );
+}
+
 //=======================================================================
 // name    : SMESHGUI_FilterDlg::SetMesh
 // Purpose : Set mesh
@@ -3270,6 +3286,7 @@ bool SMESHGUI_FilterDlg::onApply()
   if (!isValid())
     return false;
 
+  SUIT_OverrideCursor wc;
   try {
     int aCurrType = myTable->GetType();
 
@@ -3398,8 +3415,10 @@ void SMESHGUI_FilterDlg::insertFilterInViewer()
     SMESH::ElementType anEntType = (SMESH::ElementType)myTable->GetType();
 
     if (myFilter[ myTable->GetType() ]->_is_nil() ||
-         myFilter[ myTable->GetType() ]->GetPredicate()->_is_nil() ||
-         !mySetInViewer->isChecked()) {
+        myFilter[ myTable->GetType() ]->GetPredicate()->_is_nil() ||
+        !mySetInViewer->isChecked() ||
+        !myInsertEnabled )
+    {
       SMESH::RemoveFilter(getFilterId(anEntType), aSelector);
     }
     else {
@@ -3424,7 +3443,7 @@ void SMESHGUI_FilterDlg::filterSource (const int theType,
 
   int aSourceId = mySourceGrp->checkedId();
 
-  if (aSourceId == Mesh)
+  if (aSourceId == Mesh || !myDiffSourcesEnabled )
   {
     if (myMesh->_is_nil())
       return;