Download as
Browse Code »

Commit 360d4cba4c58a78193a9e0196a3366ba207c0e46

Authored by tatiana
1 parent e6f597e7
Exists in master and in 68 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, invesalius-libift, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

ADD: Open inv3 projects using command line (no tag is needed)

Showing 1 changed file with 24 additions and 7 deletions   Show diff stats
invesalius/invesalius.py
  Diff comments   View file @360d4cb
  1 +#!/usr/local/bin/python
1 #-------------------------------------------------------------------------- 2 #--------------------------------------------------------------------------
2 # Software: InVesalius - Software de Reconstrucao 3D de Imagens Medicas 3 # Software: InVesalius - Software de Reconstrucao 3D de Imagens Medicas
3 # Copyright: (C) 2001 Centro de Pesquisas Renato Archer 4 # Copyright: (C) 2001 Centro de Pesquisas Renato Archer
@@ -38,6 +39,7 @@ import wx.lib.pubsub as ps @@ -38,6 +39,7 @@ import wx.lib.pubsub as ps
38 from gui.frame import Frame 39 from gui.frame import Frame
39 from control import Controller 40 from control import Controller
40 from project import Project 41 from project import Project
  42 +from session import Session
41 43
42 class InVesalius(wx.App): 44 class InVesalius(wx.App):
43 def OnInit(self): 45 def OnInit(self):
@@ -59,8 +61,11 @@ def parse_comand_line(): @@ -59,8 +61,11 @@ def parse_comand_line():
59 # Add comand line option debug(-d or --debug) to print all pubsub message is 61 # Add comand line option debug(-d or --debug) to print all pubsub message is
60 # being sent 62 # being sent
61 parser.add_option("-d", "--debug", action="store_true", dest="debug") 63 parser.add_option("-d", "--debug", action="store_true", dest="debug")
62 - parser.add_option("-i", "--import", action="store", dest="directory") 64 + parser.add_option("-i", "--import", action="store", dest="dicom_dir")
  65 +
63 options, args = parser.parse_args() 66 options, args = parser.parse_args()
  67 + print "ARRRRRGHs", args
  68 +
64 69
65 if options.debug: 70 if options.debug:
66 # The user passed the debug option? 71 # The user passed the debug option?
@@ -68,15 +73,27 @@ def parse_comand_line(): @@ -68,15 +73,27 @@ def parse_comand_line():
68 # Then all pubsub message must be printed. 73 # Then all pubsub message must be printed.
69 ps.Publisher().subscribe(print_events, ps.ALL_TOPICS) 74 ps.Publisher().subscribe(print_events, ps.ALL_TOPICS)
70 75
71 - proj = Project()  
72 - proj.debug = 1 76 + session = Session()
  77 + session.debug = 1
73 78
74 - if options.directory: 79 + elif options.dicom_dir:
75 # The user passed directory to me? 80 # The user passed directory to me?
76 - import_dir = options.directory 81 + import_dir = options.dicom_dir
77 ps.Publisher().sendMessage('Import directory', import_dir) 82 ps.Publisher().sendMessage('Import directory', import_dir)
78 - else:  
79 - print "Hey, guy you must pass a directory to me!" 83 + #print "Hey, guy you must pass a directory to me!"
  84 + #else:
  85 + # print "Hey, guy, you need to pass a inv3 file to me!"
  86 +
  87 + # Check if there is a file path somewhere in what the user wrote
  88 + i = len(args)
  89 + while i:
  90 + i -= 1
  91 + file = args[i]
  92 + if os.path.isfile(file):
  93 + path = os.path.abspath(file)
  94 + ps.Publisher().sendMessage('Open project', path)
  95 + i = 0
  96 +
80 97
81 def print_events(data): 98 def print_events(data):
82 print data.topic 99 print data.topic