Merge commit 'f0fd0e53'

moose-gui/.travis.yml

+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.

moose-gui/README.md

+[![Build Status](https://travis-ci.org/BhallaLab/moose-gui.svg?branch=master)](https://travis-ci.org/BhallaLab/moose-gui)
+
 # moose-gui

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)

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:

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