From: Eduardo Enrique Davila Serrano Date: Mon, 23 Jan 2023 13:41:49 +0000 (+0100) Subject: #3254 Bug windows select manual box X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f20bb1e48e93bb31c27fe3e610046c06333c8484;p=bbtkGEditor.git #3254 Bug windows select manual box --- diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index ed9d80c..ec42a2c 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx @@ -1199,8 +1199,8 @@ void wxGUIEditorGraphicBBS::OnClickBtnBox(wxCommandEvent& event) //2022-10-28 void wxGUIEditorGraphicBBS::OnClickBtnSelectBoxes(wxCommandEvent& event) { - std::string nameFilter = _pkgBrowser->GetNameFilter(); - _tabsMgr->SelectBoxWithPossibleName( nameFilter ); + std::string nameFilter = _pkgBrowser->GetNameFilter(); + _tabsMgr->SelectBoxWithPossibleName( nameFilter ); } //========================================================================= diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx index 6c5dfe5..098d888 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx @@ -608,7 +608,7 @@ printf("EED wxGEditorTabPanel::getUndoState This mecanisme is not working ????? //========================================================================= // EED 2022-10-28 - bool wxGEditorTabPanel::SelectBoxWithPossibleName(std::string nameFilter ) + void wxGEditorTabPanel::SelectBoxWithPossibleName(std::string nameFilter ) { getSceneManager()->SelectBoxWithPossibleName( nameFilter ); } diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h index 4519b55..824030a 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h @@ -196,7 +196,7 @@ namespace bbtk std::string GetMessageKind(); std::string GetMessageLevel(); - bool SelectBoxWithPossibleName(std::string nameFilter ); + void SelectBoxWithPossibleName(std::string nameFilter ); //========================================================================= diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx index ec69b81..de51abc 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx @@ -438,9 +438,9 @@ namespace bbtk //========================================================================= // EED 2022-10-28 - bool wxTabPanelsManager::SelectBoxWithPossibleName(std::string nameFilter ) + void wxTabPanelsManager::SelectBoxWithPossibleName(std::string nameFilter ) { - _actual->SelectBoxWithPossibleName( nameFilter ); + _actual->SelectBoxWithPossibleName( nameFilter ); } } // EO namespace bbtk diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h index add5745..6608c03 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h @@ -156,7 +156,7 @@ namespace bbtk std::string GetCurrentTabPanelPath( ); //DFCH int FindTab(std::string filename); bool TryToOpenScriptApplication(std::string packageName ,std::string boxType); - bool SelectBoxWithPossibleName(std::string nameFilter ); + void SelectBoxWithPossibleName(std::string nameFilter ); private: diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx index f1a057f..6684df1 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx @@ -3144,7 +3144,7 @@ void wxVtkSceneManager::printAll(int com , int sta ) //========================================================================= //EED 2022-10-28 void wxVtkSceneManager::SelectBoxWithPossibleName( std::string possibleName ) -{ +{ UnSelectBlackBoxes(); std::map::iterator it; GObjectController *desc; @@ -3181,7 +3181,7 @@ void wxVtkSceneManager::SelectBoxWithPossibleName( std::string possibleName ) } // if pos } // if type == 1 } // for it - refresh(); + refresh(); } } // EO namespace bbtk