fix error with indexes on loading mask from inv3 project

Thiago Franco de Moraes
1 parent ba2e8753
Showing 2 changed files with 8 additions and 5 deletions Show diff stats
invesalius/control.py
invesalius/project.py
@@ -579,13 +579,16 @@ class Controller():
         Publisher.sendMessage('Update AUI')
  
         if len(proj.mask_dict):
+            self.Slice.current_mask = None
             mask_index = len(proj.mask_dict) -1
-            for m in proj.mask_dict.values():
+            for key, m in proj.mask_dict.items():
                 Publisher.sendMessage('Add mask', mask=m)
                 if m.is_shown:
-                    self.Slice.current_mask = proj.mask_dict[mask_index]
-                    Publisher.sendMessage('Show mask', index=m.index, value=True)
-                    Publisher.sendMessage('Change mask selected', index=m.index)
+                    self.Slice.current_mask = m
+                    visible_mask_idx = key
+            if self.Slice.current_mask is not None:
+                Publisher.sendMessage('Show mask', index=visible_mask_idx, value=True)
+                Publisher.sendMessage('Change mask selected', index=visible_mask_idx)
         else:
             mask_name = const.MASK_NAME_PATTERN % (1,)
  
@@ -338,7 +338,7 @@ class Project(metaclass=Singleton):
             m = msk.Mask()
             m.spacing = self.spacing
             m.OpenPList(filepath)
-            self.mask_dict[m.index] = m
+            self.mask_dict[int(index)] = m
  
         # Opening the surfaces
         self.surface_dict = {}
...	...	@@ -579,13 +579,16 @@ class Controller():
579	579	Publisher.sendMessage('Update AUI')
580	580
581	581	if len(proj.mask_dict):
	582	+ self.Slice.current_mask = None
582	583	mask_index = len(proj.mask_dict) -1
583		- for m in proj.mask_dict.values():
	584	+ for key, m in proj.mask_dict.items():
584	585	Publisher.sendMessage('Add mask', mask=m)
585	586	if m.is_shown:
586		- self.Slice.current_mask = proj.mask_dict[mask_index]
587		- Publisher.sendMessage('Show mask', index=m.index, value=True)
588		- Publisher.sendMessage('Change mask selected', index=m.index)
	587	+ self.Slice.current_mask = m
	588	+ visible_mask_idx = key
	589	+ if self.Slice.current_mask is not None:
	590	+ Publisher.sendMessage('Show mask', index=visible_mask_idx, value=True)
	591	+ Publisher.sendMessage('Change mask selected', index=visible_mask_idx)
589	592	else:
590	593	mask_name = const.MASK_NAME_PATTERN % (1,)
591	594
...	...
...	...	@@ -338,7 +338,7 @@ class Project(metaclass=Singleton):
338	338	m = msk.Mask()
339	339	m.spacing = self.spacing
340	340	m.OpenPList(filepath)
341		- self.mask_dict[m.index] = m
	341	+ self.mask_dict[int(index)] = m
342	342
343	343	# Opening the surfaces
344	344	self.surface_dict = {}
...	...