ADD: Project status, OPEN_PROJECT, NEW_PROJECT and SAVE_PROJECT

Paulo Henrique Junqueira Amorim
1 parent a9f22507
Showing 4 changed files with 14 additions and 6 deletions Show diff stats
invesalius/control.py
invesalius/data/slice_.py
invesalius/project.py
invesalius/reader/dicom_reader.py
@@ -33,6 +33,7 @@ import reader.dicom_grouper as dg
 import gui.dialogs as dialog
 import reader.dicom_reader as dcm
 import reader.analyze_reader as analyze
+import session
 DEFAULT_THRESH_MODE = 0
@@ -45,7 +46,8 @@ class Controller():
         self.frame = frame
         self.progress_dialog = None
         self.cancel_import = False
-
+        #Init session
+        session.Session()
     def __bind_events(self):
         ps.Publisher().subscribe(self.OnImportMedicalImages, 'Import directory')
@@ -271,11 +273,11 @@ class Controller():
             prj.Project().name = filename
         prj.Project().path = filename
         prj.Project().SavePlistProject(dir_, filename)
+        session.Session().project_status = const.SAVE_PROJECT
     def OnOpenProject(self, pubsub_evt):
         filename = os.path.abspath(pubsub_evt.data)
-        
-        
+        session.Session().project_status = const.OPEN_PROJECT
         proj = prj.Project()
         proj.OpenPlistProject(filename)
         proj.SetAcquisitionModality(proj.modality)
@@ -285,5 +287,4 @@ class Controller():
         const.THRESHOLD_INVALUE = proj.threshold_range[1]
         const.WINDOW_LEVEL['Default'] = (proj.window, proj.level)
         const.WINDOW_LEVEL['Manual'] = (proj.window, proj.level)
-
-        self.LoadProject()
+        self.LoadProject()
 \ No newline at end of file
@@ -25,6 +25,7 @@ import constants as const
 import imagedata_utils as iu
 from mask import Mask
 from project import Project
+import session
 from utils import Singleton
@@ -115,7 +116,10 @@ class Slice(object):
     def __set_current_mask_threshold(self, evt_pubsub):
         #FIXME: find a better way to implement this
-        if (self.num_gradient >= 2):
+        print session.Session().project_status
+        if (self.num_gradient >= 2) or \
+        (session.Session().project_status != const.OPEN_PROJECT):
+            print "ENTROU........................................................"
             threshold_range = evt_pubsub.data
             index = self.current_mask.index
             self.SetMaskThreshold(index, threshold_range)
@@ -110,6 +110,7 @@ class Project(object):
         print self.invesalius_version
         self.save_as = True
+     
         self.path = ""
         self.debug = 0
@@ -32,6 +32,7 @@ import constants as const
 import dicom
 import dicom_grouper
 import data.imagedata_utils as iu
+import session
 def ReadDicomGroup(dir_):
@@ -40,6 +41,7 @@ def ReadDicomGroup(dir_):
         filelist, dicom, zspacing = SelectLargerDicomGroup(patient_group)
         filelist = SortFiles(filelist, dicom)
         imagedata = CreateImageData(filelist, zspacing)
+        session.Session().project_status = const.NEW_PROJECT
         return imagedata, dicom
     else:
         return False
	@@ -110,6 +110,7 @@ class Project(object):		@@ -110,6 +110,7 @@ class Project(object):
110	print self.invesalius_version	110	print self.invesalius_version
111		111
112	self.save_as = True	112	self.save_as = True
		113	+
113	self.path = ""	114	self.path = ""
114	self.debug = 0	115	self.debug = 0
115		116