refs #550: fix crash when myObject is NULL

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Module.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx
index 87014307d5b963a43459185a89e821f7211d6584..cbed2b66dc1943b3c443b75712ee31a944c3078e 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  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) 2014-2015  EDF-R&D
 // 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
@@ -577,6 +573,8 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         theMenu->addAction( action( CutImagesId ) );
         theMenu->addAction( action( SplitImageId ) );
         theMenu->addSeparator();
+        theMenu->addAction( action( RecognizeContoursId ) );
+        theMenu->addSeparator();
       }
       else if( anIsBathymetry )
       {
@@ -710,6 +708,21 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
 
   if( isRoot )
     theMenu->addAction( action( EditLocalCSId ) );
+
+  if( anIsObjectBrowser && anOwners.size()==1 )
+  {
+    if( aSeq.Size() > 0 )
+    {
+      Handle( HYDROData_Object ) anObject = Handle( HYDROData_Object )::DownCast( aSeq.First() );
+      if( !anObject.IsNull() )
+      {
+        theMenu->addSeparator();
+        theMenu->addAction( action( SubmersibleId ) );
+        action( SubmersibleId )->setCheckable( true );
+        action( SubmersibleId )->setChecked( anObject->IsSubmersible() );
+      }
+    }
+  }
 }
 
 void HYDROGUI_Module::createPreferences()
@@ -734,11 +747,24 @@ void HYDROGUI_Module::createPreferences()
 
   setPreferenceProperty( typeOfCursor, "indexes", aCursorTypeIndicesList );
   setPreferenceProperty( typeOfCursor, "icons",   aCursorTypeIconsList );
+
+  int viewerGroup = addPreference( tr( "PREF_GROUP_VIEWER" ), genTab );
+  addPreference( tr( "PREF_VIEWER_AUTO_FITALL" ), viewerGroup,
+                 LightApp_Preferences::Bool, "HYDRO", "auto_fit_all" );
+}
+
+QCursor HYDROGUI_Module::getPrefEditCursor() const
+{
+  int aCursorType = SUIT_Session::session()->resourceMgr()->integerValue("preferences", "type_of_cursor", (int)CT_CrossCursor );
+  if ( aCursorType >= Qt::BlankCursor)
+    aCursorType++;
+  QCursor aCursor = QCursor( Qt::CursorShape(aCursorType) );
+  return aCursor;
 }
 
 void HYDROGUI_Module::update( const int flags )
 {
-  if( !isUpdateEnabled() )
+  if ( !isUpdateEnabled() )
     return;
 
   QApplication::setOverrideCursor( Qt::WaitCursor );
@@ -751,6 +777,12 @@ void HYDROGUI_Module::update( const int flags )
   QStringList aSelectedEntries = storeSelection();
 
   bool aDoFitAll = flags & UF_FitAll;
+  if ( aDoFitAll )
+  {
+    SUIT_ResourceMgr* aResMgr = getApp()->resourceMgr();
+    aDoFitAll = aResMgr->booleanValue( "HYDRO", "auto_fit_all", false );
+  }
+
   if( ( flags & UF_Viewer ) )
     updateViewer( getDisplayer(), flags & UF_GV_Init, flags & UF_GV_Forced, aDoFitAll ); 
 
@@ -950,12 +982,14 @@ void HYDROGUI_Module::setObjectVisible( const int theViewId,
     anObjectState.Visibility = theState;
 
     HYDROGUI_DataObject* hydroObject = getDataModel()->getDataObject( theObject );
-
-    SUIT_AbstractModel* treeModel = dynamic_cast<SUIT_AbstractModel*>( getApp()->objectBrowser()->model() );
-    QString id = hydroObject->text( hydroObject->customData( Qtx::IdType ).toInt() );
-    Qtx::VisibilityState visState = treeModel->visibilityState( id );
-    if ( visState != Qtx::UnpresentableState )
-        treeModel->setVisibilityState( id, theState ? Qtx::ShownState : Qtx::HiddenState );
+    if ( hydroObject )
+    {
+        SUIT_AbstractModel* treeModel = dynamic_cast<SUIT_AbstractModel*>( getApp()->objectBrowser()->model() );
+        QString id = hydroObject->text( hydroObject->customData( Qtx::IdType ).toInt() );
+        Qtx::VisibilityState visState = treeModel->visibilityState( id );
+        if ( visState != Qtx::UnpresentableState )
+            treeModel->setVisibilityState( id, theState ? Qtx::ShownState : Qtx::HiddenState );
+    }
   }
 }
 
@@ -1666,5 +1700,5 @@ void HYDROGUI_Module::onObjectClicked( SUIT_DataObject* theObject, int theColumn
 
   setObjectVisible( HYDROGUI_Tool::GetActiveViewId( this ), hydroObject->modelObject(), vis );
 
-  update( UF_OCCViewer | UF_FitAll );
+  update( UF_OCCViewer | ( visState == Qtx::ShownState ? UF_FitAll : 0 ) );
 }