Squashed 'moose-core/' changes from 0f34490..1b38d64
1b38d64 Merge pull request #356 from hrani/master a5e0e95 Fixes to issue #360. Regression caused by #352 . (#361) 58292d6 Fix for typo in socket implementation. (#359) d3c2c5f clean up with color conversion to hex values 473e29d function import was missing a812045 Merge branch 'master' of http://github.com/hrani/moose-core f723a63 getCordColor is unused function removing 1dfbbeb Merge branch 'master' into master 9c4458f HOTFIX #357 | Cleaning up HDF5 related macros in cmake. (#358) 9b8f038 converting dictionary compatible to python3 bfde5cc travis complaining of same function name ddcbd4d adding pickle file rainbow2.pkl for mapping colors from genesis 2ea935b syntax cleanup d9d36b8 cleanedup for python3 as well while loading pickle file 09d5239 readKkit.cpp : create annotator field for kinetic, readSBML.py: validator flag is set to on from true,groupname and groupid is passed, if both are missing then its not a valid sbml file, textcolor is set now, validator.py: added errormsg at validator, writeSBML.py: from chemconnectUtil getcolor is called and also group width and height is written if it comes from GUI, chemConnectUtil.py: getColor,validcolorcheck,getRandcolor moved from gui to core, writeKkit.py: text color might be a rgb which should go as string in kkit file, moose/utils.py: cleaned mooseaddchemsolver to mooseAddChemSolver, moose.py: solver is set if passed with moose.mooseReadSBML(), Annotator.h,cpp: added field height and width for group, rainbow.pkl added file f227bb0 Travis Fix | Don't run streamer multitab tests on OSX/Travis. (#354) a1a256b Efficient Network Streamer for MOOSE (#352) git-subtree-dir: moose-core git-subtree-split: 1b38d64f451a6b5b0d6caf610376d6ba3ba93cb6
Showing
- .travis.yml 3 additions, 7 deletions.travis.yml
- .travis/travis_build_linux.sh 7 additions, 7 deletions.travis/travis_build_linux.sh
- .travis/travis_build_osx.sh 2 additions, 2 deletions.travis/travis_build_osx.sh
- .travis/travis_prepare_linux.sh 4 additions, 1 deletion.travis/travis_prepare_linux.sh
- CMakeLists.txt 0 additions, 66 deletionsCMakeLists.txt
- basecode/ObjId.cpp 3 additions, 2 deletionsbasecode/ObjId.cpp
- basecode/header.h 0 additions, 1 deletionbasecode/header.h
- builtins/CMakeLists.txt 49 additions, 0 deletionsbuiltins/CMakeLists.txt
- builtins/MooseSocketInfo.h 83 additions, 0 deletionsbuiltins/MooseSocketInfo.h
- builtins/SocketStreamer.cpp 143 additions, 153 deletionsbuiltins/SocketStreamer.cpp
- builtins/SocketStreamer.h 24 additions, 23 deletionsbuiltins/SocketStreamer.h
- builtins/Streamer.cpp 30 additions, 23 deletionsbuiltins/Streamer.cpp
- builtins/Streamer.h 4 additions, 0 deletionsbuiltins/Streamer.h
- builtins/StreamerBase.cpp 4 additions, 4 deletionsbuiltins/StreamerBase.cpp
- builtins/Table.cpp 56 additions, 20 deletionsbuiltins/Table.cpp
- builtins/Table.h 9 additions, 3 deletionsbuiltins/Table.h
- kinetics/ReadKkit.cpp 3 additions, 2 deletionskinetics/ReadKkit.cpp
- pymoose/moosemodule.cpp 12 additions, 16 deletionspymoose/moosemodule.cpp
- pymoose/vec.cpp 1 addition, 11 deletionspymoose/vec.cpp
- python/moose/SBML/readSBML.py 40 additions, 23 deletionspython/moose/SBML/readSBML.py
Please register or sign in to comment