Porting to Paraview 3.98.1

[modules/hexablock.git] / src / HEXABLOCKGUI / HEXABLOCKGUI_DocumentDelegate.cxx

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.cxx
index 195114313513931ada57eb90a6c9fe1059b5ac01..6597621ec45c9f84710309f8f0c200b7c97c8b27 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.cxx
@@ -39,11 +39,6 @@ using namespace HEXABLOCK::GUI;
 DocumentDelegate::DocumentDelegate(QDockWidget *dw, QObject *parent)
     : QItemDelegate(parent),
       _dw(dw),
-      _documentModel(0),
-      _patternDataSelectionModel(0),
-      _patternBuilderSelectionModel(0),
-      _groupsSelectionModel(0),
-      _meshSelectionModel(0),
       _currentEditor(NULL)
 {
 //   connect( this, SIGNAL( closeEditor(QWidget *, QAbstractItemDelegate::EndEditHint) ),
@@ -57,10 +52,6 @@ QWidget *DocumentDelegate::createEditor( QWidget                    *parent,
                                          const QStyleOptionViewItem &option,
                                          const QModelIndex          &index ) const
 {
-  MESSAGE("DocumentDelegate::createEditor(){");
-  MESSAGE("*  parent is: " << parent);
-  MESSAGE("*  _dw    is: " << _dw);
-  MESSAGE("*  item   is: " << index.data(Qt::DisplayRole).toString().toStdString());
 
   //close current editor if there's one before creating a new one
   if (_currentEditor != NULL)
@@ -75,8 +66,9 @@ QWidget *DocumentDelegate::createEditor( QWidget                    *parent,
   if ( !_dw->isVisible() ) _dw->setVisible(true);
 
   switch ( index.data(HEXA_TREE_ROLE).toInt() ){
-    case VERTEX_TREE :   editor = new VertexDialog(_dw, HexaBaseDialog::UPDATE_MODE);   break;
-    case EDGE_TREE :     editor = new EdgeDialog(_dw, /*HexaBaseDialog::NEW_MODE*/HexaBaseDialog::INFO_MODE);     break;
+//  case VERTEX_TREE :   editor = new VertexDialog(_dw, HexaBaseDialog::UPDATE_MODE);   break; //Modification
+    case VERTEX_TREE :   editor = new VertexDialog(_dw, HexaBaseDialog::INFO_MODE);   break;
+    case EDGE_TREE :     editor = new EdgeDialog(_dw, HexaBaseDialog::INFO_MODE);     break;
     case QUAD_TREE :     editor = new QuadDialog(_dw, HexaBaseDialog::INFO_MODE);     break;
     case HEXA_TREE :     editor = new HexaDialog(_dw, HexaBaseDialog::INFO_MODE);     break;
     case VECTOR_TREE :   editor = new VectorDialog(_dw, HexaBaseDialog::INFO_MODE);   break;
@@ -85,28 +77,18 @@ QWidget *DocumentDelegate::createEditor( QWidget                    *parent,
   //   case ELEMENTS_TREE :  break;
   //   case CROSSELEMENTS_TREE : break;
     case GROUP_TREE       : editor = new GroupDialog(_dw, HexaBaseDialog::INFO_MODE/*UPDATE_MODE*/); break;
-    case LAW_TREE         : editor = new LawDialog(_dw, HexaBaseDialog::UPDATE_MODE); break;
+    case LAW_TREE         : editor = new LawDialog(_dw, HexaBaseDialog::INFO_MODE); break;
     case PROPAGATION_TREE : editor = new PropagationDialog(_dw, HexaBaseDialog::INFO_MODE); break;
   }
   if ( editor != NULL ){
-    if ( _documentModel )                editor->setDocumentModel( _documentModel );
-    if ( _patternDataSelectionModel )
-    {
-       editor->setPatternDataSelectionModel( _patternDataSelectionModel );
-//     _patternDataSelectionModel->currentDialog = editor;
-    }
-    if ( _patternBuilderSelectionModel ) editor->setPatternBuilderSelectionModel( _patternBuilderSelectionModel);
-    if ( _groupsSelectionModel )         editor->setGroupsSelectionModel( _groupsSelectionModel );
-    if ( _meshSelectionModel )           editor->setMeshSelectionModel( _meshSelectionModel);
-
     HEXABLOCKGUI::assocInProgress = false;
+
     //show the editor in the dockwidget
     editor->resetSizeAndShow(_dw);
   }
   else
          _dw->close();
 
-  MESSAGE("}");
 
   _currentEditor = editor;
   return editor;
@@ -127,51 +109,51 @@ void DocumentDelegate::closeDialog()
 void DocumentDelegate::setEditorData( QWidget *editor,
                                       const QModelIndex &index) const
 {
-  MESSAGE("DocumentDelegate::setEditorData(){");
-  MESSAGE("*  item   is: " << index.data(Qt::DisplayRole).toString().toStdString());
-
-//   HexaBaseDialog* editor = dynamic_cast<HexaBaseDialog*>( editor );
+  HexaBaseDialog* hexaEditor = dynamic_cast<HexaBaseDialog*>( editor );
+  if (hexaEditor == NULL) return;
+  DocumentModel* documentModel = hexaEditor->getDocumentModel();
+  if (documentModel == NULL) return;
 
   switch ( index.data(HEXA_TREE_ROLE).toInt() ){
     case VERTEX_TREE : {
 //      HEXA_NS::Vertex *value = index.data( HEXA_DATA_ROLE ).value< HEXA_NS::Vertex* >();
-      HEXA_NS::Vertex *value = _documentModel->getHexaPtr<HEXA_NS::Vertex *>(index);
+      HEXA_NS::Vertex *value = documentModel->getHexaPtr<HEXA_NS::Vertex *>(index);
       VertexDialog *vertexEditor = static_cast<VertexDialog*>(editor);
       vertexEditor->setValue(value);
     }
     break;
     case EDGE_TREE : {
-      HEXA_NS::Edge *value = _documentModel->getHexaPtr<HEXA_NS::Edge*>(index);
+      HEXA_NS::Edge *value = documentModel->getHexaPtr<HEXA_NS::Edge*>(index);
       EdgeDialog *edgeEditor = static_cast<EdgeDialog*>(editor);
       edgeEditor->setValue(value);
     }
     break;
     case QUAD_TREE : {
-      HEXA_NS::Quad *value = _documentModel->getHexaPtr<HEXA_NS::Quad*>(index);
+      HEXA_NS::Quad *value = documentModel->getHexaPtr<HEXA_NS::Quad*>(index);
       QuadDialog *quadEditor = static_cast<QuadDialog*>(editor);
       quadEditor->setValue(value);
     }
     break;
     case HEXA_TREE : {
-      HEXA_NS::Hexa *value = _documentModel->getHexaPtr<HEXA_NS::Hexa*>(index);
+      HEXA_NS::Hexa *value = documentModel->getHexaPtr<HEXA_NS::Hexa*>(index);
       HexaDialog *hexaEditor = static_cast<HexaDialog*>(editor);
       hexaEditor->setValue(value);
     }
     break;
     case VECTOR_TREE : {
-      HEXA_NS::Vector *value = _documentModel->getHexaPtr<HEXA_NS::Vector*>(index);
+      HEXA_NS::Vector *value = documentModel->getHexaPtr<HEXA_NS::Vector*>(index);
       VectorDialog *vectorEditor = static_cast<VectorDialog*>(editor);
       vectorEditor->setValue(value);
     }
     break;
     case CYLINDER_TREE : {
-      HEXA_NS::Cylinder *value = _documentModel->getHexaPtr<HEXA_NS::Cylinder*>(index);
+      HEXA_NS::Cylinder *value = documentModel->getHexaPtr<HEXA_NS::Cylinder*>(index);
       CylinderDialog *cylinderEditor = static_cast<CylinderDialog*>(editor);
       cylinderEditor->setValue(value);
     }
     break;
     case PIPE_TREE : {
-      HEXA_NS::Pipe *value = _documentModel->getHexaPtr<HEXA_NS::Pipe*>(index);
+      HEXA_NS::Pipe *value = documentModel->getHexaPtr<HEXA_NS::Pipe*>(index);
       PipeDialog *pipeEditor= static_cast<PipeDialog*>(editor);
       pipeEditor->setValue(value);
     }
@@ -198,7 +180,6 @@ void DocumentDelegate::setEditorData( QWidget *editor,
     break;
   }
 
-  MESSAGE("}");
 }
 
 
@@ -207,6 +188,7 @@ bool DocumentDelegate::editorEvent ( QEvent                     *event,
                                      const QStyleOptionViewItem &option,
                                      const QModelIndex          &index )
 {
+/************************************************************
        MESSAGE("DocumentDelegate::editorEvent(){");
        MESSAGE("*  item   is: " << index.data().toString().toStdString());
        MESSAGE("*  event  is: " << event->type() );
@@ -219,14 +201,20 @@ bool DocumentDelegate::editorEvent ( QEvent                     *event,
        }
 
        //return QItemDelegate::editorEvent ( event, model, option, index );
+ *************************************************************/
        return false;
 }
 
 bool DocumentDelegate::eventFilter ( QObject * editor, QEvent * event )
 {
        if ( event->type() == QEvent::FocusOut ){
-               //((QWidget*) editor->parent())->close();
-               return true;
+               return true; //do nothing for this signal
        }
+       else if (event->type() == QEvent::HideToParent && editor != NULL)
+       {
+           //close the current editor when the tree is reduced
+           ((QWidget*) editor->parent())->close();
+       }
+
        return false;
 }