Skip to content

Commit 339768d

Browse files
JamesAPettsJamesAPetts
committed
Fix history on master.
1 parent d8714ea commit 339768d

5 files changed

Lines changed: 44 additions & 89 deletions

File tree

‎extensions/cornerstone/src/toolbarModule.js‎

Lines changed: 13 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ const definitions = [
5353
commandName: 'setToolActive',
5454
commandOptions: { toolName: 'Zoom' },
5555
},
56-
{
57-
id: 'Wwwc',
58-
label: 'Levels',
59-
icon: 'level',
60-
//
61-
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
62-
commandName: 'setToolActive',
63-
commandOptions: { toolName: 'Wwwc' },
64-
},
6556
{
6657
id: 'Pan',
6758
label: 'Pan',
@@ -72,31 +63,30 @@ const definitions = [
7263
commandOptions: { toolName: 'Pan' },
7364
},
7465
{
75-
id: 'Length',
76-
label: 'Length',
77-
icon: 'measure-temp',
66+
id: 'Wwwc',
67+
label: 'Levels',
68+
icon: 'level',
7869
//
7970
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
8071
commandName: 'setToolActive',
81-
commandOptions: { toolName: 'Length' },
72+
commandOptions: { toolName: 'Wwwc' },
8273
},
8374
{
84-
id: 'ArrowAnnotate',
85-
label: 'Annotate',
86-
icon: 'measure-non-target',
75+
id: 'WwwcRegion',
76+
label: 'ROI Window',
77+
icon: 'stop',
8778
//
8879
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
8980
commandName: 'setToolActive',
90-
commandOptions: { toolName: 'ArrowAnnotate' },
81+
commandOptions: { toolName: 'WwwcRegion' },
9182
},
9283
{
93-
id: 'Angle',
94-
label: 'Angle',
95-
icon: 'angle-left',
84+
id: 'Invert',
85+
label: 'Invert',
86+
icon: 'adjust',
9687
//
97-
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
98-
commandName: 'setToolActive',
99-
commandOptions: { toolName: 'Angle' },
88+
type: TOOLBAR_BUTTON_TYPES.COMMAND,
89+
commandName: 'invertViewport',
10090
},
10191
{
10292
id: 'Reset',
@@ -130,50 +120,6 @@ const definitions = [
130120
commandName: 'setToolActive',
131121
commandOptions: { toolName: 'Magnify' },
132122
},
133-
{
134-
id: 'WwwcRegion',
135-
label: 'ROI Window',
136-
icon: 'stop',
137-
//
138-
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
139-
commandName: 'setToolActive',
140-
commandOptions: { toolName: 'WwwcRegion' },
141-
},
142-
{
143-
id: 'DragProbe',
144-
label: 'Probe',
145-
icon: 'dot-circle',
146-
//
147-
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
148-
commandName: 'setToolActive',
149-
commandOptions: { toolName: 'DragProbe' },
150-
},
151-
{
152-
id: 'EllipticalRoi',
153-
label: 'Ellipse',
154-
icon: 'circle-o',
155-
//
156-
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
157-
commandName: 'setToolActive',
158-
commandOptions: { toolName: 'EllipticalRoi' },
159-
},
160-
{
161-
id: 'RectangleRoi',
162-
label: 'Rectangle',
163-
icon: 'square-o',
164-
//
165-
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
166-
commandName: 'setToolActive',
167-
commandOptions: { toolName: 'RectangleRoi' },
168-
},
169-
{
170-
id: 'Invert',
171-
label: 'Invert',
172-
icon: 'adjust',
173-
//
174-
type: TOOLBAR_BUTTON_TYPES.COMMAND,
175-
commandName: 'invertViewport',
176-
},
177123
{
178124
id: 'RotateRight',
179125
label: 'Rotate Right',
@@ -198,23 +144,6 @@ const definitions = [
198144
type: TOOLBAR_BUTTON_TYPES.COMMAND,
199145
commandName: 'flipViewportVertical',
200146
},
201-
{
202-
id: 'Clear',
203-
label: 'Clear',
204-
icon: 'trash',
205-
//
206-
type: TOOLBAR_BUTTON_TYPES.COMMAND,
207-
commandName: 'clearAnnotations',
208-
},
209-
{
210-
id: 'Bidirectional',
211-
label: 'Bidirectional',
212-
icon: 'measure-target',
213-
//
214-
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
215-
commandName: 'setToolActive',
216-
commandOptions: { toolName: 'Bidirectional' },
217-
},
218147
{
219148
id: 'Download',
220149
label: 'Download',

‎platform/ui/src/elements/Icon/getIcon.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ const ICONS = {
114114
'angle-double-up': angleDoubleUp,
115115
'arrows-alt-h': arrowsAltH,
116116
'arrows-alt-v': arrowsAltV,
117+
clipboard: clipboard,
117118
bars,
118119
'caret-down': caretDown,
119120
'caret-up': caretUp,

‎platform/viewer/public/config/idc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ window.config = function(props) {
55
disableMeasurementPanel: true,
66
routerBasename: '/',
77
enableGoogleCloudAdapter: true,
8+
disableMeasurementPanel: true,
89
splitQueryParameterCalls: true, // Allows the user to split QIDO SeriesInstanceUID filters into multiple calls, if the server does not support multi-valued query parameters.
910
enableGoogleCloudAdapterUI: false,
1011
showStudyList: true,

‎platform/viewer/public/html-templates/index.html‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,28 @@
22
<html lang="en">
33

44
<head>
5+
6+
<!-- Google Analytics -->
7+
<script>
8+
if (window.location.host == 'viewer.imaging.datacommons.cancer.gov') {
9+
(function (i, s, o, g, r, a, m) {
10+
i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
11+
(i[r].q = i[r].q || []).push(arguments)
12+
}, i[r].l = 1 * new Date(); a = s.createElement(o),
13+
m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
14+
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
15+
16+
ga('create', 'UA-151885665-6', 'auto');
17+
ga('send', 'pageview');
18+
}
19+
</script>
20+
<!-- End Google Analytics -->
21+
522
<meta charset="utf-8" />
623
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
724
<meta name="theme-color" content="#000000" />
825
<meta name="mobile-web-app-capable" content="yes">
9-
<meta name="application-name" content="OHIF Viewer">
26+
<meta name="application-name" content="IDC Viewer">
1027
<meta name="apple-mobile-web-app-capable" content="yes">
1128
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
1229
<meta name="apple-mobile-web-app-title" content="@ohif/viewer">

‎platform/viewer/src/index.js‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import OHIFDicomSegmentationExtension from '@ohif/extension-dicom-segmentation';
2929
import OHIFDicomRtExtension from '@ohif/extension-dicom-rt';
3030
import OHIFDicomMicroscopyExtension from '@ohif/extension-dicom-microscopy';
3131
import OHIFDicomPDFExtension from '@ohif/extension-dicom-pdf';
32-
//import OHIFDicomTagBrowserExtension from '@ohif/extension-dicom-tag-browser';
32+
import OHIFDicomTagBrowserExtension from '@ohif/extension-dicom-tag-browser';
3333
// Add this for Debugging purposes:
34-
//import OHIFDebuggingExtension from '@ohif/extension-debugging';
34+
import OHIFDebuggingExtension from '@ohif/extension-debugging';
3535
import { version } from '../package.json';
3636

3737
/*
@@ -54,8 +54,15 @@ const appProps = {
5454
OHIFDicomPDFExtension,
5555
OHIFDicomSegmentationExtension,
5656
OHIFDicomRtExtension,
57-
//OHIFDebuggingExtension,
58-
//OHIFDicomTagBrowserExtension,
57+
[
58+
OHIFDebuggingExtension,
59+
{
60+
mailTo: 'support@canceridc.dev',
61+
debugModalMessage:
62+
'If the Send Bug Report button does not work, copy to clipboard and e-mail support@canceridc.dev.',
63+
},
64+
],
65+
OHIFDicomTagBrowserExtension,
5966
],
6067
};
6168

0 commit comments

Comments
 (0)