223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

renamed methods "to" and "asModel" to more (?) meaningfull "convertTo" and "expressAs"

This commit is contained in:
Christoph Kords 2013-05-28 11:47:15 +00:00
parent 8421587724
commit d01a8bdf8c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/damask/colormaps.py
View File

@ -7,7 +7,7 @@ class Color():
''' '''
Conversion of colors between different color-spaces. Colors should be given in the form Conversion of colors between different color-spaces. Colors should be given in the form
Color('model',[vector]).To convert and copy color from one space to other, use the methods Color('model',[vector]).To convert and copy color from one space to other, use the methods
to('model') and asModel('model')spectively convertTo('model') and expressAs('model')spectively
''' '''
import numpy import numpy
@ -57,7 +57,7 @@ class Color():
# ------------------------------------------------------------------ # ------------------------------------------------------------------
def to(self,toModel = 'RGB'): def convertTo(self,toModel = 'RGB'):
toModel = toModel.upper() toModel = toModel.upper()
if toModel not in self.__transforms__.keys(): return if toModel not in self.__transforms__.keys(): return
@ -75,8 +75,8 @@ class Color():
# ------------------------------------------------------------------ # ------------------------------------------------------------------
def asModel(self,toModel = 'RGB'): def expressAs(self,asModel = 'RGB'):
return self.__class__(self.model,self.color).to(toModel) return self.__class__(self.model,self.color).convertTo(asModel)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@ -306,8 +306,8 @@ class Colormap():
if right.__class__.__name__ != 'Color': if right.__class__.__name__ != 'Color':
right = Color() right = Color()
self.left = left.asModel('MSH') self.left = left.expressAs('MSH')
self.right = right.asModel('MSH') self.right = right.expressAs('MSH')
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@ -355,7 +355,7 @@ class Colormap():
if Msh1[1] < 0.05 and Msh2[1] > 0.05: Msh1[2] = adjust_hue(Msh2,Msh1) if Msh1[1] < 0.05 and Msh2[1] > 0.05: Msh1[2] = adjust_hue(Msh2,Msh1)
elif Msh1[1] > 0.05 and Msh2[1] < 0.05: Msh2[2] = adjust_hue(Msh1,Msh2) elif Msh1[1] > 0.05 and Msh2[1] < 0.05: Msh2[2] = adjust_hue(Msh1,Msh2)
Msh = (1.0-frac)*Msh1 + frac*Msh2 Msh = (1.0-frac)*Msh1 + frac*Msh2
return Color('MSH',Msh).to(model) return Color('MSH',Msh).convertTo(model)
def write_paraview(RGB_vector): def write_paraview(RGB_vector):
colormap ='<ColorMap name="'+str(name)+'" space="RGB">\n' colormap ='<ColorMap name="'+str(name)+'" space="RGB">\n'