Skip to content
Snippets Groups Projects
Commit 68fb5688 authored by Dilawar Singh's avatar Dilawar Singh
Browse files

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
parent 5855deb6
No related branches found
No related tags found
Showing
with 477 additions and 364 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment