[Olena-patches] branch unstable/scribo updated: olena-2.0-135-ga6aaffe

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 "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via a6aaffe887605d9d3168584eb4b68646c29ade13 (commit) via 8c22f85639fcc40021f2a79cd20b1d893603406a (commit) via d4d136fcb6448b5e2282d8598630132ab8114994 (commit) via 4a16753e91d448243d2c151c6aa6064b4e580b4e (commit) via 2ed6b8ec1d3ed5fccf35cf3a555edda9f5163f3e (commit) via 732dd9996f896dd56def0482122c9e06b3c43101 (commit) via 44d0803f20a08c10217b89f05e0d6628ac73e967 (commit) via caa884411440db0c43405e3182251728ff0b04b9 (commit) via 18236f195934f077b3f6bb46ef5d36021289217c (commit) via a36968ff5ac4cc841db4d3b137b0df57cf529656 (commit) via 5337931293e143f43e40a8be13478aa7e6e2d188 (commit) via 9ebbca1570609ab7309f35c2de655b3a9a18e3f6 (commit) via 5fe95d357c7d43ae542a0ef0541903d2c414600d (commit) via 43feab8fed9052c043700e9315c99dec146331b3 (commit) via 9ddc4c8ab53bbcb94c1665b7d2cadf14a4f10fb9 (commit) via bc9310b72cef13b2947ca4b141dd506d73738240 (commit) via 02c9ee2b680b11d9b0f8c234be154702a605efed (commit) via 0e03c859ec761fd2c42dc9ddb4e9c1d91fedcae4 (commit) via 0319bef0a9f5b8e04df241e3157fb824b1eb1b20 (commit) via 3705ff9141b24992d340c1a36b334955f1fecee0 (commit) via 1ec914f64b40d9a90dce4fc8cc1cb61905d89a5a (commit) via 0e51828995be380eecd7d21d7bcb1e5fe1b211c6 (commit) via efec80c23a85f3b304fe4101cebed309ffb6f809 (commit) via 58b937bfea02850e29c952c9ba978a185ef717b5 (commit) via 5635203e925268cf592688f38999c270a9fa5567 (commit) via 9aa27a63da4f353509a89b539c11621ffd314ad6 (commit) via bf4dcc26e1f7c4f200859972bf5e548bf788d202 (commit) via a928f7e91da04f2fa7f5b1d5a0903fc89fb536e1 (commit) via f709c246f9580618520a66d93e20540027190aaa (commit) via d0f19fcead6a62c52391ac5d30d404a60bc142f7 (commit) via 13926e8701f3f6ac52da3bb303c61dd6a9529d10 (commit) via 5fd931bf5d3b19928d2a0281c16e49bb86222a05 (commit) via b16ebc42bd5a085add33d1522f6c90b72efb9ee9 (commit) via e7ece121182967a40216e1876ede3cef61e52e46 (commit) via 42b527a3cc89a318c6606ca085b9c828d2c755b1 (commit) via 347fbf70991e16fef7035ebfd206190b69697c21 (commit) via 8837bd5fdbfbf08c1c3703da37c6580f04afe3fe (commit) via 01f77f1461fbd0f6d745111fdac75900d9195051 (commit) via e456b2c4a594ef85c27bde2e70bc98fce98b6be0 (commit) via 690daa5a473f248cbfa89d169ed8f567045d86b6 (commit) via c454f5a61f06423a7311c437f45b80772670654e (commit) via 38a85549d025d68d4c52657ef77d7e353e4be523 (commit) via 3a400aace3064a468abb57a2ff82f56e536fd071 (commit) via d46aeb366f6ec2be17addf1c5702d7fbb8c43d4a (commit) via 927d06abf1bb6b427177dab1cb7366b802c81a95 (commit) via a0627924aa9b8e4d6f8992ba60dbbd9d027a9de8 (commit) via 31943134f6fa78bb04eb3c20a55aa05df205a57d (commit) via 71fd63d5785cde5128f51945e14f421dff094376 (commit) from a9795b3b2307fea0b16162cb5a00f2f7197f829f (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 ----------------------------------------------------------------- a6aaffe Merge branch Antoine Froger's work into unstable/scribo. 8c22f85 Remove working directories. d4d136f * .gitignore: New. 4a16753 Fix some little bugs. 2ed6b8e Segmentation works. Recognition do not work correctly, do not know if it is related to this computer specifically. Some tests to do. 732dd99 Fix segmentation chain problems. 44d0803 Reimplement the toolchain segmentation but do not compile due to tesseract. caa8844 Fix little bugs on attributes model. 18236f1 Allow the user to print the segmentation. a36968f Scale the scene on CTRL + wheel or CTRL +/ -. Allow scrolling on right click. 5337931 Add scene scale, cloth to finish menu bar. 9ebbca1 Create the custom graphics view : handle the whelling and CTLR + or - scale of the view. 5fe95d3 Go back to the previous way for adding tree widget item in the region widget. Add TODO file. 43feab8 Test to change the static const array and load wanted data in QSettings but do not work. 9ddc4c8 Connect region widget with the scene and xml widget. bc9310b Completely finished xml widget with : add splitter, correct bugs (when deselecting and just have an item with no region item corresponding), real-time property modification with multiple selection. Also tabify dock widget in main window and fixed the corner dock area. Finished region widget interface. TODO : connect the region widget interface with the scene correctly. 02c9ee2 Cloth to have finished xml widget multiple selection. Finished pages widget : when deleting, testing if the widget has the focus. Also reimplement some stuff in the scene : add RootGraphicalItem to prepare the region widget. TODO : Finish xml widget multiple selection (problem : can t add prperlythe new selected item without clear selection and add new selection). 0e03c85 Finished page widget current row selection. TODO : Clear selection when click in the scene and all xml tree visible when any graphical item selected. 0319bef Good page widget advancement : customize model to see in the vieww which picture is selected and optimize memory and speed with new custom model. 3705ff9 Good xml tree with selection from scene and from tree. Fixed redondance in pages widget. 1ec914f Continue xmlWidget. Succeed in the implementation of the model for the tree and the selected tree. Problem with the selection proxy : don t reach childs. Don t have test the attribute widget. 0e51828 Try to implement model but can t find out how to load and delete all curent index to replace it. efec80c Add proper GScribo/xmlitem and /xmlmodel but can t test : problem with tesseract linking on personal computer. 58b937b Update XmlTree with custom modeland delegate to handle multiple tree view with one model. Begin the implementation on GScribo. 5635203 Add configs inline functions. 9aa27a6 new feFeatures for the tree widget : new treeWidget which show the selectionned items on the scene. TODO : Kill that and do it with model and proxy model to do something more generic. bf4dcc2 Finished selection from tree view to select on the scene. a928f7e Finish link between item tagName and item attribute. f709c24 Finished xml tree but just locality of root node false (pointer deleted before the signal is emitted). Also add relation between graphical item and tree item. d0f19fc Finished xmlTree and new xml class with mixed of QWidgetTreeItem and PolygonItem interactions 13926e8 Get chain segmentation and good pages viewer (add selection and remove) 5fd931b Get chain segmentation and good pages viewer (add selection and remove). b16ebc4 Finish pages viewer (just one little problem) and add config dialog. e7ece12 Try to implement good model/ view for training. 42b527a Add listview implementation tentative. With custiom delegate item and custom model. 347fbf7 Add scribo interface and tests. Block on scroll layout. 8837bd5 Optimisation, runner works well, add destructors and delete fine. 01f77f1 Add runner and all segmentation tasks. e456b2c Try to add segmentation tasks. 690daa5 New good selection and look. c454f5a Finish selection. 38a8554 Debug and correct. 3a400aa New XmlParserFile proper. d46aeb3 Update Test2. 927d06a Add xml parser. a062792 Add selection. 3194313 Add GraphicsView and MouseEvent. 71fd63d new QT tests ----------------------------------------------------------------------- Summary of changes: GScribo/BUGS | 1 + GScribo/GScribo.pro | 83 ++++ GScribo/GScribo.pro.user | 405 +++++++++++++++++++ GScribo/GScribo.pro.user.1.3 | 283 +++++++++++++ GScribo/PagesWidget/pagesdelegate.cpp | 20 + GScribo/PagesWidget/pagesdelegate.h | 18 + GScribo/PagesWidget/pagesmodel.cpp | 55 +++ GScribo/PagesWidget/pagesmodel.h | 43 ++ GScribo/PagesWidget/pageswidget.cpp | 49 +++ GScribo/PagesWidget/pageswidget.h | 55 +++ GScribo/Preferences/generaloptions.cpp | 44 ++ GScribo/Preferences/generaloptions.h | 34 ++ .../Preferences/generaloptions.ui | 0 GScribo/Preferences/ocroptions.cpp | 53 +++ GScribo/Preferences/ocroptions.h | 33 ++ .../Preferences/ocroptions.ui | 0 GScribo/Preferences/optionwidget.h | 15 + GScribo/Preferences/preferencesdialog.cpp | 98 +++++ GScribo/Preferences/preferencesdialog.h | 42 ++ .../Preferences/preferencesdialog.ui | 0 GScribo/Preferences/preprocessingoptions.cpp | 45 +++ GScribo/Preferences/preprocessingoptions.h | 32 ++ .../Preferences/preprocessingoptions.ui | 0 GScribo/Preferences/segmentationoptions.cpp | 33 ++ GScribo/Preferences/segmentationoptions.h | 31 ++ .../Preferences/segmentationoptions.ui | 0 GScribo/Processing/preprocess.cpp | 11 + GScribo/Processing/preprocess.h | 26 ++ GScribo/Processing/process.cpp | 21 + GScribo/Processing/process.h | 29 ++ GScribo/Processing/progressdialog.cpp | 16 + GScribo/Processing/progressdialog.h | 22 + GScribo/Processing/runner.cpp | 183 +++++++++ GScribo/Processing/runner.h | 58 +++ GScribo/Rendering/abstractregionitem.h | 13 + GScribo/Rendering/backgroundtexture.h | 12 + GScribo/Rendering/graphicsview.cpp | 150 +++++++ GScribo/Rendering/graphicsview.h | 43 ++ GScribo/Rendering/regionitem.cpp | 59 +++ GScribo/Rendering/regionitem.h | 80 ++++ GScribo/Rendering/rootgraphicsitem.h | 30 ++ GScribo/Rendering/scene.cpp | 273 +++++++++++++ GScribo/Rendering/scene.h | 118 ++++++ GScribo/Rendering/selection.cpp | 36 ++ GScribo/Rendering/selection.h | 20 + GScribo/TODO | 100 +++++ GScribo/XmlWidget/attributesmodel.cpp | 69 ++++ GScribo/XmlWidget/attributesmodel.h | 48 +++ GScribo/XmlWidget/selectionproxy.h | 47 +++ GScribo/XmlWidget/xmlattributes.cpp | 23 ++ GScribo/XmlWidget/xmlattributes.h | 33 ++ GScribo/XmlWidget/xmldelegate.h | 30 ++ GScribo/XmlWidget/xmlitem.cpp | 43 ++ GScribo/XmlWidget/xmlitem.h | 90 +++++ GScribo/XmlWidget/xmlmodel.cpp | 87 ++++ GScribo/XmlWidget/xmlmodel.h | 44 ++ GScribo/XmlWidget/xmlview.cpp | 88 ++++ GScribo/XmlWidget/xmlview.h | 79 ++++ GScribo/XmlWidget/xmlwidget.cpp | 34 ++ GScribo/XmlWidget/xmlwidget.h | 54 +++ GScribo/aboutdialog.h | 25 ++ GScribo/aboutdialog.ui | 136 +++++++ GScribo/configs.h | 134 +++++++ GScribo/dir.h | 7 + GScribo/dockwidget.h | 22 + GScribo/main.cpp | 23 ++ GScribo/mainwindow.cpp | 415 ++++++++++++++++++++ GScribo/mainwindow.h | 120 ++++++ GScribo/mainwindow.ui | 35 ++ GScribo/region.h | 56 +++ GScribo/regionwidget.cpp | 70 ++++ GScribo/regionwidget.h | 40 ++ GScribo/variantpointer.h | 19 + GScribo/xml.cpp | 206 ++++++++++ GScribo/xml.h | 93 +++++ 75 files changed, 4942 insertions(+), 0 deletions(-) create mode 100644 GScribo/BUGS create mode 100644 GScribo/GScribo.pro create mode 100644 GScribo/GScribo.pro.user create mode 100644 GScribo/GScribo.pro.user.1.3 create mode 100644 GScribo/PagesWidget/pagesdelegate.cpp create mode 100644 GScribo/PagesWidget/pagesdelegate.h create mode 100644 GScribo/PagesWidget/pagesmodel.cpp create mode 100644 GScribo/PagesWidget/pagesmodel.h create mode 100644 GScribo/PagesWidget/pageswidget.cpp create mode 100644 GScribo/PagesWidget/pageswidget.h create mode 100644 GScribo/Preferences/generaloptions.cpp create mode 100644 GScribo/Preferences/generaloptions.h copy scribo/demo/viewer/general_options.ui => GScribo/Preferences/generaloptions.ui (100%) create mode 100644 GScribo/Preferences/ocroptions.cpp create mode 100644 GScribo/Preferences/ocroptions.h copy scribo/demo/viewer/ocr_options.ui => GScribo/Preferences/ocroptions.ui (100%) create mode 100644 GScribo/Preferences/optionwidget.h create mode 100644 GScribo/Preferences/preferencesdialog.cpp create mode 100644 GScribo/Preferences/preferencesdialog.h copy scribo/demo/viewer/preferences_dialog.ui => GScribo/Preferences/preferencesdialog.ui (100%) create mode 100644 GScribo/Preferences/preprocessingoptions.cpp create mode 100644 GScribo/Preferences/preprocessingoptions.h copy scribo/demo/viewer/preprocessing_options.ui => GScribo/Preferences/preprocessingoptions.ui (100%) create mode 100644 GScribo/Preferences/segmentationoptions.cpp create mode 100644 GScribo/Preferences/segmentationoptions.h copy scribo/demo/viewer/segmentation_options.ui => GScribo/Preferences/segmentationoptions.ui (100%) create mode 100644 GScribo/Processing/preprocess.cpp create mode 100644 GScribo/Processing/preprocess.h create mode 100644 GScribo/Processing/process.cpp create mode 100644 GScribo/Processing/process.h create mode 100644 GScribo/Processing/progressdialog.cpp create mode 100644 GScribo/Processing/progressdialog.h create mode 100644 GScribo/Processing/runner.cpp create mode 100644 GScribo/Processing/runner.h create mode 100644 GScribo/Rendering/abstractregionitem.h create mode 100644 GScribo/Rendering/backgroundtexture.h create mode 100644 GScribo/Rendering/graphicsview.cpp create mode 100644 GScribo/Rendering/graphicsview.h create mode 100644 GScribo/Rendering/regionitem.cpp create mode 100644 GScribo/Rendering/regionitem.h create mode 100644 GScribo/Rendering/rootgraphicsitem.h create mode 100644 GScribo/Rendering/scene.cpp create mode 100644 GScribo/Rendering/scene.h create mode 100644 GScribo/Rendering/selection.cpp create mode 100644 GScribo/Rendering/selection.h create mode 100644 GScribo/TODO create mode 100644 GScribo/XmlWidget/attributesmodel.cpp create mode 100644 GScribo/XmlWidget/attributesmodel.h create mode 100644 GScribo/XmlWidget/selectionproxy.h create mode 100644 GScribo/XmlWidget/xmlattributes.cpp create mode 100644 GScribo/XmlWidget/xmlattributes.h create mode 100644 GScribo/XmlWidget/xmldelegate.h create mode 100644 GScribo/XmlWidget/xmlitem.cpp create mode 100644 GScribo/XmlWidget/xmlitem.h create mode 100644 GScribo/XmlWidget/xmlmodel.cpp create mode 100644 GScribo/XmlWidget/xmlmodel.h create mode 100644 GScribo/XmlWidget/xmlview.cpp create mode 100644 GScribo/XmlWidget/xmlview.h create mode 100644 GScribo/XmlWidget/xmlwidget.cpp create mode 100644 GScribo/XmlWidget/xmlwidget.h create mode 100644 GScribo/aboutdialog.h create mode 100644 GScribo/aboutdialog.ui create mode 100644 GScribo/configs.h create mode 100644 GScribo/dir.h create mode 100644 GScribo/dockwidget.h create mode 100644 GScribo/main.cpp create mode 100644 GScribo/mainwindow.cpp create mode 100644 GScribo/mainwindow.h create mode 100644 GScribo/mainwindow.ui create mode 100644 GScribo/region.h create mode 100644 GScribo/regionwidget.cpp create mode 100644 GScribo/regionwidget.h create mode 100644 GScribo/variantpointer.h create mode 100644 GScribo/xml.cpp create mode 100644 GScribo/xml.h hooks/post-receive -- Olena, a generic and efficient image processing platform