CamiTK Community Edition merge requestshttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests2017-11-29T12:10:15+01:00https://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/1UPDATED readme to check pushes on remote forge repository2017-11-29T12:10:15+01:00Jean-Loup HaberbuschUPDATED readme to check pushes on remote forge repositoryI just want to know if I can merge to upstreamI just want to know if I can merge to upstreamEmmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/2Develop2017-11-29T17:15:48+01:00Jean-Loup HaberbuschDevelopI cleaned test phrase in README, please let me merge....I cleaned test phrase in README, please let me merge....Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/3Feature/consolidate testing2017-12-04T16:24:06+01:00Emmanuel PromayonFeature/consolidate testingPlease consider this merge requestPlease consider this merge requesthttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/4Bug/restrict testaction2017-12-06T11:03:07+01:00Emmanuel PromayonBug/restrict testactionactions should not be tested directly on external CEP test filesactions should not be tested directly on external CEP test filesJean-Loup HaberbuschJean-Loup Haberbuschhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/5UPDATED C++11 compliance CMake syntax2017-12-26T16:51:09+01:00Jean-Loup HaberbuschUPDATED C++11 compliance CMake syntaxA CMake conform way to get code compilation compliant with C++11A CMake conform way to get code compilation compliant with C++11Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/6Feature/extra testaction2017-12-14T16:18:05+01:00Emmanuel PromayonFeature/extra testactionThis branch adds a new feature to check integration of component with existing action.
Documentation for this feature is "advertised" in the cep generator code.
Documentation about the new macro is also available [in this wiki section](h...This branch adds a new feature to check integration of component with existing action.
Documentation for this feature is "advertised" in the cep generator code.
Documentation about the new macro is also available [in this wiki section](https://forge.imag.fr/plugins/mediawiki/wiki/camitk/index.php/How_to_test_your_extension_with_automatic_tests#How_to_test_existing_actions_with_your_component_extension.3F)https://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/7WIP: Feature asmforregressiontest2018-01-22T22:31:41+01:00Emmanuel PromayonWIP: Feature asmforregressiontestSprint 6Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/8Easier CEP testing2017-12-15T19:48:01+01:00Emmanuel PromayonEasier CEP testingAdds two option to the camitk_extension_project macro for facilitating CEP testing
Wiki documentation also updatedAdds two option to the camitk_extension_project macro for facilitating CEP testing
Wiki documentation also updatedJean-Loup HaberbuschJean-Loup Haberbuschhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/9FIXED additional test for an action not yet existing is ok if it is current t...2017-12-17T13:01:06+01:00Emmanuel PromayonFIXED additional test for an action not yet existing is ok if it is current targetIt is ok to create an additional action test for an action that does not already exist
(i.e., shared lib cannot be found), if and only if the action is a target of the
currently build multi-CEP.
In this case it is the shared lib will be ...It is ok to create an additional action test for an action that does not already exist
(i.e., shared lib cannot be found), if and only if the action is a target of the
currently build multi-CEP.
In this case it is the shared lib will be created during build and be available
at test time.
This should fix the problem (and bring back the dashboard to all green!).https://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/10Feature/update api 4.x2018-03-07T09:30:15+01:00Emmanuel PromayonFeature/update api 4.xThis is link to story #490 of current sprint.
Acceptance test:
- [x] No “deprecated” keyword in doxygen doc, C++ and cmake code
Step
- [X] CamiTK Core
- [X] CamiTK SDK
- [X] CamiTK open-source
- [x] test ok with new CI test scri...This is link to story #490 of current sprint.
Acceptance test:
- [x] No “deprecated” keyword in doxygen doc, C++ and cmake code
Step
- [X] CamiTK Core
- [X] CamiTK SDK
- [X] CamiTK open-source
- [x] test ok with new CI test script (see/depends on #2)Sprint 5Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/11new test script2017-12-20T23:10:27+01:00Emmanuel Promayonnew test scriptCloses #2Closes #2Sprint 5https://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/12fix additional test2017-12-22T18:12:52+01:00Emmanuel Promayonfix additional testcloses #3closes #3Sprint 5Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/13Fix/ci script git hash2018-03-07T09:30:16+01:00Emmanuel PromayonFix/ci script git hashcdash build names was not updated *after* each git update. The git hash was therefore incorrect.
This should fix this.
Also fixes #1 cdash build names was not updated *after* each git update. The git hash was therefore incorrect.
This should fix this.
Also fixes #1 Sprint 5Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/14FIXED same error message in continuous and nightly2018-03-07T09:30:15+01:00Emmanuel PromayonFIXED same error message in continuous and nightly(in fact this is just a test for ctest build name, see previous commit
it should take effect tomorrow)(in fact this is just a test for ctest build name, see previous commit
it should take effect tomorrow)Sprint 5Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/15FIXED fetch origin/develop hash before ctest_start2018-03-07T09:30:16+01:00Emmanuel PromayonFIXED fetch origin/develop hash before ctest_startFixes #4Fixes #4Sprint 5Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/16Bug/cxx11 for old cmake2018-03-07T09:30:16+01:00Emmanuel PromayonBug/cxx11 for old cmakeCloses #5 Closes #5 Sprint 5Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/17FIXED unset variable before setting them again2018-03-07T09:30:15+01:00Emmanuel PromayonFIXED unset variable before setting them againTentative to fix continuous script not modifying the git hashTentative to fix continuous script not modifying the git hashSprint 5Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/18Feature/target iwyu2018-03-07T10:45:26+01:00Emmanuel PromayonFeature/target iwyuCloses #7Closes #7Sprint 6Jean-Loup HaberbuschJean-Loup Haberbuschhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/19Feature/loggerinterface2018-03-07T10:45:25+01:00Emmanuel PromayonFeature/loggerinterfaceAdd a proper logger for CamiTK applications
# Steps to finish (refer to internal specification doc)
## DONE
- [X] resolve conflicts
- [x] move new macros (currently in `Application.h`) to `Log.h` and include `Log.h` in `Applica...Add a proper logger for CamiTK applications
# Steps to finish (refer to internal specification doc)
## DONE
- [X] resolve conflicts
- [x] move new macros (currently in `Application.h`) to `Log.h` and include `Log.h` in `Application.cpp` not `Application.h`. In `Log.h` include Application.h, InterfaceLogger.h, and the macros
- [x] change `NULL` to `nullptr` in macros and tab to space
- [x] set `static void setLogger(InterfaceLogger * logger)` protected
- [x] set `static InterfaceLogger * getLogger();`
- [x] can we move `applicationLogger` to a static field of `getLogger()` to implement proper singleton. Use case to consider: an Application class deriving from camitk::Application does not want to use a CamiTKLogger instance but another type of logger. Will this strategy work. Ex: CamiTKSM constructor instanciate FooLogger and wants applicationLogger to reference this instanciate.
- [x] document `CAMITK_STATIC_*` macro or find another more simple way of taking into account loggin in `static` methods
- [x] log file directory should be defined by default and should be a tmp directory. There should a way to get the name of this directory in the GUI
- [x] `CamiTKLogger::writeToFile` should be true by default. Log file directory should be defined by default. `CamiTKLogger` has a new QFile field and a `getLogFile()::QFile` (and not `setLogFile()`)
- [x] describe how CamiTKLogger works in api doc
- [x] is a `static` field `QMutex mutex;` in CamiTKLogger a good idea/practice?
- [x] rename `buildLogLessage`
- [x] modify `log("Ahrrrrggghhhh.... Log Writer is being destructed !!! See you soon CamiTK !!! (now, closing files properly...)", InterfaceLogger::TRACE, NULL);` in `~CamiTKLogger`
- [x] check if `~CamiTKLogger` is called or not
- [x] check if there is another solution than to have the log file constantly opened (might be a problem if application crash, the file might be destroyed/in a bad state). Check `flush()` is safe enough. Do not open/close file all the time
- [x] In `LoggerSetting` use application settings file to save message box level, log level, log file directory, write to standard out,
- [x] InterfaceLogger API → `writeToDirectory` → `setLogDirectory` + `setWriteToFile(bool)` (= test if directory is writable)
- [x] Add debug functionality using `__LINE__` and `__FILE__` (through an encapsulated `bool` field in `InterfaceLogger`)
- [x] `setLogFileDirectory` : add boolean, true by default. If true, move the previous log file to the new directory without changing its name and append to it
- [x] add boolean flag to enable/disable the timestamp
## TODO
- [x] add CAMITK_DISABLE_LOG option (it should not be NDEBUG, as log should also be available for "Release"
- [x] have the console at the bottom of the main window + show/hide in the status bar + icon to show number of error/warning/info/trace like in atom editor
- [x] write test code for logger / verbosity level
- [x] Write a test application to unit test CamiTKLogger
Sprint 6Emmanuel PromayonEmmanuel Promayonhttps://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/20WIP: Feature/asm for regression test2018-01-22T18:24:01+01:00Emmanuel PromayonWIP: Feature/asm for regression testNew branch to merge (old) `promayoe/CamiTK-feature-asmforregressiontest` branch into up-to-date `develop` branch.
This was generated by:
```
git fetch git@gricad-gitlab.univ-grenoble-alpes.fr:promayoe/CamiTK.git feature-asmforregression...New branch to merge (old) `promayoe/CamiTK-feature-asmforregressiontest` branch into up-to-date `develop` branch.
This was generated by:
```
git fetch git@gricad-gitlab.univ-grenoble-alpes.fr:promayoe/CamiTK.git feature-asmforregressiontest
git checkout -b promayoe/CamiTK-feature-asmforregressiontest FETCH_HEAD
git checkout develop
git checkout feature/asm-for-regression-test
git merge --no-ff promayoe/CamiTK-feature-asmforregressiontest
git push
```Sprint 6Emmanuel PromayonEmmanuel Promayon