Commit b017bf00c56c851479cef58821e63ddb74091559
1 parent
6e3bbfcd
Exists in
master
and in
6 other branches
ENH: Changed name of strings (color to colour)
Showing
2 changed files
with
13 additions
and
13 deletions
Show diff stats
invesalius/data/slice_.py
@@ -55,9 +55,9 @@ class Slice(object): | @@ -55,9 +55,9 @@ class Slice(object): | ||
55 | 55 | ||
56 | ps.Publisher().subscribe(self.UpdateWindowLevelBackground,\ | 56 | ps.Publisher().subscribe(self.UpdateWindowLevelBackground,\ |
57 | 'Bright and contrast adjustment image') | 57 | 'Bright and contrast adjustment image') |
58 | - | ||
59 | - ps.Publisher().subscribe(self.UpdateColorTableBackground,\ | ||
60 | - 'Change color table from background image') | 58 | + |
59 | + ps.Publisher().subscribe(self.UpdateColourTableBackground,\ | ||
60 | + 'Change colour table from background image') | ||
61 | 61 | ||
62 | def __set_current_mask_threshold_limits(self, pubsub_evt): | 62 | def __set_current_mask_threshold_limits(self, pubsub_evt): |
63 | thresh_min = pubsub_evt.data[0] | 63 | thresh_min = pubsub_evt.data[0] |
@@ -404,30 +404,30 @@ class Slice(object): | @@ -404,30 +404,30 @@ class Slice(object): | ||
404 | 404 | ||
405 | if not((window == window_level.GetWindow()) and\ | 405 | if not((window == window_level.GetWindow()) and\ |
406 | (level == window_level.GetLevel())): | 406 | (level == window_level.GetLevel())): |
407 | - | 407 | + |
408 | window_level.SetWindow(window) | 408 | window_level.SetWindow(window) |
409 | window_level.SetLevel(level) | 409 | window_level.SetLevel(level) |
410 | window_level.SetOutputFormatToLuminance() | 410 | window_level.SetOutputFormatToLuminance() |
411 | window_level.Update() | 411 | window_level.Update() |
412 | - | 412 | + |
413 | thresh_min, thresh_max = window_level.GetOutput().GetScalarRange() | 413 | thresh_min, thresh_max = window_level.GetOutput().GetScalarRange() |
414 | self.lut_bg.SetTableRange(thresh_min, thresh_max) | 414 | self.lut_bg.SetTableRange(thresh_min, thresh_max) |
415 | self.img_colours_bg.SetInput(window_level.GetOutput()) | 415 | self.img_colours_bg.SetInput(window_level.GetOutput()) |
416 | - | ||
417 | - def UpdateColorTableBackground(self, pubsub_evt): | 416 | + |
417 | + def UpdateColourTableBackground(self, pubsub_evt): | ||
418 | values = pubsub_evt.data | 418 | values = pubsub_evt.data |
419 | - | 419 | + |
420 | if (values[0]): | 420 | if (values[0]): |
421 | self.lut_bg.SetNumberOfColors(values[0]) | 421 | self.lut_bg.SetNumberOfColors(values[0]) |
422 | - | 422 | + |
423 | self.lut_bg.SetSaturationRange(values[1]) | 423 | self.lut_bg.SetSaturationRange(values[1]) |
424 | self.lut_bg.SetHueRange(values[2]) | 424 | self.lut_bg.SetHueRange(values[2]) |
425 | self.lut_bg.SetValueRange(values[3]) | 425 | self.lut_bg.SetValueRange(values[3]) |
426 | - | 426 | + |
427 | thresh_min, thresh_max = self.window_level.GetOutput().GetScalarRange() | 427 | thresh_min, thresh_max = self.window_level.GetOutput().GetScalarRange() |
428 | self.lut_bg.SetTableRange(thresh_min, thresh_max) | 428 | self.lut_bg.SetTableRange(thresh_min, thresh_max) |
429 | - | ||
430 | - | 429 | + |
430 | + | ||
431 | def CreateMask(self, imagedata=None, name=None): | 431 | def CreateMask(self, imagedata=None, name=None): |
432 | 432 | ||
433 | future_mask = Mask() | 433 | future_mask = Mask() |
invesalius/gui/widgets/slice_menu.py
@@ -99,7 +99,7 @@ class SliceMenu(wx.Menu): | @@ -99,7 +99,7 @@ class SliceMenu(wx.Menu): | ||
99 | 99 | ||
100 | elif(key in const.SLICE_COLOR_TABLE.keys()): | 100 | elif(key in const.SLICE_COLOR_TABLE.keys()): |
101 | values = const.SLICE_COLOR_TABLE[key] | 101 | values = const.SLICE_COLOR_TABLE[key] |
102 | - ps.Publisher().sendMessage('Change color table from background image', values) | 102 | + ps.Publisher().sendMessage('Change colour table from background image', values) |
103 | ps.Publisher().sendMessage('Update slice viewer') | 103 | ps.Publisher().sendMessage('Update slice viewer') |
104 | 104 | ||
105 | elif(key in const.IMAGE_TILING.keys()): | 105 | elif(key in const.IMAGE_TILING.keys()): |