From 9fcd4b5ff2b3a07fce1912da437afb7d13c3cbff Mon Sep 17 00:00:00 2001
From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Wed, 14 Apr 2010 16:05:53 +0000
Subject: [PATCH] SceneWin: - Fixed Deselect All - Fixed Compiling without
IMG
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2004 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/gui/src/scene_selection.cc | 5 ++---
modules/gui/src/scene_selection.hh | 2 ++
modules/gui/src/scene_win/context_menu.cc | 11 +++++++----
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/modules/gui/src/scene_selection.cc b/modules/gui/src/scene_selection.cc
index 3bb9dbf19..9cacf0da2 100644
--- a/modules/gui/src/scene_selection.cc
+++ b/modules/gui/src/scene_selection.cc
@@ -278,9 +278,8 @@ void SceneSelection::SelectAllViews(){
void SceneSelection::DeselectAllViews(){
mol::EntityView sel = view_entity_->GetSelection();
if(sel.IsValid()){
- for(unsigned int i= 0; i < views_.size(); i++){
- sel = mol::Difference(sel, views_[i].GetEntityView());
- }
+ sel = mol::Difference(sel, this->GetViewUnion());
+ view_entity_->SetSelection(sel);
}
}
diff --git a/modules/gui/src/scene_selection.hh b/modules/gui/src/scene_selection.hh
index 9e3115b8b..3b5bebabb 100644
--- a/modules/gui/src/scene_selection.hh
+++ b/modules/gui/src/scene_selection.hh
@@ -44,7 +44,9 @@ public:
public slots:
void CenterOnObjects();
void Delete();
+#if OST_IMG_ENABLED
void ViewDensitySlices();
+#endif // OST_IMG_ENABLED
void CopyViews();
void Select();
void Deselect();
diff --git a/modules/gui/src/scene_win/context_menu.cc b/modules/gui/src/scene_win/context_menu.cc
index 77138a273..f9a66ce92 100644
--- a/modules/gui/src/scene_win/context_menu.cc
+++ b/modules/gui/src/scene_win/context_menu.cc
@@ -72,11 +72,16 @@ void ContextMenu::ShowMenu(const QPoint& pos)
if(gfx_node->GetType()==0){all_not_scene = false;}
if(!dynamic_cast<gfx::GfxObj*> (gfx_node.get())){all_gfx_objects = false;}
if(!dynamic_cast<gfx::Entity*> (gfx_node.get())){all_entities = false;}
+#if OST_IMG_ENABLED
if(!dynamic_cast<gfx::MapIso*> (gfx_node.get())){all_maps = false;}
+#else
+ all_maps = false;
+#endif // OST_IMG_ENABLED
}
else{
all_gfx_objects = false;
all_entities = false;
+ all_maps = false;
all_visible = true;
all_hidden = true;
}
@@ -154,14 +159,12 @@ void ContextMenu::ShowMenu(const QPoint& pos)
}
- #if OST_IMG_ENABLED
-
+#if OST_IMG_ENABLED
if(all_maps){
action = menu->addAction("View Density Slices");
connect(action, SIGNAL(triggered()), SceneSelection::Instance(), SLOT(ViewDensitySlices()));
}
-
- #endif // OST_IMG_ENABLED
+#endif // OST_IMG_ENABLED
if(all_entity_views){
--
GitLab