-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 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
#ifndef DISABLE_SALOMEOBJECT
#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
#endif
#ifndef DISABLE_VTKVIEWER
#include <GLViewer_ViewFrame.h>
#include <GLViewer_ViewPort.h>
#endif
+#ifndef DISABLE_PVVIEWER
+ #include <PVViewer_ViewManager.h>
+ #include <PVViewer_ViewWindow.h>
+#endif
#ifndef DISABLE_PLOT2DVIEWER
#include <Plot2d_ViewWindow.h>
#include <Plot2d_ViewFrame.h>
// check data type of selection
SALOME_ListIteratorOfListIO It( selected );
for ( ; isCompatible && It.More(); It.Next()) {
- Handle(SALOME_InteractiveObject)& io = It.Value();
+ Handle(SALOME_InteractiveObject) io = It.Value();
isCompatible = ( aStudy->componentDataType( io->getEntry() ) == moduleDataType );
}
}
treeModel->setAppropriate( EntryCol, Qtx::Toggled );
}*/
- if ( myIsFirstActivate ) {
- updateModuleVisibilityState();
- myIsFirstActivate = false;
- }
-
return res;
}
#ifndef DISABLE_GLVIEWER
if ( viewWnd->inherits( "GLViewer_ViewFrame" ) )
( (GLViewer_ViewFrame*)viewWnd )->getViewPort()->onUpdate();
+#endif
+#ifndef DISABLE_PVVIEWER
+// if ( viewWnd->inherits( "PVViewer_ViewWindow" ) )
+// ( (PVViewer_ViewWindow*)viewWnd )->getViewPort()->onUpdate();
#endif
}
}
SUIT_DataBrowser* ob = app->objectBrowser();
if ( !ob || !ob->model() ) return;
+ if ( !myIsFirstActivate )
+ return;
+
+ myIsFirstActivate = false;
+
// connect to click on item
connect( ob->model(), SIGNAL( clicked( SUIT_DataObject*, int ) ),
this, SLOT( onObjectClicked( SUIT_DataObject*, int ) ), Qt::UniqueConnection );
+ // connect to click on item
+ connect( ob, SIGNAL( destroyed( QObject* ) ),
+ this, SLOT( onOBDestroyed() ), Qt::UniqueConnection );
SUIT_DataObject* rootObj = ob->root();
if ( !rootObj ) return;
if ( id != -1 )
startOperation( id );
}
+
+void LightApp_Module::onOBDestroyed()
+{
+ myIsFirstActivate = true;
+}