Commit 613eaf3943ba46ffff51d05bdb4223d72ddcc709
1 parent
e76c7155
Exists in
master
and in
68 other branches
FIX: Opening project with edited points
Showing
3 changed files
with
10 additions
and
5 deletions
Show diff stats
invesalius/data/slice_.py
| ... | ... | @@ -157,6 +157,8 @@ class Slice(object): |
| 157 | 157 | |
| 158 | 158 | def __set_current_mask_threshold(self, evt_pubsub): |
| 159 | 159 | session = ses.Session() |
| 160 | + print session.project_status != const.PROJ_OPEN | |
| 161 | + print session.project_status | |
| 160 | 162 | #FIXME: find a better way to implement this |
| 161 | 163 | if (self.num_gradient >= 2) or \ |
| 162 | 164 | (session.project_status != const.PROJ_OPEN): |
| ... | ... | @@ -275,11 +277,6 @@ class Slice(object): |
| 275 | 277 | |
| 276 | 278 | proj = Project() |
| 277 | 279 | proj.mask_dict[self.current_mask.index].threshold_range = threshold_range |
| 278 | - | |
| 279 | - session = ses.Session() | |
| 280 | - session.ChangeProject() | |
| 281 | - | |
| 282 | - | |
| 283 | 280 | |
| 284 | 281 | |
| 285 | 282 | def ShowMask(self, index, value): | ... | ... |
invesalius/gui/task_slice.py
| ... | ... | @@ -31,6 +31,7 @@ import gui.widgets.foldpanelbar as fpb |
| 31 | 31 | import widgets.colourselect as csel |
| 32 | 32 | |
| 33 | 33 | from project import Project |
| 34 | +import session as ses | |
| 34 | 35 | |
| 35 | 36 | BTN_NEW = wx.NewId() |
| 36 | 37 | |
| ... | ... | @@ -476,6 +477,8 @@ class MaskProperties(wx.Panel): |
| 476 | 477 | if self.bind_evt_gradient: |
| 477 | 478 | ps.Publisher().sendMessage('Set threshold values', |
| 478 | 479 | (thresh_min, thresh_max)) |
| 480 | + session = ses.Session() | |
| 481 | + session.ChangeProject() | |
| 479 | 482 | |
| 480 | 483 | def OnSelectColour(self, evt): |
| 481 | 484 | colour = evt.GetValue() | ... | ... |
invesalius/gui/widgets/gradient.py
| ... | ... | @@ -558,6 +558,7 @@ class GradientSlider(wx.Panel): |
| 558 | 558 | def ChangeMinValue(self, e): |
| 559 | 559 | # Why do I need to change slide min value if it has been changed for |
| 560 | 560 | # the user? |
| 561 | + | |
| 561 | 562 | if not self.slided: |
| 562 | 563 | self.GradientPanel.SetMinValue(int(self.SpinMin.GetValue())) |
| 563 | 564 | self._GenerateEvent() |
| ... | ... | @@ -582,7 +583,9 @@ class GradientSlider(wx.Panel): |
| 582 | 583 | except AttributeError: |
| 583 | 584 | pass |
| 584 | 585 | self.GradientPanel.SetMinValue(value) |
| 586 | + self.slided = 1 | |
| 585 | 587 | self.SpinMin.SetValue(int(value)) |
| 588 | + self.slided = 0 | |
| 586 | 589 | self.GradientPanel.Refresh() |
| 587 | 590 | |
| 588 | 591 | def SetMaxValue(self, value): |
| ... | ... | @@ -591,7 +594,9 @@ class GradientSlider(wx.Panel): |
| 591 | 594 | except AttributeError: |
| 592 | 595 | pass |
| 593 | 596 | self.GradientPanel.SetMaxValue(value) |
| 597 | + self.slided = 1 | |
| 594 | 598 | self.SpinMax.SetValue(int(value)) |
| 599 | + self.slided = 0 | |
| 595 | 600 | self.GradientPanel.Refresh() |
| 596 | 601 | |
| 597 | 602 | def SetMaxRange(self, value): | ... | ... |