Mercurial > hg > gcmultimerge
changeset 108:7677c4992381
Merged.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 18 Oct 2016 12:24:44 +0300 |
parents | f3949e4aca4b (current diff) 205767356d2c (diff) |
children | 8cf20367a372 |
files | multimerge.py |
diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/multimerge.py Tue Oct 18 11:55:14 2016 +0300 +++ b/multimerge.py Tue Oct 18 12:24:44 2016 +0300 @@ -185,6 +185,12 @@ else: gcm_fatal(u"Invalid initializer for GCMColor() object.") + def to_hexrgb(): + return "{0:02X}{1:02X}{2:02X}".format(self.r, self.g, self.b) + + def to_hexrgb_lc(): + return "{0:02x}{1:02x}{2:02x}".format(self.r, self.g, self.b) + def delta(self, other): ctmp = GCMColor() ctmp.r = other.r - self.r