Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged all components on Sep 11. #240

Merged
merged 27 commits into from
Sep 17, 2018
Merged

Merged all components on Sep 11. #240

merged 27 commits into from
Sep 17, 2018

Conversation

dilawar
Copy link
Contributor

@dilawar dilawar commented Sep 11, 2018

No description provided.

Dilawar Singh added 27 commits September 11, 2018 12:33
406fee2 Temp commit to test on OSX.
cc3c604 Merge branch 'master' into chhennapoda
3420928 Update moose_test.py (#301)
61f4f66 show timeout in moose.test() .
abf822c with python2, just test with GSL. Build python3 first.
088c616 Made changes to build system so that pymoose directory can be built in isolation. Build system is bit more module. Ideally I should make sure that each subdirectory can built in isolation.
3c0ff27 Few changes to build with python3.6.
5d688f6 Use option --relative in setup.py and tell cmake not to look into usr prefix anymore.
1f3fe9f Merge branch 'chhennapoda' of github.com:BhallaLab/moose-core into chhennapoda
3e19983 removed unneeded library which is never used.
c2fbab8 cmake related changes to build on centos5 (manylinux docker image).

git-subtree-dir: moose-core
git-subtree-split: 406fee2a068f43af14be9918825e6fa88cc7377e
1502a55 removed old script.

git-subtree-dir: moose-examples
git-subtree-split: 1502a550706e049ee726f8adb4694a77feb63bbd
8dae832 kkitViewcontrol both the groups size are updated if moved from-to is different
44b53bc default: addSolver->mooseAddChemSolver, kkitViewcontrol: while rubberbandselection if entire group is selected then delete if partly selected then delete all the items under the selection
80b599f mgui: is popup exist then close, objectedit: objectwindowTitle is updated with name when changed, kkit: in positionChange all the neutral is updated with size, kkitViewcontrol:when moose object is moved from Compt/group to group/compartment then mooseobject path is set and for qgraphicalItem and qlineitem objects the parentItem is set which will be grpItem or comptItem

git-subtree-dir: moose-gui
git-subtree-split: 8dae832c3513bac92b3fba9601e9a77b4ec36653
b608810 Fixes for linux.

git-subtree-dir: moose-core
git-subtree-split: b6088109bf8ba75cb072d97dd306bec9ab2b0e9a
3420928 Update moose_test.py (#301)

git-subtree-dir: moose-core
git-subtree-split: 342092829ca21e457c785a5ce791429d403b79e7
1502a55 removed old script.

git-subtree-dir: moose-examples
git-subtree-split: 1502a550706e049ee726f8adb4694a77feb63bbd
8dae832 kkitViewcontrol both the groups size are updated if moved from-to is different
44b53bc default: addSolver->mooseAddChemSolver, kkitViewcontrol: while rubberbandselection if entire group is selected then delete if partly selected then delete all the items under the selection
80b599f mgui: is popup exist then close, objectedit: objectwindowTitle is updated with name when changed, kkit: in positionChange all the neutral is updated with size, kkitViewcontrol:when moose object is moved from Compt/group to group/compartment then mooseobject path is set and for qgraphicalItem and qlineitem objects the parentItem is set which will be grpItem or comptItem

git-subtree-dir: moose-gui
git-subtree-split: 8dae832c3513bac92b3fba9601e9a77b4ec36653
@dilawar dilawar requested a review from hrani September 11, 2018 11:57
@dilawar dilawar merged commit 2d914db into master Sep 17, 2018
@dilawar dilawar deleted the sep11 branch September 17, 2018 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant