From b207c4253bedf6acbff99ecb87c7d9b6af04861d Mon Sep 17 00:00:00 2001 From: abn Date: Thu, 7 Jul 2016 11:24:22 +0200 Subject: [PATCH] [MEDCalc] selecting a presentation activates the proper view. --- src/MEDCalc/cmp/MEDPresentationManager_i.cxx | 2 +- src/MEDCalc/cmp/MEDPresentationManager_i.hxx | 2 ++ src/MEDCalc/gui/MEDModule.cxx | 2 -- src/MEDCalc/gui/MEDModule.hxx | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/MEDCalc/cmp/MEDPresentationManager_i.cxx b/src/MEDCalc/cmp/MEDPresentationManager_i.cxx index 920d0e060..e88e77cfb 100644 --- a/src/MEDCalc/cmp/MEDPresentationManager_i.cxx +++ b/src/MEDCalc/cmp/MEDPresentationManager_i.cxx @@ -194,7 +194,7 @@ MEDPresentationManager_i::activateView(MEDPresentation::TypeID presentationID) { std::map::const_iterator citr = _presentations.find(presentationID); if (citr == _presentations.end()) { - std::cerr << "getPresentationPyViewId(): presentation not found!!" << std::endl; + std::cerr << "activateView(): presentation not found!!" << std::endl; return false; } MEDPresentation* presentation = (*citr).second; diff --git a/src/MEDCalc/cmp/MEDPresentationManager_i.hxx b/src/MEDCalc/cmp/MEDPresentationManager_i.hxx index 4d455d20d..16c587583 100644 --- a/src/MEDCalc/cmp/MEDPresentationManager_i.hxx +++ b/src/MEDCalc/cmp/MEDPresentationManager_i.hxx @@ -62,6 +62,8 @@ class MEDPresentationManager_i: public POA_MEDCALC::MEDPresentationManager, MEDCALC_EXPORT MEDCALC::MEDPresentationViewMode getPresentationViewMode(MEDPresentation::TypeID); + MEDCALC_EXPORT CORBA::Boolean activateView(MEDPresentation::TypeID presentationID); + private: MEDPresentationManager_i(); virtual ~MEDPresentationManager_i(); diff --git a/src/MEDCalc/gui/MEDModule.cxx b/src/MEDCalc/gui/MEDModule.cxx index f316d7d77..1a48312be 100644 --- a/src/MEDCalc/gui/MEDModule.cxx +++ b/src/MEDCalc/gui/MEDModule.cxx @@ -45,7 +45,6 @@ #include "PVViewer_GUIElements.h" #endif - #include "MEDFactoryClient.hxx" #include "MEDPresentationManager_i.hxx" #include @@ -427,7 +426,6 @@ MEDModule::onClick(const QModelIndex & index) return; STDLOG("Presentation selection (activate view)"); - STDLOG(" Presention infos:"); std::ostringstream oss; oss << fieldId << " / " << presId; STDLOG(" - Field id / pres id: " + oss.str()); diff --git a/src/MEDCalc/gui/MEDModule.hxx b/src/MEDCalc/gui/MEDModule.hxx index 9c6b27348..d32a1c93c 100644 --- a/src/MEDCalc/gui/MEDModule.hxx +++ b/src/MEDCalc/gui/MEDModule.hxx @@ -121,6 +121,7 @@ private: #ifdef MED_HAS_QTTESTING TestController * _testController; #endif + }; #endif -- 2.39.2