[pubgit-commits-list] creaMaracasVisu branch master updated. 313783230a81f37f703080f75dde71abb5497c43
root
root at tux.creatis.insa-lyon.fr
Mon Jun 1 15:13:45 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Medical image visualization library".
The branch, master has been updated
via 313783230a81f37f703080f75dde71abb5497c43 (commit)
via b61b15415d19c665de225637c9136c634a5831c5 (commit)
via e8b03ba2f1ea374798141768ebd8351b0c1a24c7 (commit)
via 8eebd53dcbe07edf0569621003178ee37d69a39b (commit)
via 7237c161ca713d5054c9a5cd7dc7188d5ac65ae9 (commit)
via c142d9443e347c6f53eb9e84e8d952a191d9ce57 (commit)
via b31a8b467eaec7d7fd348be7f6123eec35a6271c (commit)
via 7f61609a6f4dfd638be957abdd75153c25101411 (commit)
via 46fa5cac1a169b7c987bf954e7df39a8bceb1dc4 (commit)
via 5bcbe43584902af3a90cfbd1a886a9c8434f236e (commit)
via ecf68d834a4193f68661d9d73ea1e6652fb83f20 (commit)
via 3c6c4d236dd41550927d9180688f40c127301431 (commit)
via bbd33bbb0f352d14d7068d87fcd50e02341004a9 (commit)
via dd348ad5863434fb9cfe0b74c20777ad5fc4ef8f (commit)
via 5c2299ec7d1a48d88d02fb31c46b15b69e40b9db (commit)
via a7017a8ade695bd14a4c7ee70b197d63b5e76765 (commit)
via 8f1f70ffb361d0ccde7da40ff128cebdcfcf3f13 (commit)
from 497867af0d89e85bac1566016ee3fe1014207489 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.creatis.insa-lyon.fr/pubgit/?p=creaMaracasVisu.git;a=commitdiff;h=313783230a81f37f703080f75dde71abb5497c43
commit 313783230a81f37f703080f75dde71abb5497c43
Author: davila <eduardo.davila at creatis.insa-lyon.fr>
Date: Mon Jun 1 15:13:39 2015 +0200
#2651 creaMaracasVisu Feature New Normal - Color Layer: Transparent Base, Refresh
http://git.creatis.insa-lyon.fr/pubgit/?p=creaMaracasVisu.git;a=commitdiff;h=b61b15415d19c665de225637c9136c634a5831c5
commit b61b15415d19c665de225637c9136c634a5831c5
Merge: e8b03ba 7237c16
Author: davila <eduardo.davila at creatis.insa-lyon.fr>
Date: Wed May 27 16:18:27 2015 +0200
Merge branch 'creaButtonContainer'
Conflicts:
bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
http://git.creatis.insa-lyon.fr/pubgit/?p=creaMaracasVisu.git;a=commitdiff;h=e8b03ba2f1ea374798141768ebd8351b0c1a24c7
commit e8b03ba2f1ea374798141768ebd8351b0c1a24c7
Author: davila <eduardo.davila at creatis.insa-lyon.fr>
Date: Wed May 27 16:10:01 2015 +0200
#2647 creaMaracasVisu Feature New Normal - Merge creaButtonContainer BRANCH
http://git.creatis.insa-lyon.fr/pubgit/?p=creaMaracasVisu.git;a=commitdiff;h=8eebd53dcbe07edf0569621003178ee37d69a39b
commit 8eebd53dcbe07edf0569621003178ee37d69a39b
Merge: 497867a bbd33bb
Author: davila <eduardo.davila at creatis.insa-lyon.fr>
Date: Wed May 27 16:05:57 2015 +0200
#2647 creaMaracasVisu Feature New Normal - Merge creaButtonContainer BRANCH
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +
bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx | 12 +-
bbtk/src/bbcreaMaracasVisuColorLayerImageView.h | 7 +
bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx | 2 +-
bbtk/src/bbcreaMaracasVisuPanelButtonContainer.h | 2 +-
data/Icons/ArrowBackG.xpm | 55 +
data/Icons/ArrowDownG.xpm | 53 +
data/Icons/ArrowNextG.xpm | 55 +
data/Icons/ArrowTopG.xpm | 52 +
data/Icons/Settings.xpm | 80 +
install/CMakeLists.txt | 5 -
install/{CMakeLists.txt => CMakeLists.txt~} | 9 +
lib/doxygen/CMakeLists.txt | 1 +
lib/doxygen/DoxyMainPage.txt.in | 19 +
.../ButtonContainerModify/10.session | 9 +
.../ButtonContainerModify/127.session | 7 +
.../ButtonContainerModify/128010.diagram | 169 ++
.../ButtonContainer/ButtonContainerModify/128127 | 627 ++++++++
.../ButtonContainer/ButtonContainerModify/128255 | 193 +++
.../ButtonContainerModify/128255.diagram} | 344 ++---
.../ButtonContainer/ButtonContainerModify/128383 | 1609 ++++++++++++++++++++
.../ButtonContainerModify/134538.diagram | 45 +
.../ButtonContainerModify/134783.diagram | 107 ++
.../ButtonContainerModify/20.session | 14 +
.../ButtonContainerModify.prj | 813 ++++++++++
.../ButtonContainerModify}/classes_list.html | 0
.../ButtonContainerModify}/cpp_includes | 0
.../ButtonContainerModify}/generation_settings | 1 +
.../ButtonContainerModify}/idl_includes | 0
.../ButtonContainerModify}/index-withframe.html | 2 +-
.../ButtonContainerModify}/index.html | 10 +-
.../ButtonContainerModify}/index_67.html | 2 +-
.../ButtonContainerModify}/java_imports | 0
.../ButtonContainerModify}/navig.html | 4 +-
.../ButtonContainerModify}/python_imports | 0
.../ButtonContainerModify/sequencediagrams.html} | 2 +-
.../ButtonContainerModify}/stereotypes | 1 +
.../ButtonContainerModify}/style.css | 0
.../ButtonContainerModify}/tools | 0
.../ButtonContainerModify_HTML/class135306.html | 26 +
.../ButtonContainerModify_HTML/class135434.html | 33 +
.../ButtonContainerModify_HTML}/classdiagrams.html | 4 +-
.../ButtonContainerModify_HTML/classes.html} | 7 +-
.../ButtonContainerModify_HTML}/classes_list.html | 4 +-
.../ButtonContainerModify_HTML/fig128255.png | Bin 0 -> 147192 bytes
.../ButtonContainerModify_HTML/fig134783.png | Bin 0 -> 29401 bytes
.../index-withframe.html | 2 +-
.../ButtonContainerModify_HTML/index.html | 31 +
.../ButtonContainerModify_HTML/index_66.html} | 7 +-
.../ButtonContainerModify_HTML}/index_67.html | 6 +-
.../ButtonContainerModify_HTML}/index_77.html | 4 +-
.../ButtonContainerModify_HTML}/index_80.html | 2 +-
.../ButtonContainerModify_HTML/index_83.html} | 6 +-
.../ButtonContainerModify_HTML/navig.html | 17 +
.../public_operations.html | 24 +
.../sequencediagrams.html} | 2 +-
.../ButtonContainerModify_HTML}/style.css | 0
.../bouml/wxVtkViewer/wxVtkViewer/127.session | 5 +
.../ThresholdImageView/ColorLayerImageView.cxx | 38 +-
.../ThresholdImageView/ColorLayerImageView.h | 9 +-
.../ColorLayerImageViewManager.cxx | 15 +
.../ColorLayerImageViewManager.h | 1 +
.../ColorLayerImageViewPanel.cxx | 20 +-
.../widgets/ThresholdImageView/LayerImageBase.cxx | 6 +
.../controller/buttonContainerController.cxx | 171 +--
.../model/buttonGroupFactory.cxx | 3 -
.../creaButtonContainer/model/buttonGroupFactory.h | 67 +-
.../model/containerSettings.cxx | 182 +--
.../creaButtonContainer/model/containerSettings.h | 5 -
.../widgets/creaButtonContainer/model/functor.txx | 141 +-
.../creaButtonContainer/model/listGroupFactory.cxx | 94 --
.../creaButtonContainer/model/listGroupFactory.h | 82 -
.../creaButtonContainer/model/structBCSettings.h | 51 +-
.../widgets/creaButtonContainer/view/button.cxx | 7 -
.../view/buttonContainerPanel.cxx | 145 +-
.../view/buttonContainerPanel.h | 103 +-
.../creaButtonContainer/view/buttonGroup.cxx | 109 +-
.../creaButtonContainer/view/buttonManager.cxx | 165 +-
.../creaButtonContainer/view/buttonManager.h | 82 +-
.../widgets/creaButtonContainer/view/comboBox.cxx | 142 ++
.../widgets/creaButtonContainer/view/comboBox.h | 157 ++
.../creaButtonContainer/view/groupManager.cxx | 131 +-
.../creaButtonContainer/view/groupManager.h | 80 +-
.../creaButtonContainer/view/listConfigDialog.cxx | 242 +++
.../creaButtonContainer/view/listConfigDialog.h | 164 ++
.../widgets/creaButtonContainer/view/listGroup.cxx | 98 --
.../widgets/creaButtonContainer/view/listGroup.h | 84 -
.../widgets/creaButtonContainer/view/listWx.cxx | 173 ++-
.../widgets/creaButtonContainer/view/listWx.h | 173 ++-
.../buttonContainerSettings.cxx | 384 +++--
.../buttonContainerSettings.h | 173 ++-
.../creaPanelButtonContainer.cxx | 362 +++--
.../creaPanelButtonContainer.h | 143 +-
93 files changed, 6510 insertions(+), 1985 deletions(-)
create mode 100644 .gitignore
create mode 100644 data/Icons/ArrowBackG.xpm
create mode 100644 data/Icons/ArrowDownG.xpm
create mode 100644 data/Icons/ArrowNextG.xpm
create mode 100644 data/Icons/ArrowTopG.xpm
create mode 100644 data/Icons/Settings.xpm
copy install/{CMakeLists.txt => CMakeLists.txt~} (96%)
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify/10.session
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify/127.session
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify/128010.diagram
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify/128127
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify/128255
copy lib/doxygen/bouml/{ThresholdImageView/ThresholdImageView/128002.diagram => ButtonContainer/ButtonContainerModify/128255.diagram} (70%)
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify/128383
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify/134538.diagram
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify/134783.diagram
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify/20.session
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify/ButtonContainerModify.prj
copy lib/doxygen/bouml/{GeneralArchitecture/GeneralArchitecture_HTML => ButtonContainer/ButtonContainerModify}/classes_list.html (100%)
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams => ButtonContainer/ButtonContainerModify}/cpp_includes (100%)
copy lib/doxygen/bouml/{ManualPaint/ManualPaint => ButtonContainer/ButtonContainerModify}/generation_settings (99%)
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams => ButtonContainer/ButtonContainerModify}/idl_includes (100%)
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams_HTML => ButtonContainer/ButtonContainerModify}/index-withframe.html (85%)
copy lib/doxygen/bouml/{ManualPaint/ManualPaint_html => ButtonContainer/ButtonContainerModify}/index.html (64%)
copy lib/doxygen/bouml/{manualContour/manualContour_Controler_HTML => ButtonContainer/ButtonContainerModify}/index_67.html (79%)
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams => ButtonContainer/ButtonContainerModify}/java_imports (100%)
copy lib/doxygen/bouml/{manualContour/manualContour_Controler_HTML => ButtonContainer/ButtonContainerModify}/navig.html (71%)
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams => ButtonContainer/ButtonContainerModify}/python_imports (100%)
copy lib/doxygen/bouml/{manualContour/manualContour_SeqCreateContour_HTML/classdiagrams.html => ButtonContainer/ButtonContainerModify/sequencediagrams.html} (78%)
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams => ButtonContainer/ButtonContainerModify}/stereotypes (99%)
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams_HTML => ButtonContainer/ButtonContainerModify}/style.css (100%)
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams => ButtonContainer/ButtonContainerModify}/tools (100%)
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify_HTML/class135306.html
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify_HTML/class135434.html
copy lib/doxygen/bouml/{ThresholdImageView/ThresholdImageView_html => ButtonContainer/ButtonContainerModify_HTML}/classdiagrams.html (78%)
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams_HTML/componentdiagrams.html => ButtonContainer/ButtonContainerModify_HTML/classes.html} (55%)
copy lib/doxygen/bouml/{ManualPaint/ManualPaint_html => ButtonContainer/ButtonContainerModify_HTML}/classes_list.html (69%)
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify_HTML/fig128255.png
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify_HTML/fig134783.png
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams_HTML => ButtonContainer/ButtonContainerModify_HTML}/index-withframe.html (85%)
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify_HTML/index.html
copy lib/doxygen/bouml/{GeneralArchitecture/GeneralArchitecture_HTML/index_77.html => ButtonContainer/ButtonContainerModify_HTML/index_66.html} (61%)
copy lib/doxygen/bouml/{GeneralArchitecture/GeneralArchitecture_HTML => ButtonContainer/ButtonContainerModify_HTML}/index_67.html (58%)
copy lib/doxygen/bouml/{manualContour/manualContour_MVC_HTML => ButtonContainer/ButtonContainerModify_HTML}/index_77.html (62%)
copy lib/doxygen/bouml/{GeneralArchitecture/GeneralArchitecture_HTML => ButtonContainer/ButtonContainerModify_HTML}/index_80.html (82%)
copy lib/doxygen/bouml/{GeneralArchitecture/GeneralArchitecture_HTML/index_71.html => ButtonContainer/ButtonContainerModify_HTML/index_83.html} (73%)
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify_HTML/navig.html
create mode 100644 lib/doxygen/bouml/ButtonContainer/ButtonContainerModify_HTML/public_operations.html
copy lib/doxygen/bouml/{manualContour/manualContour_SeqCreateContour_HTML/classdiagrams.html => ButtonContainer/ButtonContainerModify_HTML/sequencediagrams.html} (77%)
copy lib/doxygen/bouml/{CutModule/CutModuleDiagrams_HTML => ButtonContainer/ButtonContainerModify_HTML}/style.css (100%)
create mode 100644 lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/127.session
delete mode 100644 lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/listGroupFactory.cxx
delete mode 100644 lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/listGroupFactory.h
create mode 100644 lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/comboBox.cxx
create mode 100644 lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/comboBox.h
create mode 100644 lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listConfigDialog.cxx
create mode 100644 lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listConfigDialog.h
delete mode 100644 lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listGroup.cxx
delete mode 100644 lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listGroup.h
hooks/post-receive
--
Medical image visualization library
More information about the Pubgit-commits-list
mailing list