Download as
Browse Code »

Commit a816bc72aebf2836c4e397e718e3e541f69a5983

Authored by Thiago Franco de Moraes
1 parent 6e10d502
Exists in master and in 25 other branches canvas_reeng, canvas_text, casmoothing_cython, command-line, debian_cython, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, get_pixel, import_mesh, manual_v3.1, measure_placement_test, phoenix, region_growing_confidence, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, segmentation_menu, select_part, smoothing_bin_pll, user_guide_en, xmartlabs-command-line

Readded colored measurements

Showing 1 changed file with 6 additions and 4 deletions   Show diff stats
invesalius/data/measures.py
  Diff comments   View file @a816bc7
@@ -581,7 +581,8 @@ class LinearMeasure(object): @@ -581,7 +581,8 @@ class LinearMeasure(object):
581 581
582 if len(points) > 1: 582 if len(points) > 1:
583 for (p0, p1) in zip(points[:-1:], points[1::]): 583 for (p0, p1) in zip(points[:-1:], points[1::]):
584 - canvas.draw_line(p0, p1, colour=MEASURE_LINE_COLOUR) 584 + r, g, b = self.colour
  585 + canvas.draw_line(p0, p1, colour=(r*255, g*255, b*255, 255))
585 586
586 txt = u"%.3f mm" % self.GetValue() 587 txt = u"%.3f mm" % self.GetValue()
587 canvas.draw_text_box(txt, ((points[0][0]+points[1][0])/2.0, (points[0][1]+points[1][1])/2.0), txt_colour=MEASURE_TEXT_COLOUR, bg_colour=MEASURE_TEXTBOX_COLOUR) 588 canvas.draw_text_box(txt, ((points[0][0]+points[1][0])/2.0, (points[0][1]+points[1][1])/2.0), txt_colour=MEASURE_TEXT_COLOUR, bg_colour=MEASURE_TEXTBOX_COLOUR)
@@ -840,12 +841,13 @@ class AngularMeasure(object): @@ -840,12 +841,13 @@ class AngularMeasure(object):
840 841
841 if len(points) > 1: 842 if len(points) > 1:
842 for (p0, p1) in zip(points[:-1:], points[1::]): 843 for (p0, p1) in zip(points[:-1:], points[1::]):
843 - canvas.draw_line(p0, p1, colour=MEASURE_LINE_COLOUR) 844 + r, g, b = self.colour
  845 + canvas.draw_line(p0, p1, colour=(r*255, g*255, b*255, 255))
844 846
845 if len(points) == 3: 847 if len(points) == 3:
846 txt = u"%.3f° / %.3f°" % (self.GetValue(), 360.0 - self.GetValue()) 848 txt = u"%.3f° / %.3f°" % (self.GetValue(), 360.0 - self.GetValue())
847 -  
848 - canvas.draw_arc(points[1], points[0], points[2], line_colour=MEASURE_LINE_COLOUR) 849 + r, g, b = self.colour
  850 + canvas.draw_arc(points[1], points[0], points[2], line_colour=(r*255, g*255, b*255, 255))
849 canvas.draw_text_box(txt, (points[1][0], points[1][1]), txt_colour=MEASURE_TEXT_COLOUR, bg_colour=MEASURE_TEXTBOX_COLOUR) 851 canvas.draw_text_box(txt, (points[1][0], points[1][1]), txt_colour=MEASURE_TEXT_COLOUR, bg_colour=MEASURE_TEXTBOX_COLOUR)
850 852
851 def GetNumberOfPoints(self): 853 def GetNumberOfPoints(self):