refs #1330: draft preferences implementation for polyline arrow

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

diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx
index 05e583ab67e0917e511d2a0b4ff3f6447d39cf0f..aca7491c21c4ddfd4ddc716aa3d334ac9566d566 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@ -30,6 +30,7 @@
 #include "HYDROGUI_Operations.h"
 #include "HYDROGUI_PrsImage.h"
 #include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 #include "HYDROGUI_Shape.h"
 #include "HYDROGUI_VTKPrs.h"
@@ -323,7 +324,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
   bool anIsImageHasRefs = false;
   bool anIsFusedImage = false;
   bool anIsCutImage = false;
-  bool anIsSplittedImage = false;
+  bool anIsSplitImage = false;
   bool anIsMustObjectBeUpdated = false;
   bool anIsPolyline = false;
   bool anIsPolyline3D = false;
@@ -423,7 +424,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
               else if( anOperatorName == ImageComposer_CutOperator::Type() )
                 anIsCutImage = true;
               else if( anOperatorName == ImageComposer_CropOperator::Type() )
-                anIsSplittedImage = true;
+                anIsSplitImage = true;
             }
           }
         }
@@ -475,7 +476,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         anIsDigue = true;
       else if( anObjectKind == KIND_DUMMY_3D )
         anIsDummyObject3D = true;
-      else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLITTED_GROUP )
+      else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLIT_GROUP )
         anIsGroup = true;
     }
 
@@ -570,8 +571,8 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
             theMenu->addAction( action( EditFusedImageId ) );
           else if( anIsCutImage )
             theMenu->addAction( action( EditCutImageId ) );
-          else if( anIsSplittedImage )
-            theMenu->addAction( action( EditSplittedImageId ) );
+          else if( anIsSplitImage )
+            theMenu->addAction( action( EditSplitImageId ) );
         }
 
         //RKV: BUG#98: theMenu->addAction( action( ObserveImageId ) );
@@ -682,6 +683,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         theMenu->addSeparator();
         //
         theMenu->addAction( action( ExportToShapeFileID ) );
+        theMenu->addSeparator();
       }      
       else if( anIsVisualState && anIsObjectBrowser )
       {
@@ -702,6 +704,13 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         theMenu->addAction( action( SetColorId ) );
         theMenu->addSeparator();
       }
+
+      // Add transparency action for land cover map objects
+      if ( anIsLandCoverMap )
+      {
+        theMenu->addAction( action( SetTransparencyId ) );
+        theMenu->addSeparator();
+      }
     } else if ( anAllAreProfiles ) {
       theMenu->addAction( action( SelectedGeoreferencementId ) );
       theMenu->addSeparator();
@@ -822,6 +831,24 @@ void HYDROGUI_Module::createPreferences()
   setPreferenceProperty( defaultStricklerCoef, "min", 0.00 );
   setPreferenceProperty( defaultStricklerCoef, "max", 1000000.00 );
   setPreferenceProperty( defaultStricklerCoef, "step", 0.01 );
+
+  int polylinesGroup = addPreference( tr( "PREF_GROUP_POLYLINES" ), genTab );
+  int polylineArrow = addPreference( tr( "PREF_POLYLINE_ARROW" ), polylinesGroup,
+    LightApp_Preferences::Selector, "polyline", "arrow_type" );
+
+  QList<QVariant> indices;
+  indices.append( 0 );
+  indices.append( 1 );
+  indices.append( 2 );
+  setPreferenceProperty( polylineArrow, "indexes", indices );
+  QList<QVariant> arrow_types;
+  arrow_types.append( tr( "No" ) );
+  arrow_types.append( tr( "Triangle" ) );
+  arrow_types.append( tr( "Cone" ) );
+  setPreferenceProperty( polylineArrow, "strings", arrow_types );
+
+  int polylineSize = addPreference( tr( "PREF_POLYLINE_ARROW_SIZE" ), polylinesGroup,
+    LightApp_Preferences::IntSpin, "polyline", "arrow_size" );
 }
 
 void HYDROGUI_Module::preferencesChanged( const QString& theSection, const QString& thePref )
@@ -833,6 +860,10 @@ void HYDROGUI_Module::preferencesChanged( const QString& theSection, const QStri
         if ( resMgr && !aDoc.IsNull() )
             aDoc->SetDefaultStricklerCoefficient( resMgr->doubleValue( theSection, thePref, 0 ) );
     }
+    else if( theSection == "polyline" )
+    {
+      //TODO: update polylines
+    }
     else
         LightApp_Module::preferencesChanged( theSection, thePref );
 }
@@ -1080,10 +1111,13 @@ void HYDROGUI_Module::setObjectVisible( const int theViewId,
     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 )
+        if ( treeModel )
+        {
+          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 ( theObject->GetKind() == KIND_BATHYMETRY && theState ) {
@@ -1529,6 +1563,7 @@ void HYDROGUI_Module::onViewCreated( SUIT_ViewWindow* theViewWindow )
       aViewFrame->installEventFilter( this );
 
       GraphicsView_ViewPort* aViewPort = aViewFrame->getViewPort();
+      aViewPort->setInteractionFlag( GraphicsView_ViewPort::GlobalWheelScaling );
 
       connect( aViewPort, SIGNAL( vpMouseEvent( QGraphicsSceneMouseEvent* ) ),
                this, SLOT( onViewPortMouseEvent( QGraphicsSceneMouseEvent* ) ) );
@@ -1809,7 +1844,7 @@ void HYDROGUI_Module::onObjectClicked( SUIT_DataObject* theObject, int theColumn
 
   setObjectVisible( HYDROGUI_Tool::GetActiveViewId( this ), hydroObject->modelObject(), vis );
 
-  update( UF_OCCViewer | ( visState == Qtx::ShownState ? UF_FitAll : 0 ) );
+  update( UF_OCCViewer | UF_VTKViewer | ( visState == Qtx::ShownState ? UF_FitAll : 0 ) );
 }
 
 Handle(HYDROData_StricklerTable) HYDROGUI_Module::getLandCoverColoringTable( const int theViewId ) const