From 1783be82f4ea7f50260467045a0b8fe9defef0ed Mon Sep 17 00:00:00 2001 From: Victor Hugo Souza Date: Wed, 19 May 2021 09:33:33 +0300 Subject: [PATCH] FIX: Print format incompatible with python 3.7 --- invesalius/control.py | 4 ++-- invesalius/data/imagedata_utils.py | 2 +- invesalius/gui/data_notebook.py | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/invesalius/control.py b/invesalius/control.py index a4ff8ba..f912588 100644 --- a/invesalius/control.py +++ b/invesalius/control.py @@ -881,7 +881,7 @@ class Controller(): def OnOpenDicomGroup(self, group, interval, file_range): dicom = group.GetDicomSample() samples_per_pixel = dicom.image.samples_per_pixel - print(f"\n\n\n\n{samples_per_pixel =}\n\n\n") + print("\n\n\n\n{}\n\n\n".format(samples_per_pixel)) if samples_per_pixel == 3: dlg = wx.MessageDialog(wx.GetApp().GetTopWindow(), _("this is a rgb image, it's necessary to convert to grayscale to open on invesalius.\ndo you want to convert it to grayscale?"), _("Confirm"), wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION) if dlg.ShowModal() != wx.ID_YES: @@ -926,7 +926,7 @@ class Controller(): xyspacing = dicom.image.spacing orientation = dicom.image.orientation_label samples_per_pixel = dicom.image.samples_per_pixel - print(f"\n\n\n\n{samples_per_pixel =}\n\n\n") + print("\n\n\n\n{}\n\n\n".format(samples_per_pixel)) wl = float(dicom.image.level) diff --git a/invesalius/data/imagedata_utils.py b/invesalius/data/imagedata_utils.py index 1aaa88d..6f9e19d 100644 --- a/invesalius/data/imagedata_utils.py +++ b/invesalius/data/imagedata_utils.py @@ -488,7 +488,7 @@ def dcmmf2memmap(dcm_file, orientation): np_image = converters.gdcm_to_numpy(image, pf.GetSamplesPerPixel() == 1) if samples_per_pixel == 3: np_image = image_normalize(rgb2gray(np_image), 0, 255) - print(f"\n\n\n{np_image.min() =} - {np_image.max() =}\n\n\n") + print("\n\n\nnp_image.min = {} - np_image.max = {}\n\n\n".format(np_image.min(), np_image.max())) temp_file = tempfile.mktemp() matrix = numpy.memmap(temp_file, mode="w+", dtype="int16", shape=np_image.shape) z, y, x = np_image.shape diff --git a/invesalius/gui/data_notebook.py b/invesalius/gui/data_notebook.py index 817faf1..e34ee00 100644 --- a/invesalius/gui/data_notebook.py +++ b/invesalius/gui/data_notebook.py @@ -473,10 +473,10 @@ class MasksListCtrlPanel(InvListCtrl): """ selected_items = self.GetSelected() - print(f"{self.mask_list_index =}") + print("mask_list_index = {}".format(self.mask_list_index)) mask_dict = project.Project().mask_dict for i in mask_dict: - print(f"{i} - {mask_dict[i].index}") + print("{} - {}".format(i, mask_dict[i].index)) if selected_items: Publisher.sendMessage('Remove masks', mask_indexes=selected_items) @@ -488,7 +488,7 @@ class MasksListCtrlPanel(InvListCtrl): self.imagelist.RemoveAll() self.__init_image_list() - print(f"{self.mask_list_index =}") + print("mask_list_index = {}".format(self.mask_list_index)) new_dict = {} self.current_index = 0 self.mask_list_index = {} @@ -502,8 +502,8 @@ class MasksListCtrlPanel(InvListCtrl): for i in mask_dict: - print(f"{i} - {mask_dict[i].index}") - print(f"{self.mask_list_index =}") + print("{} - {}".format(i, mask_dict[i].index)) + print("mask_list_index = {}".format(self.mask_list_index)) self.SetItemImage(self.current_index, 1) Publisher.sendMessage('Change mask selected', index=self.current_index) @@ -515,7 +515,7 @@ class MasksListCtrlPanel(InvListCtrl): self.mask_list_index = {} def OnChangeCurrentMask(self, index): - print(f"{index=}") + print("index = {}".format(index)) try: self.SetItemImage(index, 1) self.current_index = index @@ -586,7 +586,7 @@ class MasksListCtrlPanel(InvListCtrl): def InsertNewItem(self, index=0, label=_("Mask"), threshold="(1000, 4500)", colour=None): image = self.CreateColourBitmap(colour) image_index = self.imagelist.Add(image) - print(f"{image_index =}") + print("image_index = {}".format(image_index)) self.InsertItem(index, "") self.SetItemImage(index, 0) self.SetItem(index, 1, label, imageId=image_index) @@ -599,7 +599,7 @@ class MasksListCtrlPanel(InvListCtrl): def AddMask(self, mask): image_index = len(self.mask_list_index) - # print(f"{image_index =}") + # print("image_index = {}".format(image_index)) self.mask_list_index[image_index] = mask.index self.InsertNewItem(image_index, mask.name, str(mask.threshold_range), mask.colour) @@ -607,7 +607,7 @@ class MasksListCtrlPanel(InvListCtrl): self.SetItem(index, 2, str(threshold_range)) def EditMaskColour(self, index, colour): - print(f"EDITMASKCOLOUR {index=}") + print("EDITMASKCOLOUR {}".format(index)) image = self.CreateColourBitmap(colour) # image_index = self.mask_list_index[index] self.imagelist.Replace(index + 2, image) -- libgit2 0.21.2