Download as
Browse Code »

Commit a76ce7589977bcb9f00d3c68c1c8dc8b447020d3

Authored by Paulo Henrique Junqueira Amorim
1 parent 0ba60020
Exists in master

FIX: Fixed icons folders and updated version

Showing 5 changed files with 15 additions and 10 deletions   Show diff stats
icons/invesalius_64x64.ico 0 → 100644
View file @a76ce75
No preview for this file type
invesalius/constants.py
  Diff comments   View file @a76ce75
@@ -27,7 +27,7 @@ from invesalius import utils @@ -27,7 +27,7 @@ from invesalius import utils
27 from invesalius import inv_paths 27 from invesalius import inv_paths
28 28
29 #from invesalius.project import Project 29 #from invesalius.project import Project
30 -INVESALIUS_VERSION = "3.1.1" 30 +INVESALIUS_VERSION = "3.1.99994"
31 31
32 INVESALIUS_ACTUAL_FORMAT_VERSION = 1.1 32 INVESALIUS_ACTUAL_FORMAT_VERSION = 1.1
33 33
invesalius/gui/dialogs.py
  Diff comments   View file @a76ce75
@@ -48,7 +48,6 @@ from wx.lib.agw import floatspin @@ -48,7 +48,6 @@ from wx.lib.agw import floatspin
48 from wx.lib.wordwrap import wordwrap 48 from wx.lib.wordwrap import wordwrap
49 from wx.lib.pubsub import pub as Publisher 49 from wx.lib.pubsub import pub as Publisher
50 50
51 -  
52 try: 51 try:
53 from wx.adv import AboutDialogInfo, AboutBox 52 from wx.adv import AboutDialogInfo, AboutBox
54 except ImportError: 53 except ImportError:
@@ -1242,7 +1241,7 @@ def ShowAboutDialog(parent): @@ -1242,7 +1241,7 @@ def ShowAboutDialog(parent):
1242 1241
1243 info = AboutDialogInfo() 1242 info = AboutDialogInfo()
1244 info.Name = "InVesalius" 1243 info.Name = "InVesalius"
1245 - info.Version = "3.1.1" 1244 + info.Version = const.INVESALIUS_VERSION
1246 info.Copyright = _("(c) 2007-2019 Center for Information Technology Renato Archer - CTI") 1245 info.Copyright = _("(c) 2007-2019 Center for Information Technology Renato Archer - CTI")
1247 info.Description = wordwrap(_("InVesalius is a medical imaging program for 3D reconstruction. It uses a sequence of 2D DICOM image files acquired with CT or MRI scanners. InVesalius allows exporting 3D volumes or surfaces as mesh files for creating physical models of a patient's anatomy using additive manufacturing (3D printing) technologies. The software is developed by Center for Information Technology Renato Archer (CTI), National Council for Scientific and Technological Development (CNPq) and the Brazilian Ministry of Health.\n\n InVesalius must be used only for research. The Center for Information Technology Renato Archer is not responsible for damages caused by the use of this software.\n\n Contact: invesalius@cti.gov.br"), 350, wx.ClientDC(parent)) 1246 info.Description = wordwrap(_("InVesalius is a medical imaging program for 3D reconstruction. It uses a sequence of 2D DICOM image files acquired with CT or MRI scanners. InVesalius allows exporting 3D volumes or surfaces as mesh files for creating physical models of a patient's anatomy using additive manufacturing (3D printing) technologies. The software is developed by Center for Information Technology Renato Archer (CTI), National Council for Scientific and Technological Development (CNPq) and the Brazilian Ministry of Health.\n\n InVesalius must be used only for research. The Center for Information Technology Renato Archer is not responsible for damages caused by the use of this software.\n\n Contact: invesalius@cti.gov.br"), 350, wx.ClientDC(parent))
1248 1247
@@ -1251,7 +1250,13 @@ def ShowAboutDialog(parent): @@ -1251,7 +1250,13 @@ def ShowAboutDialog(parent):
1251 # _("The software also allows generating correspondent STL files,")+\ 1250 # _("The software also allows generating correspondent STL files,")+\
1252 # _("so the user can print 3D physical models of the patient's anatomy ")+\ 1251 # _("so the user can print 3D physical models of the patient's anatomy ")+\
1253 # _("using Rapid Prototyping."), 350, wx.ClientDC(parent)) 1252 # _("using Rapid Prototyping."), 350, wx.ClientDC(parent))
1254 - info.WebSite = ("https://www.cti.gov.br/invesalius") 1253 +
  1254 + icon = wx.Icon(os.path.join(inv_paths.ICON_DIR, "invesalius_64x64.ico"),\
  1255 + wx.BITMAP_TYPE_ICO)
  1256 +
  1257 + info.SetWebSite("https://www.cti.gov.br/invesalius")
  1258 + info.SetIcon(icon)
  1259 +
1255 info.License = _("GNU GPL (General Public License) version 2") 1260 info.License = _("GNU GPL (General Public License) version 2")
1256 1261
1257 info.Developers = [u"Paulo Henrique Junqueira Amorim", 1262 info.Developers = [u"Paulo Henrique Junqueira Amorim",
@@ -1999,7 +2004,7 @@ class MaskBooleanDialog(wx.Dialog): @@ -1999,7 +2004,7 @@ class MaskBooleanDialog(wx.Dialog):
1999 else: 2004 else:
2000 self.mask2.SetSelection(0) 2005 self.mask2.SetSelection(0)
2001 2006
2002 - icon_folder = const.ICON_DIR 2007 + icon_folder = inv_paths.ICON_DIR
2003 op_choices = ((_(u"Union"), const.BOOLEAN_UNION, 'bool_union.png'), 2008 op_choices = ((_(u"Union"), const.BOOLEAN_UNION, 'bool_union.png'),
2004 (_(u"Difference"), const.BOOLEAN_DIFF, 'bool_difference.png'), 2009 (_(u"Difference"), const.BOOLEAN_DIFF, 'bool_difference.png'),
2005 (_(u"Intersection"), const.BOOLEAN_AND, 'bool_intersection.png'), 2010 (_(u"Intersection"), const.BOOLEAN_AND, 'bool_intersection.png'),
@@ -3911,4 +3916,4 @@ class SetCOMport(wx.Dialog): @@ -3911,4 +3916,4 @@ class SetCOMport(wx.Dialog):
3911 self.CenterOnParent() 3916 self.CenterOnParent()
3912 3917
3913 def GetValue(self): 3918 def GetValue(self):
3914 - return self.com_ports.GetString(self.com_ports.GetSelection())  
3915 \ No newline at end of file 3919 \ No newline at end of file
  3920 + return self.com_ports.GetString(self.com_ports.GetSelection())
invesalius/gui/frame.py
  Diff comments   View file @a76ce75
@@ -1234,7 +1234,7 @@ class TaskBarIcon(wx_TaskBarIcon): @@ -1234,7 +1234,7 @@ class TaskBarIcon(wx_TaskBarIcon):
1234 wx_TaskBarIcon.__init__(self) 1234 wx_TaskBarIcon.__init__(self)
1235 self.frame = parent 1235 self.frame = parent
1236 1236
1237 - icon = wx.Icon(os.path.join(const.ICON_DIR, "invesalius.ico"), 1237 + icon = wx.Icon(os.path.join(inv_paths.ICON_DIR, "invesalius.ico"),
1238 wx.BITMAP_TYPE_ICO) 1238 wx.BITMAP_TYPE_ICO)
1239 self.SetIcon(icon, "InVesalius") 1239 self.SetIcon(icon, "InVesalius")
1240 self.imgidx = 1 1240 self.imgidx = 1
invesalius/gui/task_tools.py
  Diff comments   View file @a76ce75
@@ -78,9 +78,9 @@ class InnerTaskPanel(wx.Panel): @@ -78,9 +78,9 @@ class InnerTaskPanel(wx.Panel):
78 txt_annotation.Bind(hl.EVT_HYPERLINK_LEFT, self.OnTextAnnotation) 78 txt_annotation.Bind(hl.EVT_HYPERLINK_LEFT, self.OnTextAnnotation)
79 79
80 # Image(s) for buttons 80 # Image(s) for buttons
81 - BMP_ANNOTATE = wx.Bitmap(os.path.join(const.ICON_DIR, "annotation.png"), wx.BITMAP_TYPE_PNG)  
82 - BMP_ANGLE = wx.Bitmap(os.path.join(const.ICON_DIR, "measure_angle.jpg"), wx.BITMAP_TYPE_JPEG)  
83 - BMP_DISTANCE = wx.Bitmap(os.path.join(const.ICON_DIR, "measure_line.png"), wx.BITMAP_TYPE_PNG) 81 + BMP_ANNOTATE = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "annotation.png"), wx.BITMAP_TYPE_PNG)
  82 + BMP_ANGLE = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "measure_angle.jpg"), wx.BITMAP_TYPE_JPEG)
  83 + BMP_DISTANCE = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "measure_line.png"), wx.BITMAP_TYPE_PNG)
84 BMP_ANNOTATE.SetWidth(25) 84 BMP_ANNOTATE.SetWidth(25)
85 BMP_ANNOTATE.SetHeight(25) 85 BMP_ANNOTATE.SetHeight(25)
86 BMP_ANGLE.SetWidth(25) 86 BMP_ANGLE.SetWidth(25)