From 3dfbd557990fb29289eef13e9cb9344eff5ef488 Mon Sep 17 00:00:00 2001 From: ouv Date: Fri, 11 Nov 2005 07:31:20 +0000 Subject: [PATCH] Fixed bug GVIEW10476. There should be a tab named "Mouse mode" in the File > Preference > Post-Pro widget, where the user should be able to choose standard or gauss mouse mode (with some infos of what each mode does : how to navigate, select...) --- src/VISUGUI/VISUM_msg_en.po | 2 +- src/VISUGUI/VisuGUI_Module.cxx | 4 ---- src/VVTK/VVTK_MainWindow.cxx | 12 ++++++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/VISUGUI/VISUM_msg_en.po b/src/VISUGUI/VISUM_msg_en.po index 303fb4c1..aefad0c7 100644 --- a/src/VISUGUI/VISUM_msg_en.po +++ b/src/VISUGUI/VISUM_msg_en.po @@ -137,7 +137,7 @@ msgid "VisuGUI_Module::VISU_PICKING_PREF_DISPLAY_PARENT_MESH" msgstr "Display parent mesh element" msgid "VisuGUI_Module::VISU_MOUSE_PREF_TAB_TLT" -msgstr "Spacemouse" +msgstr "Navigation" msgid "VisuGUI_Module::VISU_MOUSE_PREF_GROUP_TLT" msgstr "Mouse" diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx index 344c042e..78f3430d 100644 --- a/src/VISUGUI/VisuGUI_Module.cxx +++ b/src/VISUGUI/VisuGUI_Module.cxx @@ -598,10 +598,6 @@ VisuGUI_Module setPreferenceProperty( spacemousePref4, "indexes", indices ); setPreferenceProperty( spacemousePref5, "strings", values ); setPreferenceProperty( spacemousePref5, "indexes", indices ); - - int cameraGr = addPreference( tr( "VISU_CAMERA_PREF_GROUP_TTL" ), mouseTab ); - int cameraPref = addPreference( tr( "VISU_CAMERA_MOVE_PREF" ), cameraGr, SalomeApp_Preferences::IntSpin, "VISU", "camera_movement_steps" ); - setPreferenceProperty( cameraPref, "max", 1000 ); } diff --git a/src/VVTK/VVTK_MainWindow.cxx b/src/VVTK/VVTK_MainWindow.cxx index c0b4e76a..baba8608 100644 --- a/src/VVTK/VVTK_MainWindow.cxx +++ b/src/VVTK/VVTK_MainWindow.cxx @@ -62,7 +62,6 @@ VVTK_MainWindow ::Initialize(SVTK_RenderWindowInteractor* theInteractor) { SVTK_MainWindow::Initialize(theInteractor); - PushInteractorStyle(myInteractorStyle.GetPointer()); } VVTK_MainWindow @@ -133,12 +132,14 @@ VVTK_MainWindow1 "VVTK/SVTK StyleSwitch", true); anAction->setToggleAction(true); - anAction->toggle(); anAction->setStatusTip(tr("DSC_VVTK_INTERACTOR_STYLE_SWITCH")); - connect(anAction, SIGNAL(toggled(bool)), this, SLOT(OnInteractorStyleSwitch(bool))); + anAction->addTo( myPtsToolBar ); myStyleSwitchAction = anAction; + if( theResourceMgr->integerValue( "VISU", "mouse_behaviour", true ) == 1 ) + myStyleSwitchAction->toggle(); + aPixmap = theResourceMgr->loadPixmap("VISU",tr("ICON_VVTK_SELECTION_MODE_SWITCH")); anAction = new QtxAction(tr("MNU_VVTK_SELECTION_MODE_SWITCH"), aPixmap, @@ -181,6 +182,10 @@ VVTK_MainWindow1 myRenderer = theRenderer; VVTK_MainWindow::Initialize(theInteractor); + if( myStyleSwitchAction->isOn() ) + PushInteractorStyle(myInteractorStyle.GetPointer()); + connect(myStyleSwitchAction, SIGNAL(toggled(bool)), this, SLOT(OnInteractorStyleSwitch(bool))); + mySegmentationCursorDlg->SetWidget( theRenderer->GetImplicitFunctionWidget() ); myPickingDlg->SetInteractor( GetInteractor() ); } @@ -203,7 +208,6 @@ VVTK_MainWindow1 theResourceMgr, thePickingSettings, myStyleSwitchAction); - //myMainWindow2->hide(); return myMainWindow2; } -- 2.39.2