From 3cb3041531927609a7ed7a8397f7633bda00f64f Mon Sep 17 00:00:00 2001 From: Jeff VanOss Date: Fri, 26 Aug 2022 15:53:12 -0400 Subject: [PATCH] Change 'Modality' to 'Modalities' in study table Change 'Modality' to 'Modalities' in study table (DICOM tag name is `Modalities in Study`). --- DICOMwebBrowser/DICOMwebBrowser.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/DICOMwebBrowser/DICOMwebBrowser.py b/DICOMwebBrowser/DICOMwebBrowser.py index f9013a2..aa08ddd 100644 --- a/DICOMwebBrowser/DICOMwebBrowser.py +++ b/DICOMwebBrowser/DICOMwebBrowser.py @@ -197,7 +197,7 @@ def setup(self): self.studiesTableWidget = qt.QTableWidget() self.studiesTableWidget.setCornerButtonEnabled(True) self.studiesModel = qt.QStandardItemModel() - self.studiesTableHeaderLabels = ['Study instance UID', 'Patient name', 'Patient ID', 'Modality', 'Study date', 'Study description'] + self.studiesTableHeaderLabels = ['Study instance UID', 'Patient name', 'Patient ID', 'Modalities', 'Study date', 'Study description'] self.studiesTableWidget.setColumnCount(len(self.studiesTableHeaderLabels)) self.studiesTableWidget.sortingEnabled = True self.studiesTableWidget.hideColumn(0) @@ -919,13 +919,13 @@ def populateStudiesTableWidget(self, studies): rowIndex = self.studiesTableRowCount table.setRowCount(rowIndex + len(studies)) - + for study in studies: widget, value = self.setTableCellTextFromDICOM(table, self.studiesTableHeaderLabels, study, rowIndex, 'Study instance UID', '0020000D') self.studyInstanceUIDWidgets.append(widget) self.setTableCellTextFromDICOM(table, tableColumns, study, rowIndex, 'Patient name', '00100010') self.setTableCellTextFromDICOM(table, tableColumns, study, rowIndex, 'Patient ID', '00100020') - self.setTableCellTextFromDICOM(table, tableColumns, study, rowIndex, 'Modality', '00080061') + self.setTableCellTextFromDICOM(table, tableColumns, study, rowIndex, 'Modalities', '00080061') # Modalities in Study self.setTableCellTextFromDICOM(table, tableColumns, study, rowIndex, 'Study date', '00080020') self.setTableCellTextFromDICOM(table, tableColumns, study, rowIndex, 'Study description', '00081030') rowIndex += 1 @@ -947,8 +947,8 @@ def populateSeriesTableWidget(self, studyUID, series): rowIndex = self.seriesTableRowCount table.setRowCount(rowIndex + len(series)) - - import dicomweb_client + + import dicomweb_client for serieJson in series: serie = pydicom.dataset.Dataset.from_json(serieJson) if hasattr(serie, 'SeriesInstanceUID'): @@ -1091,8 +1091,8 @@ def onCancel(self): class GoogleCloudPlatform(object): def gcloud(self, subcommand): - - import shutil + + import shutil args = [shutil.which('gcloud')] if (None in args): logging.error(f"Unable to locate gcloud, please install the Google Cloud SDK")