0021347: [CEA 497] Visualisation into SMESH and VISU of hexagonal prism cells (MED_OC...

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_FilterDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index 5c5c4b207930b142f9bdf68919604142a6c7622e..7e0f02a4146d673e208dfd4b3a1d7219d5dfb51e 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  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
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 // SMESH SMESHGUI : GUI for SMESH component
@@ -645,7 +645,7 @@ QWidget* SMESHGUI_FilterTable::ComboDelegate::createEditor( QWidget* parent,
     if ( ok ) {
       int aPrecision = index.data( Qt::UserRole + 1 ).toInt( &ok );
       if ( !ok )
-       aPrecision = 0;
+        aPrecision = 0;
 
       SalomeApp_DoubleSpinBox* dblSpin = new SalomeApp_DoubleSpinBox( -1.e20, 1.e20, 1, aPrecision, 20, parent, false, true );
       dblSpin->setFrame( false );
@@ -673,7 +673,7 @@ void SMESHGUI_FilterTable::ComboDelegate::setEditorData( QWidget* editor,
     if( data.type() == QVariant::Double ) {
       double valueDouble = data.toDouble( &bOk );
       if( bOk )
-       dblSpin->setValue( valueDouble );
+        dblSpin->setValue( valueDouble );
     }
   }
   if ( !bOk ) QItemDelegate::setEditorData( editor, index );
@@ -1620,6 +1620,7 @@ static QList<int> geomTypes( const int theType )
     typeIds.append( SMESH::Geom_PYRAMID );
     typeIds.append( SMESH::Geom_HEXA );
     typeIds.append( SMESH::Geom_PENTA );
+    typeIds.append( SMESH::Geom_HEXAGONAL_PRISM );
     typeIds.append( SMESH::Geom_POLYHEDRA );
   }
   return typeIds;
@@ -2525,7 +2526,7 @@ QWidget* SMESHGUI_FilterDlg::createSourceGroup (QWidget* theParent)
   mySourceGrp->addButton(aSelBtn,  Selection);
   mySourceGrp->addButton(aDlgBtn,  Dialog);
 
-  aSelBtn->setChecked(true);
+  aMeshBtn->setChecked(true);
 
   return aBox;
 }
@@ -2664,7 +2665,7 @@ void SMESHGUI_FilterDlg::Init (const QList<int>& theTypes)
 
   mySourceGrp->button(myApplyToState.contains(theTypes.first()) ? 
                       myApplyToState[ theTypes.first() ] :
-                      Selection)->setChecked(true);
+                      Mesh)->setChecked(true);
 }
 
 //=======================================================================
@@ -2973,10 +2974,8 @@ void SMESHGUI_FilterDlg::SetMesh (SMESH::SMESH_Mesh_var theMesh)
 {
   if ( !theMesh->_is_nil() ) {
     myMesh = theMesh;
-    if ( !myFilter[ myTable->GetType() ]->_is_nil() && !myFilter[ myTable->GetType() ]->GetPredicate()->_is_nil() ) {
-      SMESH::Predicate_ptr aPred = myFilter[ myTable->GetType() ]->GetPredicate();
-      aPred->SetMesh(myMesh);
-    }
+    if ( !myFilter[ myTable->GetType() ]->_is_nil())
+      myFilter[ myTable->GetType() ]->SetMesh( theMesh );
   }
   const bool isEnable = !(myMesh->_is_nil());
   myButtons[BTN_OK]->setEnabled(isEnable);
@@ -3084,6 +3083,36 @@ bool SMESHGUI_FilterDlg::createFilter (const int theType)
   return true;
 }
 
+//================================================================================
+/*!
+ * \brief Return the current filter
+ */
+//================================================================================
+
+SMESH::Filter_var SMESHGUI_FilterDlg::GetFilter() const
+{
+  SMESH::Filter_var filter;
+  try {
+    int aCurrType = myTable->GetType();
+    filter = myFilter[ aCurrType ];
+  }
+  catch(...)
+  {
+  }
+  return filter._retn();
+}
+
+//================================================================================
+/*!
+ * \brief Sets a filter to the table
+ */
+//================================================================================
+
+void SMESHGUI_FilterDlg::SetFilter(SMESH::Filter_var filter, int type)
+{
+  myFilter[ type ] = filter;
+}
+
 //=======================================================================
 // name    : SMESHGUI_FilterDlg::insertFilterInViewer
 // Purpose : Insert filter in viewer
@@ -3146,7 +3175,6 @@ void SMESHGUI_FilterDlg::filterSource (const int theType,
 
     // filter ids
     SMESH::Predicate_ptr aPred = myFilter[ theType ]->GetPredicate();
-    aPred->SetMesh(myMesh);
     QList<int>::const_iterator anIter;
     for (anIter = aDialogIds.begin(); anIter != aDialogIds.end(); ++ anIter)
       if (aPred->IsSatisfy(*anIter))
@@ -3219,7 +3247,6 @@ void SMESHGUI_FilterDlg::filterSelectionSource (const int theType,
 
   // Filter entities
   SMESH::Predicate_ptr aPred = myFilter[ theType ]->GetPredicate();
-  aPred->SetMesh(myMesh);
   TColStd_MapIteratorOfMapOfInteger aResIter(aToBeFiltered);
   for ( ; aResIter.More(); aResIter.Next())
     if (aPred->IsSatisfy(aResIter.Key()))