diff --git a/moose-gui/.travis.yml b/moose-gui/.travis.yml new file mode 100644 index 0000000000000000000000000000000000000000..5e29a4846ea26d48637ce99e46e52b124fc4abb7 --- /dev/null +++ b/moose-gui/.travis.yml @@ -0,0 +1,22 @@ +notifications: + email: + recipients: + - dilawar.s.rajput@gmail.com + - upi.bhalla@gmail.com + - hrani@ncbs.res.in + + +install: + - wget http://download.opensuse.org/repositories/home:moose/xUbuntu_12.04/Release.key + - sudo apt-key add - < Release.key + - sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/moose/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/moose.list" + - sudo apt-get -y update + - sudo apt-get install python3 + - sudo apt-get -y install moose + +script: + - # Making sure no python incompatible file is added. + - python -m compileall -q . + - python -c 'import moose' + - python -c 'import moogli' + - # More tests here for gui. diff --git a/moose-gui/README.md b/moose-gui/README.md index 1ec6a410130194d05080e2f779797c4fc1321813..14d58668b3f9e2db43b28bf47905118612023d91 100644 --- a/moose-gui/README.md +++ b/moose-gui/README.md @@ -1 +1,3 @@ +[](https://travis-ci.org/BhallaLab/moose-gui) + # moose-gui diff --git a/moose-gui/mload.py b/moose-gui/mload.py index 916a33c4fa3e392a661cd702606cbed6be926f5a..b91e2888592a75138554a28521cb0f1fea98c218 100644 --- a/moose-gui/mload.py +++ b/moose-gui/mload.py @@ -129,11 +129,11 @@ def loadFile(filename, target, solver="gsl", merge=True): if not istext: print 'Cannot handle any binary formats yet' return None - parent, child = posixpath.split(target) - p = moose.Neutral(parent) - if not merge and p.path != '/': - for ch in p.children: - moose.delete(ch) + # parent, child = posixpath.split(target) + # p = moose.Neutral(parent) + # if not merge and p.path != '/': + # for ch in p.children: + # moose.delete(ch) try: modeltype = mtypes.getType(filename) subtype = mtypes.getSubtype(filename, modeltype) diff --git a/moose-gui/plugins/kkit.py b/moose-gui/plugins/kkit.py index a43aea67aa7b0c5984d74f1740a581b90e301136..5b79ea6fa2514f7fa9968b412d210f904cfdf03f 100644 --- a/moose-gui/plugins/kkit.py +++ b/moose-gui/plugins/kkit.py @@ -2,8 +2,9 @@ import sys from PyQt4 import QtGui, QtCore, Qt from default import * from moose import * -from moose.genesis import write +#from moose.genesis import write from moose import SBML +from moose.genesis.writeKkit import mooseWriteKkit #sys.path.append('plugins') from mplugin import * from kkitUtil import * @@ -113,7 +114,7 @@ class KkitPlugin(MoosePlugin): v['y'] = -yprime filename = filename - writeerror = write(self.modelRoot,str(filename),self.coOrdinates) + writeerror = mooseWriteKkit(self.modelRoot,str(filename),self.coOrdinates) if writeerror == False: QtGui.QMessageBox.information(None,'Could not save the Model','\nCheck the file') else: diff --git a/moose-gui/plugins/kkitOrdinateUtil.py b/moose-gui/plugins/kkitOrdinateUtil.py index c7e8db7b03fcaac501dea58c53d5209e2cb3effb..03484f19ca5e61d3e56921e89e99ab8edd06c037 100644 --- a/moose-gui/plugins/kkitOrdinateUtil.py +++ b/moose-gui/plugins/kkitOrdinateUtil.py @@ -218,7 +218,7 @@ def autoCoordinates(meshEntry,srcdesConnection): else: for items in (items for items in out ): G.add_edge(element(items[0]).path,inn.path) - + position = nx.spring_layout(G) #nx.draw(G,pos=nx.spring_layout(G)) #position = nx.spring_layout(G) #import matplotlib.pyplot as plt