From a76ce7589977bcb9f00d3c68c1c8dc8b447020d3 Mon Sep 17 00:00:00 2001 From: Paulo Henrique Junqueira Amorim Date: Fri, 7 Jun 2019 14:21:54 -0300 Subject: [PATCH] FIX: Fixed icons folders and updated version --- icons/invesalius_64x64.ico | Bin 0 -> 12862 bytes invesalius/constants.py | 2 +- invesalius/gui/dialogs.py | 15 ++++++++++----- invesalius/gui/frame.py | 2 +- invesalius/gui/task_tools.py | 6 +++--- 5 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 icons/invesalius_64x64.ico diff --git a/icons/invesalius_64x64.ico b/icons/invesalius_64x64.ico new file mode 100644 index 0000000..944fff9 Binary files /dev/null and b/icons/invesalius_64x64.ico differ diff --git a/invesalius/constants.py b/invesalius/constants.py index 7a793db..6a2be89 100644 --- a/invesalius/constants.py +++ b/invesalius/constants.py @@ -27,7 +27,7 @@ from invesalius import utils from invesalius import inv_paths #from invesalius.project import Project -INVESALIUS_VERSION = "3.1.1" +INVESALIUS_VERSION = "3.1.99994" INVESALIUS_ACTUAL_FORMAT_VERSION = 1.1 diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py index 53bec7d..8b8b892 100644 --- a/invesalius/gui/dialogs.py +++ b/invesalius/gui/dialogs.py @@ -48,7 +48,6 @@ from wx.lib.agw import floatspin from wx.lib.wordwrap import wordwrap from wx.lib.pubsub import pub as Publisher - try: from wx.adv import AboutDialogInfo, AboutBox except ImportError: @@ -1242,7 +1241,7 @@ def ShowAboutDialog(parent): info = AboutDialogInfo() info.Name = "InVesalius" - info.Version = "3.1.1" + info.Version = const.INVESALIUS_VERSION info.Copyright = _("(c) 2007-2019 Center for Information Technology Renato Archer - CTI") 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)) @@ -1251,7 +1250,13 @@ def ShowAboutDialog(parent): # _("The software also allows generating correspondent STL files,")+\ # _("so the user can print 3D physical models of the patient's anatomy ")+\ # _("using Rapid Prototyping."), 350, wx.ClientDC(parent)) - info.WebSite = ("https://www.cti.gov.br/invesalius") + + icon = wx.Icon(os.path.join(inv_paths.ICON_DIR, "invesalius_64x64.ico"),\ + wx.BITMAP_TYPE_ICO) + + info.SetWebSite("https://www.cti.gov.br/invesalius") + info.SetIcon(icon) + info.License = _("GNU GPL (General Public License) version 2") info.Developers = [u"Paulo Henrique Junqueira Amorim", @@ -1999,7 +2004,7 @@ class MaskBooleanDialog(wx.Dialog): else: self.mask2.SetSelection(0) - icon_folder = const.ICON_DIR + icon_folder = inv_paths.ICON_DIR op_choices = ((_(u"Union"), const.BOOLEAN_UNION, 'bool_union.png'), (_(u"Difference"), const.BOOLEAN_DIFF, 'bool_difference.png'), (_(u"Intersection"), const.BOOLEAN_AND, 'bool_intersection.png'), @@ -3911,4 +3916,4 @@ class SetCOMport(wx.Dialog): self.CenterOnParent() def GetValue(self): - return self.com_ports.GetString(self.com_ports.GetSelection()) \ No newline at end of file + return self.com_ports.GetString(self.com_ports.GetSelection()) diff --git a/invesalius/gui/frame.py b/invesalius/gui/frame.py index 87f194c..b34e286 100644 --- a/invesalius/gui/frame.py +++ b/invesalius/gui/frame.py @@ -1234,7 +1234,7 @@ class TaskBarIcon(wx_TaskBarIcon): wx_TaskBarIcon.__init__(self) self.frame = parent - icon = wx.Icon(os.path.join(const.ICON_DIR, "invesalius.ico"), + icon = wx.Icon(os.path.join(inv_paths.ICON_DIR, "invesalius.ico"), wx.BITMAP_TYPE_ICO) self.SetIcon(icon, "InVesalius") self.imgidx = 1 diff --git a/invesalius/gui/task_tools.py b/invesalius/gui/task_tools.py index b39e8af..30dc9d1 100644 --- a/invesalius/gui/task_tools.py +++ b/invesalius/gui/task_tools.py @@ -78,9 +78,9 @@ class InnerTaskPanel(wx.Panel): txt_annotation.Bind(hl.EVT_HYPERLINK_LEFT, self.OnTextAnnotation) # Image(s) for buttons - BMP_ANNOTATE = wx.Bitmap(os.path.join(const.ICON_DIR, "annotation.png"), wx.BITMAP_TYPE_PNG) - BMP_ANGLE = wx.Bitmap(os.path.join(const.ICON_DIR, "measure_angle.jpg"), wx.BITMAP_TYPE_JPEG) - BMP_DISTANCE = wx.Bitmap(os.path.join(const.ICON_DIR, "measure_line.png"), wx.BITMAP_TYPE_PNG) + BMP_ANNOTATE = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "annotation.png"), wx.BITMAP_TYPE_PNG) + BMP_ANGLE = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "measure_angle.jpg"), wx.BITMAP_TYPE_JPEG) + BMP_DISTANCE = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "measure_line.png"), wx.BITMAP_TYPE_PNG) BMP_ANNOTATE.SetWidth(25) BMP_ANNOTATE.SetHeight(25) BMP_ANGLE.SetWidth(25) -- libgit2 0.21.2