Commit 41f9026de4dc5242fda9f6673d3b5e51d00fbe1e
1 parent
046f859e
Exists in
master
FIX: Fixed problem open Project/Analyze and close project.
Showing
1 changed file
with
17 additions
and
1 deletions
Show diff stats
invesalius/control.py
| @@ -53,6 +53,13 @@ class Controller(): | @@ -53,6 +53,13 @@ class Controller(): | ||
| 53 | self.frame = frame | 53 | self.frame = frame |
| 54 | self.progress_dialog = None | 54 | self.progress_dialog = None |
| 55 | self.cancel_import = False | 55 | self.cancel_import = False |
| 56 | + | ||
| 57 | + #type of imported image | ||
| 58 | + #None, others and opened Project = 0 | ||
| 59 | + #DICOM = 1 | ||
| 60 | + #TIFF uCT = 2 | ||
| 61 | + self.img_type = 0 | ||
| 62 | + | ||
| 56 | #Init session | 63 | #Init session |
| 57 | session = ses.Session() | 64 | session = ses.Session() |
| 58 | self.measure_manager = measures.MeasurementManager() | 65 | self.measure_manager = measures.MeasurementManager() |
| @@ -357,7 +364,14 @@ class Controller(): | @@ -357,7 +364,14 @@ class Controller(): | ||
| 357 | Publisher.sendMessage('Set slice interaction style', const.STATE_DEFAULT) | 364 | Publisher.sendMessage('Set slice interaction style', const.STATE_DEFAULT) |
| 358 | Publisher.sendMessage('Hide content panel') | 365 | Publisher.sendMessage('Hide content panel') |
| 359 | Publisher.sendMessage('Close project data') | 366 | Publisher.sendMessage('Close project data') |
| 360 | - Publisher.sendMessage('Show import panel in frame') | 367 | + |
| 368 | + if self.img_type == 1: | ||
| 369 | + Publisher.sendMessage('Show import panel in frame') | ||
| 370 | + | ||
| 371 | + if self.img_type == 2: | ||
| 372 | + Publisher.sendMessage('Show import bitmap panel in frame') | ||
| 373 | + | ||
| 374 | + | ||
| 361 | session = ses.Session() | 375 | session = ses.Session() |
| 362 | session.CloseProject() | 376 | session.CloseProject() |
| 363 | 377 | ||
| @@ -401,12 +415,14 @@ class Controller(): | @@ -401,12 +415,14 @@ class Controller(): | ||
| 401 | if ok: | 415 | if ok: |
| 402 | Publisher.sendMessage('Show import panel') | 416 | Publisher.sendMessage('Show import panel') |
| 403 | Publisher.sendMessage("Show import panel in frame") | 417 | Publisher.sendMessage("Show import panel in frame") |
| 418 | + self.img_type = 1 | ||
| 404 | 419 | ||
| 405 | def OnLoadImportBitmapPanel(self, evt): | 420 | def OnLoadImportBitmapPanel(self, evt): |
| 406 | data = evt.data | 421 | data = evt.data |
| 407 | ok = self.LoadImportBitmapPanel(data) | 422 | ok = self.LoadImportBitmapPanel(data) |
| 408 | if ok: | 423 | if ok: |
| 409 | Publisher.sendMessage('Show import bitmap panel in frame') | 424 | Publisher.sendMessage('Show import bitmap panel in frame') |
| 425 | + self.img_type = 2 | ||
| 410 | #Publisher.sendMessage("Show import panel in invesalius.gui.frame") as frame | 426 | #Publisher.sendMessage("Show import panel in invesalius.gui.frame") as frame |
| 411 | 427 | ||
| 412 | def LoadImportBitmapPanel(self, data): | 428 | def LoadImportBitmapPanel(self, data): |