From 9762452f6f56ebe6080d8ab0e20cebf2343369e8 Mon Sep 17 00:00:00 2001 From: Julien Lamy Date: Mon, 28 Mar 2016 11:31:08 +0200 Subject: [PATCH 1/3] Include js files in OS X bundle --- src/js/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/js/CMakeLists.txt b/src/js/CMakeLists.txt index 9aecb757..851605f8 100644 --- a/src/js/CMakeLists.txt +++ b/src/js/CMakeLists.txt @@ -2,9 +2,13 @@ file(GLOB_RECURSE scriptjs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.js") add_custom_target( Javascript ${CMAKE_COMMAND} -E echo "Javascript files" SOURCES ${scriptjs}) -foreach(HEADER ${scriptjs}) - string(REGEX MATCH "(.*)[/\\]" DIR ${HEADER}) - install(FILES ${HEADER} +foreach(script ${scriptjs}) + string(REGEX MATCH "(.*)[/\\]" DIR ${script}) + install(FILES ${script} DESTINATION share/dicomifier/${DIR} COMPONENT headers) + if(APPLE) + install(FILES ${script} + DESTINATION dicomifier.app/Contents/Resources/js/${DIR}) + endif() endforeach() From 39c5ccd0cddccb9197758ba6cb33c54702583b99 Mon Sep 17 00:00:00 2001 From: Julien Lamy Date: Mon, 28 Mar 2016 15:27:10 +0200 Subject: [PATCH 2/3] Simplify layout --- src/gui/GenerationFrame.ui | 418 ++++++++------------------ src/gui/ProtocolsFrame.ui | 129 ++++---- src/gui/ResultsFrame.ui | 6 - src/gui/SubjectsFrame.ui | 388 +++++++++--------------- src/gui/mainframe.ui | 598 +------------------------------------ 5 files changed, 328 insertions(+), 1211 deletions(-) diff --git a/src/gui/GenerationFrame.ui b/src/gui/GenerationFrame.ui index ae5555c4..ee091311 100644 --- a/src/gui/GenerationFrame.ui +++ b/src/gui/GenerationFrame.ui @@ -25,319 +25,157 @@ - - QCheckBox -{ - margin-top: 5px; - margin-left: 5px; -} - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - + + + + + DICOM Format - - QWidget#widget_2 -{ - border-radius: 8px; - border: 1px solid #2299FF; - margin: 5px; -} -QWidget#widget_3 -{ - border-radius: 8px; - border: 1px solid #2299FF; - margin: 5px; -} -QWidget#widget_4 -{ - border-radius: 8px; - border: 1px solid #2299FF; - margin: 5px; -} -QWidget#widget_5 -{ - border-radius: 8px; - border: 1px solid #2299FF; - margin: 5px; -} + + + + + + + Media storage: + + + + + + + MRI Multiple Files + + + true + + + + + + + MRI Single File + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Save to disk - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - + - - - - - - MRI Multiple Files - - - true - - - - - - - MRI Single File - - - - - - - Qt::Vertical - - - - 20 - 5 - - - - - - formatMRIMultiple - formatMRISingle - verticalSpacer + + + Save + + + true + - - - - - - - Create DICOMDIR - - - - - - - Create ZIP Archive - - - - - - - Qt::Vertical - - - - 20 - 5 - - - - - + + + + Output Directory: + - - - - - - - Output Directory: - - - - - - - - 200 - 88 - - - - - 200 - 16777215 - - - - Browse - - - - - - - - 0 - 35 - - - - - - - - Qt::Vertical - - - - 20 - 5 - - - - - - - - Save - - - true - - - - + + + + + + + Browse + + + + + + + Create DICOMDIR + - - - - - - - - 160 - 0 - - - - PACS: - - - - - - - - 0 - 0 - - - - - 0 - 35 - - - - - - - - - 200 - 88 - - - - - 200 - 16777215 - - - - New - - - - - - - Qt::Vertical - - - - 20 - 5 - - - - - - - - Store - - - - + + + + Create ZIP Archive + + saveCheckBox + + outputDirectoryTitle + ZIPCheckBox + outputDirBrowseButton + DicomdirCheckBox + saveCheckBox + outputDirectory - - - - - 0 - 0 - - - - - - - DICOM Format: + + + + Store on network + + + + + Store + + + + + + + PACS: + + + + + + + + + + New + + + + - - + + Qt::Vertical 20 - 40 + 296 diff --git a/src/gui/ProtocolsFrame.ui b/src/gui/ProtocolsFrame.ui index a9ffdd1e..f9cf334e 100644 --- a/src/gui/ProtocolsFrame.ui +++ b/src/gui/ProtocolsFrame.ui @@ -25,100 +25,73 @@ Form - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Protocol Name - - - - - - - Sorted by: - - - - - - - Name (Series/Reconstruction) - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + + - + 0 0 - - + + Select Protocols to process: - - + + + + + + Sorted by: + + + + + + + Name (Series/Reconstruction) + + + true + + + + + + + Protocol Name + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + - + 0 0 - - - - - Select Protocols to process: - - + - - QCheckBox -{ - margin-left: 25px; - } - - Select All diff --git a/src/gui/ResultsFrame.ui b/src/gui/ResultsFrame.ui index 9337f3a1..8811174a 100644 --- a/src/gui/ResultsFrame.ui +++ b/src/gui/ResultsFrame.ui @@ -25,9 +25,6 @@ - - - 0 @@ -52,9 +49,6 @@ 0 - - - Results: diff --git a/src/gui/SubjectsFrame.ui b/src/gui/SubjectsFrame.ui index 8ffe3153..d5936668 100644 --- a/src/gui/SubjectsFrame.ui +++ b/src/gui/SubjectsFrame.ui @@ -22,148 +22,154 @@ Form - - QLineEdit#dataDirectory -{ - margin-left: 5px; - margin-right: 0px; - margin-bottom: 25px; - margin-top: 0px; -} - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 200 - 88 - - - - - 200 - 16777215 - - - - QPushButton#browserButton -{ - margin-right: 10px; -} - - - Browse - - - - - - - - 0 - 0 - - - - Studies - - - - - - - Data Directory: - - - true - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Filters: - - - - - - - Sorted by: - - - - - - - - 0 - 35 - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + + + + + + Data Directory: + + + + + + + + + + Browse + + + + + + + Refresh + + + + + + + + + + + + + + + Sorted by: + + + + + + + + 0 + 0 + + + + Subjects + + + true + + + + + + + + 0 + 0 + + + + Studies + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Filters: + + + + + + + + + + + + + + + + From: + + + + + + + true + + + + + + + To: + + + + + + + true + + + + + + + + + - + 0 0 - - Subjects - - - true - - + - - QCheckBox -{ - margin-left: 25px; - } - - Select All @@ -172,120 +178,6 @@ - - - - From: - - - - - - - - 0 - 0 - - - - - 0 - 64 - - - - - 16777215 - 120 - - - - - - - - - 0 - 0 - - - - - 32 - 32 - - - - - 68 - 88 - - - - QPushButton#refreshButton -{ - background-color: transparent; - image: url(:/images/button_refresh) 0 0 0 0 stretch stretch; - border: 1px solid #2299FF; - border-radius: 10px; - margin-top: 30px; - margin-bottom: 10px; - margin-left: 10px; - margin-right: 10px; -} - - - - - - - - - - To: - - - - - - - - 0 - 0 - - - - - - browserButton - - - - - - - 0 - 35 - - - - true - - - - - - - - 0 - 35 - - - - true - - - diff --git a/src/gui/mainframe.ui b/src/gui/mainframe.ui index 3e4aa566..2bde18dd 100644 --- a/src/gui/mainframe.ui +++ b/src/gui/mainframe.ui @@ -22,116 +22,7 @@ Dicomifier Interface - - QWidget -{ - background-color: #F4F4F4; -} - -QWidget #menuBar -{ - border: none; -} - -QMenuBar -{ - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #EEEEEE, stop:1 #BBBBBB); -} - -QMenuBar::item -{ - spacing: 3px; /* spacing between menu bar items */ - padding: 1px 4px; - background: transparent; - border-radius: 4px; -} - -QMenuBar::item:selected -{ - border-color: lightblue; - background: rgba(200, 200, 200, 255); -} - -QMenuBar::item:pressed -{ - background: rgba(200, 200, 200, 200); -} - -QMenu -{ - background-color: white; - margin: 2px; /* some spacing around the menu */ -} - -QMenu::item -{ - padding: 2px 25px 2px 20px; - border: 1px solid transparent; -} - -QMenu::item:selected -{ - border-color: lightblue; - background: rgba(200, 200, 200, 150); -} - -QMenu::icon:checked -{ - background: #CCCCCC; - border: 1px inset lightblue; - position: absolute; - top: 1px; - right: 1px; - bottom: 1px; - left: 1px; -} - -QMenu::separator -{ - height: 2px; - background: #BBBBBB; - margin-left: 5spx; - margin-right: 5px; -} - -QMenu::indicator -{ - width: 13px; - height: 13px; -} - - - - QPushButton -{ - background-color: #2266FF; - border: 1px solid grey; - border-radius: 10px; - margin: 20px; - font-size: 20px; - font-weight: bold; - color: black; -} - -QPushButton:disabled -{ - background-color: #BBBBBB; - color: #888888; -} - -QPushButton:pressed -{ - background-color: #22BBFF; -} - -QPushButton:checked -{ - border: 1px solid grey; - border-radius: 10px; -} - 0 @@ -165,20 +56,7 @@ QPushButton:checked 88 - - QWidget -{ - border: none; - font-weight: bold; -} - -QLabel -{ - background: transparent; - font-size: 14px; -} - - + 0 @@ -194,7 +72,7 @@ QLabel 0 - + Step 1 / 5 @@ -207,76 +85,26 @@ QLabel - - + + false - - - 200 - 88 - - - - - 200 - 88 - - - Next + Previous - - + + false - - - 200 - 88 - - - - - 200 - 88 - - - Previous + Next - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -288,414 +116,6 @@ QLabel 0 - - QTreeView -{ - show-decoration-selected: 1; - margin: 5px; - border-radius: 10px; - border: 1px solid #2299FF; -} - -QTreeView:disabled -{ - border: 1px solid #999999; -} - -QTreeView::item -{ - border-top-color: transparent; - border-bottom-color: transparent; - height: 20px; -} - -QTreeView::item:hover -{ - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7effd, stop: 1 #cbdaf1); - border: 1px solid #bfcde4; -} - - QTreeView::item:selected { - border: 1px solid #567dbc; - } - -QTreeView::item:selected:active{ - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc); -} - -QTreeView::item:selected:!active { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6b9be8, stop: 1 #577fbf); -} - -QTreeView::indicator -{ - width: 32px; - height: 32px; -} - - QTreeView::indicator:unchecked { - image: url(:/images/checkbox_unchecked); - } - - QTreeView::indicator:unchecked:disabled { - image: url(:/images/checkbox_unchecked_off); - } - - QTreeView::indicator:unchecked:hover { - image: url(:/images/checkbox_unchecked); - } - - QTreeView::indicator:unchecked:pressed { - image: url(:/images/checkbox_unchecked); - } - - QTreeView::indicator:checked { - image: url(:/images/checkbox_checked); - } - - QTreeView::indicator:checked:disabled { - image: url(:/images/checkbox_checked_off); - } - - QTreeView::indicator:checked:hover { - image: url(:/images/checkbox_checked); - } - - QTreeView::indicator:checked:pressed { - image: url(:/images/checkbox_checked); - } - - QTreeView::indicator:indeterminate { - image: url(:/images/checkbox_partial); - } - - QTreeView::indicator:indeterminate:disabled { - image: url(:/images/checkbox_partial_off); - } - - QTreeView::indicator:indeterminate:hover { - image: url(:/images/checkbox_partial); - } - - QTreeView::indicator:indeterminate:pressed { - image: url(:/images/checkbox_partial); - } - -QTreeView::branch:has-children:!has-siblings:closed, -QTreeView::branch:closed:has-children:has-siblings -{ - border-image: none; - image: url(:/images/treeview_closed); - margin-left: 5px; - } - -QTreeView::branch:open:has-children:!has-siblings, -QTreeView::branch:open:has-children:has-siblings -{ - border-image: none; - image: url(:/images/treeview_open); - margin-left: 5px; - } - -QWidget #widget -{ - border: none; - margin: 0px 2px; -} - -QHeaderView::section -{ - background: transparent; - color: #777777; - padding-left: 4px; -} - -QHeaderView -{ - background: transparent; - border-bottom: 1px solid #2299FF; -} - -QHeaderView:disabled -{ - border-bottom: 1px solid #999999; -} - -QLabel -{ - background: transparent; - border: none; - font-size: 18px; - margin: 10px 5px; -} - -QLineEdit -{ - margin: 0px 5px; - background-color: white; - border-radius: 8px; - border: 1px solid #2299FF; -} - -QLineEdit:disabled -{ - border: 1px solid #999999; - background-color: #F2F2F2; -} - -QCheckBox -{ - font-size: 18px; - spacing: 10px; -} - - QCheckBox::indicator -{ - width: 32px; - height: 32px; -} - -QCheckBox::indicator:unchecked { - image: url(:/images/checkbox_unchecked); - } - - QCheckBox::indicator:unchecked:disabled { - image: url(:/images/checkbox_unchecked_off); - } - - QCheckBox::indicator:unchecked:hover { - image: url(:/images/checkbox_unchecked); - } - - QCheckBox::indicator:unchecked:pressed { - image: url(:/images/checkbox_unchecked); - } - - QCheckBox::indicator:checked { - image: url(:/images/checkbox_checked); - } - - QCheckBox::indicator:checked:disabled { - image: url(:/images/checkbox_checked_off); - } - - QCheckBox::indicator:checked:hover { - image: url(:/images/checkbox_checked); - } - - QCheckBox::indicator:checked:pressed { - image: url(:/images/checkbox_checked); - } - - QCheckBox::indicator:indeterminate { - image: url(:/images/checkbox_partial); - } - - QCheckBox::indicator:indeterminate:disabled { - image: url(:/images/checkbox_partial_off); - } - - QCheckBox::indicator:indeterminate:hover { - image: url(:/images/checkbox_partial); - } - - QCheckBox::indicator:indeterminate:pressed { - image: url(:/images/checkbox_partial); - } - -QRadioButton -{ - margin: 5px 15px; - font-size: 18px; - background: transparent; - border: none; -} - -QRadioButton::indicator { - width: 20px; - height: 20px; - } - - QRadioButton::indicator::unchecked { - image: url(:/images/radiobutton_unchecked); - } - - QRadioButton::indicator:unchecked:disabled { - image: url(:/images/radiobutton_unchecked_off); - } - - QRadioButton::indicator:unchecked:hover { - image: url(:/images/radiobutton_unchecked); - } - - QRadioButton::indicator:unchecked:pressed { - image: url(:/images/radiobutton_unchecked); - } - - QRadioButton::indicator::checked { - image: url(:/images/radiobutton_checked); - } - -QRadioButton::indicator:checked:disabled -{ - image: url(:/images/radiobutton_checked_off); -} - - QRadioButton::indicator:checked:hover { - image: url(:/images/radiobutton_checked); - } - - QRadioButton::indicator:checked:pressed { - image: url(:/images/radiobutton_checked); - } - -QComboBox -{ - margin: 0px 5px; - background-color: white; - border-radius: 8px; - border: 1px solid #2299FF; - padding-left: 10px; - padding-right: 5px; -} - -QComboBox:disabled -{ - border: 1px solid #999999; - background-color: #F2F2F2; -} - -QComboBox:!editable, QComboBox::drop-down:editable -{ - background-color: white; -} - -QComboBox:!editable:enabled -{ - color: black; -} - -QComboBox:!editable:on, QComboBox::drop-down:editable:on -{ - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #D3D3D3, stop: 0.4 #D8D8D8, - stop: 0.5 #DDDDDD, stop: 1.0 #E1E1E1); - color: black; -} - -QComboBox:on -{ - color: black; -} - -QComboBox::drop-down { - subcontrol-origin: margin; - subcontrol-position: top right; - margin-right: 25px; - - border-left-width: 0px; - border-left-color: white; - border-left-style: solid; /* just a single line */ - border-top-right-radius: 3px; /* same radius as the QComboBox */ - border-bottom-right-radius: 3px; -} - -QComboBox::down-arrow -{ - image: url(:/images/combobox_arrow); -} - -QComboBox::down-arrow:disabled -{ - image: url(:/images/combobox_arrow_off); -} - -QComboBox QAbstractItemView { - border: 2px solid #2299FF; - selection-background-color: lightgray; - } - -QDateEdit -{ - padding-right: 35px; - font-size: 18px; - background-color: white; - border-radius: 8px; - border: 1px solid #2299FF; - margin-right: 5px; -} - -QDateEdit:disabled -{ - border: 1px solid #999999; - background-color: #F2F2F2; -} - -QDateEdit::drop-down -{ - subcontrol-origin: margin; - subcontrol-position: top right; - margin-right: 25px; - - border: none; -} - -QDateEdit::down-arrow -{ - image: url(:/images/combobox_arrow); -} - -QDateEdit::down-arrow:disabled -{ - image: url(:/images/combobox_arrow_off); -} - -QDateEdit QCalendarWidget -{ - border: 1px solid #2299FF; -} - -QDateTimeEdit -{ - padding-right: 35px; - font-size: 18px; - background-color: white; - border-radius: 8px; - border: 1px solid #2299FF; - margin-right: 5px; -} - -QDateTimeEdit:disabled -{ - border: 1px solid #999999; - background-color: #F2F2F2; -} - -QDateTimeEdit::drop-down -{ - subcontrol-origin: margin; - subcontrol-position: top right; - margin-right: 25px; - - border: none; -} - -QDateTimeEdit::down-arrow -{ - image: url(:/images/combobox_arrow); -} - -QDateTimeEdit::down-arrow:disabled -{ - image: url(:/images/combobox_arrow_off); -} - -QDateTimeEdit QCalendarWidget -{ - border: 1px solid #2299FF; -} - - @@ -707,7 +127,7 @@ QDateTimeEdit QCalendarWidget 0 0 1040 - 23 + 22 From df29693a412c6ddd89c6778c95d4bda75cd5eb01 Mon Sep 17 00:00:00 2001 From: Julien Lamy Date: Mon, 28 Mar 2016 15:55:22 +0200 Subject: [PATCH 3/3] Disable multi-frame format in GUI --- src/gui/GenerationFrame.ui | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/GenerationFrame.ui b/src/gui/GenerationFrame.ui index ee091311..8eea437e 100644 --- a/src/gui/GenerationFrame.ui +++ b/src/gui/GenerationFrame.ui @@ -53,6 +53,9 @@ + + false + MRI Single File @@ -124,8 +127,6 @@ - saveCheckBox - outputDirectoryTitle ZIPCheckBox outputDirBrowseButton