Skip to content

Commit bfde5cc

Browse files
committed
travis complaining of same function name
1 parent ddcbd4d commit bfde5cc

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

python/moose/genesis/writeKkit.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,9 @@ def writeConcChan(modelpath,f,sceneitems):
271271
else:
272272
error = error + "\n x and y co-ordinates are not specified for `" + cChan.name+ "` zero will be assigned \n "
273273
if color == "" or color == " ":
274-
color = getRandColor()
274+
color = getRandomColor()
275275
if textcolor == "" or textcolor == " ":
276-
textcolor = getRandColor()
276+
textcolor = getRandomColor()
277277
f.write("simundump kchan /kinetics/" + trimPath(cChan)+ " " + str(int(1)) + " " + str(cChan.permeability)+ " " +
278278
str(int(0)) + " " +
279279
str(int(0)) + " " +
@@ -344,9 +344,9 @@ def writeEnz( modelpath,f,sceneitems):
344344
else:
345345
error = error + "\n x and y co-ordinates are not specified for `" + enz.name+ "` zero will be assigned \n "
346346
if color == "" or color == " ":
347-
color = getRandColor()
347+
color = getRandomColor()
348348
if textcolor == "" or textcolor == " ":
349-
textcolor = getRandColor()
349+
textcolor = getRandomColor()
350350

351351
f.write("simundump kenz /kinetics/" + trimPath(enz) + " " + str(int(0))+ " " +
352352
str(concInit) + " " +
@@ -421,9 +421,9 @@ def writeReac(modelpath,f,sceneitems):
421421
y = 0
422422
error = error + "\n x and y co-ordinates are not specified for `" + reac.name+ "` zero will be assigned \n "
423423
if color == "" or color == " ":
424-
color = getRandColor()
424+
color = getRandomColor()
425425
if textcolor == "" or textcolor == " ":
426-
textcolor = getRandColor()
426+
textcolor = getRandomColor()
427427
f.write("simundump kreac /kinetics/" + trimPath(reac) + " " +str(0) +" "+ str(kf) + " " + str(kb) + " \"\" " +
428428
str(color) + " " + str(textcolor) + " " + str(int(x)) + " " + str(int(y)) + " "+ str(0)+"\n")
429429
return reacList,error
@@ -628,9 +628,9 @@ def writePool(modelpath,f,volIndex,sceneitems):
628628
geometryName = volIndex[float(poolsCmpt.volume)]
629629
volume = p.volume * NA * 1e-3
630630
if color == "" or color == " ":
631-
color = getRandColor()
631+
color = getRandomColor()
632632
if textcolor == "" or textcolor == " ":
633-
textcolor = getRandColor()
633+
textcolor = getRandomColor()
634634
f.write("simundump kpool /kinetics/" + trimPath(p) + " 0 " +
635635
str(p.diffConst) + " " +
636636
str(0) + " " +
@@ -673,15 +673,15 @@ def getColorCheck(color,GENESIS_COLOR_SEQUENCE):
673673
else:
674674
raise Exception("Invalid Color Value!")
675675

676-
def getRandColor():
676+
def getRandomColor():
677677
ignoreColor= ["mistyrose","antiquewhite","aliceblue","azure","bisque","black","blanchedalmond","blue","cornsilk","darkolivegreen","darkslategray","dimgray","floralwhite","gainsboro","ghostwhite","honeydew","ivory","lavender","lavenderblush","lemonchiffon","lightcyan","lightgoldenrodyellow","lightgray","lightyellow","linen","mediumblue","mintcream","navy","oldlace","papayawhip","saddlebrown","seashell","snow","wheat","white","whitesmoke","aquamarine","lightsalmon","moccasin","limegreen","snow","sienna","beige","dimgrey","lightsage"]
678678
matplotcolor = {}
679679
for name,hexno in matplotlib.colors.cnames.items():
680680
matplotcolor[name]=hexno
681681

682682
k = random.choice(list(matplotcolor.keys()))
683683
if k in ignoreColor:
684-
return getRandColor()
684+
return getRandomColor()
685685
else:
686686
return k
687687
def writeCompartment(modelpath,compts,f):

0 commit comments

Comments
 (0)