From 7cebd3c91c91ffc9a386f68d20175312595b3174 Mon Sep 17 00:00:00 2001 From: Aysel Afsar Date: Wed, 2 Mar 2016 12:09:05 -0500 Subject: [PATCH] LT-115: Add CR-Target, UN-Target and EX-Target tools (WIP) --- LesionTracker/client/components/init.js | 19 + .../components/viewerMain/viewerMain.js | 30 ++ .../components/viewerMain/viewerMain.styl | 15 +- .../client/compatibility/crTool.js | 10 + .../client/compatibility/crunexTool.js | 409 ++++++++++++++++++ .../client/compatibility/exTool.js | 9 + .../client/compatibility/unTool.js | 9 + .../lesionLocationDialog.js | 10 + Packages/lesiontracker/package.js | 14 +- .../components/viewer/toolbar/toolbar.html | 4 + .../components/viewer/toolbar/toolbar.js | 6 + .../toolbarGroupButton.html | 12 + .../toolbarGroupButton/toolbarGroupButton.js | 0 .../toolbarGroupButton.styl | 10 + Packages/viewerbase/package.js | 5 + 15 files changed, 560 insertions(+), 2 deletions(-) create mode 100644 Packages/lesiontracker/client/compatibility/crTool.js create mode 100644 Packages/lesiontracker/client/compatibility/crunexTool.js create mode 100644 Packages/lesiontracker/client/compatibility/exTool.js create mode 100644 Packages/lesiontracker/client/compatibility/unTool.js create mode 100644 Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.html create mode 100644 Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.js create mode 100644 Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.styl diff --git a/LesionTracker/client/components/init.js b/LesionTracker/client/components/init.js index e9160caa4..4ef26f1c6 100644 --- a/LesionTracker/client/components/init.js +++ b/LesionTracker/client/components/init.js @@ -19,10 +19,29 @@ Meteor.startup(function() { touch: cornerstoneTools.deleteLesionKeyboardTool }); + toolManager.addTool('crTool', { + mouse: cornerstoneTools.crTool, + touch: cornerstoneTools.crToolTouch + }); + + toolManager.addTool('unTool', { + mouse: cornerstoneTools.unTool, + touch: cornerstoneTools.unToolTouch + }); + + toolManager.addTool('exTool', { + mouse: cornerstoneTools.exTool, + touch: cornerstoneTools.exToolTouch + }); + + var states = toolManager.getToolDefaultStates(); states.deactivate.push('lesion'); states.deactivate.push('nonTarget'); states.deactivate.push('length'); + states.deactivate.push('crTool'); + states.deactivate.push('unTool'); + states.deactivate.push('exTool'); states.activate.push('deleteLesionKeyboardTool'); diff --git a/LesionTracker/client/components/viewerMain/viewerMain.js b/LesionTracker/client/components/viewerMain/viewerMain.js index 40bf15cfd..4b108d430 100644 --- a/LesionTracker/client/components/viewerMain/viewerMain.js +++ b/LesionTracker/client/components/viewerMain/viewerMain.js @@ -4,6 +4,8 @@ Template.viewerMain.helpers({ var buttonData = []; + var btnGroup = []; + buttonData.push({ id: 'resetViewport', title: 'Reset Viewport', @@ -81,10 +83,38 @@ Template.viewerMain.helpers({ iconClasses: 'fa fa-eye' }); + // CR/UN/EX Tools + var crunexToolsBtns = { + id: 'crunexTools', + tools:[{ + id: 'crTool', + title: 'CR Tool', + classes: 'imageViewerTool', + iconClasses: 'fa fa-cr' + }, + { + id: 'unTool', + title: 'UN Tool', + classes: 'imageViewerTool', + iconClasses: 'fa fa-un' + }, + { + id: 'exTool', + title: 'EX Tool', + classes: 'imageViewerTool', + iconClasses: 'fa fa-ex' + }], + title: "CR/UN/EX", + groupIcon: 'fa fa-exchange' + }; + + btnGroup.push(crunexToolsBtns); + toolbarOptions.buttonData = buttonData; toolbarOptions.includePlayClipButton = false; toolbarOptions.includeLayoutButton = false; toolbarOptions.includeHangingProtocolButtons = false; + toolbarOptions.btnGroup = btnGroup; return toolbarOptions; } }); diff --git a/LesionTracker/client/components/viewerMain/viewerMain.styl b/LesionTracker/client/components/viewerMain/viewerMain.styl index 4d3610e5a..fcd7b0cff 100644 --- a/LesionTracker/client/components/viewerMain/viewerMain.styl +++ b/LesionTracker/client/components/viewerMain/viewerMain.styl @@ -1,3 +1,16 @@ .viewerMain width: 100% - height: 84% \ No newline at end of file + height: 84% + +//font awesome icons +.fa-cr:before + content: 'CR' + font-weight: bold + +.fa-un:before + content: 'UN' + font-weight: bold + +.fa-ex:before + content: 'EX' + font-weight: bold \ No newline at end of file diff --git a/Packages/lesiontracker/client/compatibility/crTool.js b/Packages/lesiontracker/client/compatibility/crTool.js new file mode 100644 index 000000000..df4bdfd96 --- /dev/null +++ b/Packages/lesiontracker/client/compatibility/crTool.js @@ -0,0 +1,10 @@ +(function($, cornerstone, cornerstoneMath, cornerstoneTools) { + + 'use strict'; + var crToolInterface = cornerstoneTools.crunexTool('crTool', 'CR'); + cornerstoneTools.crTool = crToolInterface.crunex; + cornerstoneTools.crTool.setConfiguration(crToolInterface.defaultConfiguration); + cornerstoneTools.crToolTouch = crToolInterface.crunexTouch; + + +})($, cornerstone, cornerstoneMath, cornerstoneTools); diff --git a/Packages/lesiontracker/client/compatibility/crunexTool.js b/Packages/lesiontracker/client/compatibility/crunexTool.js new file mode 100644 index 000000000..f0457084c --- /dev/null +++ b/Packages/lesiontracker/client/compatibility/crunexTool.js @@ -0,0 +1,409 @@ +(function($, cornerstone, cornerstoneMath, cornerstoneTools) { + + 'use strict'; + + function crunexTool(toolType, toolName) { + var toolInterface = { + toolType: toolType, + toolName: toolName + }; + + var configuration = { + setLesionNumberCallback: setLesionNumberCallback, + getLesionLocationCallback: getLesionLocationCallback, + changeLesionLocationCallback: changeLesionLocationCallback, + drawHandles: false, + drawHandlesOnHover: false, + arrowFirst: true + }; + + toolInterface.defaultConfiguration = configuration; + + // Used to cancel tool placement + var keys = { + ESC: 27 + }; + + // Set lesion number + // Get Non-Target lesions on image + function setLesionNumberCallback(measurementData, eventData, doneCallback) { + var lesionNumber = 1; + doneCallback(lesionNumber); + } + // Define a callback to get your text annotation + // This could be used, e.g. to open a modal + function getLesionLocationCallback(measurementData, eventData, doneCallback) { + // doneCallback(prompt('Enter your lesion location:')); + } + + function changeLesionLocationCallback(measurementData, eventData, doneCallback) { + doneCallback(prompt('Change your lesion location:')); + } + + /// --- Mouse Tool --- /// + ///////// BEGIN ACTIVE TOOL /////// + function addNewMeasurement(mouseEventData) { + var element = mouseEventData.element; + + function doneCallback(lesionNumber) { + measurementData.lesionNumber = lesionNumber; + measurementData.active = true; + cornerstone.updateImage(element); + } + + var measurementData = createNewMeasurement(mouseEventData); + + var eventData = { + mouseButtonMask: mouseEventData.which + }; + + var config = cornerstoneTools[toolType].getConfiguration(); + + // Set lesion number and lesion name + if (measurementData.lesionNumber === undefined) { + config.setLesionNumberCallback(measurementData, mouseEventData, doneCallback); + } + + // associate this data with this imageId so we can render it and manipulate it + cornerstoneTools.addToolState(mouseEventData.element, toolType, measurementData); + + // since we are dragging to another place to drop the end point, we can just activate + // the end point and let the moveHandle move it for us. + $(element).off('CornerstoneToolsMouseMove', cornerstoneTools[toolType].mouseMoveCallback); + $(element).off('CornerstoneToolsMouseDown', cornerstoneTools[toolType].mouseDownCallback); + $(element).off('CornerstoneToolsMouseDownActivate', cornerstoneTools[toolType].mouseDownActivateCallback); + $(element).off('CornerstoneToolsMouseDoubleClick', doubleClickCallback); + + // Add a flag for using Esc to cancel tool placement + var cancelled = false; + function cancelCallback(e) { + // If the Esc key was pressed, set the flag to true + if (e.which === keys.ESC) { + cancelled = true; + cornerstoneTools.removeToolState(mouseEventData.element, toolType, measurementData); + } + + // Don't propagate this keydown event so it can't interfere + // with anything outside of this tool + return false; + } + + // Bind a one-time event listener for the Esc key + $(element).one('keydown', cancelCallback); + + cornerstone.updateImage(element); + + cornerstoneTools.moveNewHandle(mouseEventData, toolType, measurementData, measurementData.handles.end, function() { + if (cancelled || cornerstoneTools.anyHandlesOutsideImage(mouseEventData, measurementData.handles)) { + // delete the measurement + cornerstoneTools.removeToolState(mouseEventData.element, toolType, measurementData); + } else { + config.getLesionLocationCallback(measurementData, mouseEventData, doneCallback); + } + + // Unbind the Esc keydown hook + $(element).off('keydown', cancelCallback); + + $(element).on('CornerstoneToolsMouseMove', eventData, cornerstoneTools[toolType].mouseMoveCallback); + $(element).on('CornerstoneToolsMouseDown', eventData, cornerstoneTools[toolType].mouseDownCallback); + $(element).on('CornerstoneToolsMouseDownActivate', eventData, cornerstoneTools[toolType].mouseDownActivateCallback); + $(element).on('CornerstoneToolsMouseDoubleClick', eventData, doubleClickCallback); + + $(element).off('keydown', cancelCallback); + + cornerstone.updateImage(mouseEventData.element); + }); + } + + function createNewMeasurement(mouseEventData) { + var imageId = mouseEventData.image.imageId; + + // Get studyInstanceUid + var study = cornerstoneTools.metaData.get('study', imageId); + var studyInstanceUid = study.studyInstanceUid; + var patientId = study.patientId; + + // Get seriesInstanceUid + var series = cornerstoneTools.metaData.get('series', imageId); + var seriesInstanceUid = series.seriesInstanceUid; + + // create the measurement data for this tool with the end handle activated + var measurementData = { + visible: true, + active: true, + handles: { + start: { + x: mouseEventData.currentPoints.image.x, + y: mouseEventData.currentPoints.image.y, + highlight: true, + active: false + }, + end: { + x: mouseEventData.currentPoints.image.x, + y: mouseEventData.currentPoints.image.y, + highlight: true, + active: false + }, + textBox: { + x: mouseEventData.currentPoints.image.x - 50, + y: mouseEventData.currentPoints.image.y - 50, + active: false, + movesIndependently: false, + drawnIndependently: true, + allowedOutsideImage: true, + hasBoundingBox: true + } + }, + imageId: imageId, + seriesInstanceUid: seriesInstanceUid, + studyInstanceUid: studyInstanceUid, + patientId: patientId, + response: '', + isTarget: true, + measurementType: 'nonTarget', + toolName: toolName + }; + + return measurementData; + } + ///////// END ACTIVE TOOL /////// + + function pointNearTool(element, data, coords) { + var lineSegment = { + start: cornerstone.pixelToCanvas(element, data.handles.start), + end: cornerstone.pixelToCanvas(element, data.handles.end) + }; + var distanceToPoint = cornerstoneMath.lineSegment.distanceToPoint(lineSegment, coords); + + if (cornerstoneTools.pointInsideBoundingBox(data.handles.textBox, coords)) { + return true; + } + + return distanceToPoint < 25; + } + + function drawDottedArrow(context, start, end, color, lineWidth) { + //variables to be used when creating the arrow + var headLength = 10; + + var angle = Math.atan2(end.y - start.y, end.x - start.x); + + //starting path of the arrow from the start square to the end square and drawing the stroke + context.beginPath(); + context.moveTo(start.x, start.y); + context.lineTo(end.x, end.y); + context.strokeStyle = color; + context.lineWidth = lineWidth; + //context.setLineDash([ 2, 3 ]); + context.stroke(); + + //starting a new path from the head of the arrow to one of the sides of the point + context.beginPath(); + context.moveTo(end.x, end.y); + context.lineTo(end.x - headLength * Math.cos(angle - Math.PI / 7), end.y - headLength * Math.sin(angle - Math.PI / 7)); + + //path from the side point of the arrow, to the other side point + context.lineTo(end.x - headLength * Math.cos(angle + Math.PI / 7), end.y - headLength * Math.sin(angle + Math.PI / 7)); + + //path from the side point back to the tip of the arrow, and then again to the opposite side point + context.lineTo(end.x, end.y); + context.lineTo(end.x - headLength * Math.cos(angle - Math.PI / 7), end.y - headLength * Math.sin(angle - Math.PI / 7)); + + //draws the paths created above + context.strokeStyle = color; + context.lineWidth = lineWidth; + context.stroke(); + context.fillStyle = color; + context.fill(); + } + + ///////// BEGIN IMAGE RENDERING /////// + function onImageRendered(e, eventData) { + var element = eventData.element; + + // if we have no toolData for this element, return immediately as there is nothing to do + var toolData = cornerstoneTools.getToolState(element, toolType); + if (!toolData) { + return; + } + + // we have tool data for this element - iterate over each one and draw it + var context = eventData.canvasContext.canvas.getContext('2d'); + context.setTransform(1, 0, 0, 1, 0, 0); + + var color; + var lineWidth = cornerstoneTools.toolStyle.getToolWidth(); + var font = cornerstoneTools.textStyle.getFont(); + var config = cornerstoneTools[toolType].getConfiguration(); + + context.font = font; + for (var i = 0; i < toolData.data.length; i++) { + var data = toolData.data[i]; + + context.save(); + + // configurable shadow from CornerstoneTools + if (config && config.shadow) { + context.shadowColor = '#000000'; + context.shadowOffsetX = 1; + context.shadowOffsetY = 1; + } + + if (data.active) { + color = cornerstoneTools.toolColors.getActiveColor(); + } else { + color = cornerstoneTools.toolColors.getToolColor(); + } + + // Draw the arrow + var handleStartCanvas = cornerstone.pixelToCanvas(element, data.handles.start); + var handleEndCanvas = cornerstone.pixelToCanvas(element, data.handles.end); + var canvasTextLocation = cornerstone.pixelToCanvas(element, data.handles.textBox); + + drawDottedArrow(context, handleEndCanvas, handleStartCanvas, color, lineWidth); + + if (config.drawHandles) { + cornerstoneTools.drawHandles(context, eventData, data.handles, color); + } else if (config.drawHandlesOnHover && data.handles.start.active) { + cornerstoneTools.drawHandles(context, eventData, [ data.handles.start ], color); + } else if (config.drawHandlesOnHover && data.handles.end.active) { + cornerstoneTools.drawHandles(context, eventData, [ data.handles.end ], color); + } + + // Draw the text + if (data.lesionNumber) { + // Draw linked line as dashed + var mid = { + x: (handleStartCanvas.x + handleEndCanvas.x) / 2, + y: (handleStartCanvas.y + handleEndCanvas.y) / 2 + }; + + context.beginPath(); + context.strokeStyle = color; + context.lineWidth = lineWidth; + context.setLineDash([ 2, 3 ]); + + context.moveTo(mid.x, mid.y); + context.lineTo(canvasTextLocation.x + 20, canvasTextLocation.y + 20); + context.stroke(); + + var boundingBox = cornerstoneTools.drawTextBox(context,data.toolName + " " + + data.lesionNumber, canvasTextLocation.x, canvasTextLocation.y, color); + data.handles.textBox.boundingBox = boundingBox; + } + + context.restore(); + } + } + + // ---- Touch tool ---- + + ///////// BEGIN ACTIVE TOOL /////// + function addNewMeasurementTouch(touchEventData) { + var element = touchEventData.element; + + function doneCallback(lesionNumber) { + measurementData.lesionNumber = lesionNumber; + measurementData.active = true; + cornerstone.updateImage(element); + } + + var measurementData = createNewMeasurement(touchEventData); + cornerstoneTools.addToolState(element, toolType, measurementData); + $(element).off('CornerstoneToolsTouchDrag', cornerstoneTools[toolType+"Touch"].touchMoveHandle); + $(element).off('CornerstoneToolsDragStartActive',cornerstoneTools[toolType+"Touch"].touchDownActivateCallback); + $(element).off('CornerstoneToolsTap', cornerstoneTools[toolType+"Touch"].tapCallback); + var config = cornerstoneTools[toolType].getConfiguration(); + + // Set lesion number and lesion name + if (measurementData.lesionName === undefined) { + config.setLesionNumberCallback(measurementData, touchEventData, doneCallback); + } + + cornerstone.updateImage(element); + + cornerstoneTools.moveNewHandleTouch(touchEventData, toolType, measurementData, measurementData.handles.end, function() { + cornerstone.updateImage(element); + + if (cornerstoneTools.anyHandlesOutsideImage(touchEventData, measurementData.handles)) { + // delete the measurement + cornerstoneTools.removeToolState(element, toolType, measurementData); + } + + config.getLesionLocationCallback(measurementData, touchEventData, doneCallback); + + $(element).on('CornerstoneToolsTouchDrag', cornerstoneTools[toolType+"Touch"].touchMoveHandle); + $(element).on('CornerstoneToolsDragStartActive', cornerstoneTools[toolType+"Touch"].touchDownActivateCallback); + $(element).on('CornerstoneToolsTap', cornerstoneTools[toolType+"Touch"].tapCallback); + }); + } + + function doubleClickCallback(e, eventData) { + var element = eventData.element; + var data; + + function doneCallback(data, deleteTool) { + if (deleteTool === true) { + cornerstoneTools.removeToolState(element, toolType, data); + cornerstone.updateImage(element); + return; + } + + data.active = false; + cornerstone.updateImage(element); + } + + if (e.data && e.data.mouseButtonMask && !cornerstoneTools.isMouseButtonEnabled(eventData.which, e.data.mouseButtonMask)) { + return false; + } + + var config = cornerstoneTools[toolType].getConfiguration(); + + var coords = eventData.currentPoints.canvas; + var toolData = cornerstoneTools.getToolState(element, toolType); + + // now check to see if there is a handle we can move + if (!toolData) { + return false; + } + + for (var i = 0; i < toolData.data.length; i++) { + data = toolData.data[i]; + if (pointNearTool(element, data, coords)) { + data.active = true; + cornerstone.updateImage(element); + // Allow relabelling via a callback + config.changeLesionLocationCallback(data, eventData, doneCallback); + + e.stopImmediatePropagation(); + return false; + } + } + + return false; // false = causes jquery to preventDefault() and stopPropagation() this event + } + + + toolInterface.crunex = cornerstoneTools.mouseButtonTool({ + addNewMeasurement: addNewMeasurement, + createNewMeasurement: createNewMeasurement, + onImageRendered: onImageRendered, + pointNearTool: pointNearTool, + toolType: toolType, + mouseDoubleClickCallback: doubleClickCallback + }); + + toolInterface.crunexTouch = cornerstoneTools.touchTool({ + addNewMeasurement: addNewMeasurementTouch, + createNewMeasurement: createNewMeasurement, + onImageRendered: onImageRendered, + pointNearTool: pointNearTool, + toolType: toolType + // pressCallback: doubleClickCallback + }); + + return toolInterface; + } + + cornerstoneTools.crunexTool = crunexTool; + +})($, cornerstone, cornerstoneMath, cornerstoneTools); diff --git a/Packages/lesiontracker/client/compatibility/exTool.js b/Packages/lesiontracker/client/compatibility/exTool.js new file mode 100644 index 000000000..3957ce48f --- /dev/null +++ b/Packages/lesiontracker/client/compatibility/exTool.js @@ -0,0 +1,9 @@ +(function($, cornerstone, cornerstoneMath, cornerstoneTools) { + + 'use strict'; + var exToolInterface = cornerstoneTools.crunexTool('exTool', 'EX'); + cornerstoneTools.exTool = exToolInterface.crunex; + cornerstoneTools.exTool.setConfiguration(exToolInterface.defaultConfiguration); + cornerstoneTools.exToolTouch = exToolInterface.crunexTouch; + +})($, cornerstone, cornerstoneMath, cornerstoneTools); diff --git a/Packages/lesiontracker/client/compatibility/unTool.js b/Packages/lesiontracker/client/compatibility/unTool.js new file mode 100644 index 000000000..f2237a94d --- /dev/null +++ b/Packages/lesiontracker/client/compatibility/unTool.js @@ -0,0 +1,9 @@ +(function($, cornerstone, cornerstoneMath, cornerstoneTools) { + + 'use strict'; + var unToolInterface = cornerstoneTools.crunexTool('unTool', 'UN'); + cornerstoneTools.unTool = unToolInterface.crunex; + cornerstoneTools.unTool.setConfiguration(unToolInterface.defaultConfiguration); + cornerstoneTools.unToolTouch = unToolInterface.crunexTouch; + +})($, cornerstone, cornerstoneMath, cornerstoneTools); diff --git a/Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js b/Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js index 1e0789eab..af0280f9f 100644 --- a/Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js +++ b/Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js @@ -185,6 +185,16 @@ var config = { cornerstoneTools.lesion.setConfiguration(config); +// Set CR-Tool, UN-Tool, EX-Tool configurations +// Config for CR Tool +cornerstoneTools.crTool.setConfiguration(config); + +// Config for EX Tool +cornerstoneTools.exTool.setConfiguration(config); + +// Config for UN Tool +cornerstoneTools.unTool.setConfiguration(config); + Template.lesionLocationDialog.events({ 'change .selectLesionLocation': function(e) { var measurementData = Template.lesionLocationDialog.measurementData; diff --git a/Packages/lesiontracker/package.js b/Packages/lesiontracker/package.js index 20ea969cc..eb086732e 100644 --- a/Packages/lesiontracker/package.js +++ b/Packages/lesiontracker/package.js @@ -43,6 +43,19 @@ Package.onUse(function(api) { api.addFiles('client/compatibility/deleteLesionKeyboardTool.js', 'client', { bare: true }); + api.addFiles('client/compatibility/crunexTool.js', 'client', { + bare: true + }); + api.addFiles('client/compatibility/crTool.js', 'client', { + bare: true + }); + api.addFiles('client/compatibility/unTool.js', 'client', { + bare: true + }); + api.addFiles('client/compatibility/exTool.js', 'client', { + bare: true + }); + // Trial Criteria data validation (the Meteor package is currently out-of-date) api.addFiles('client/compatibility/validate.js', 'client', { @@ -158,7 +171,6 @@ Package.onUse(function(api) { api.addFiles('lib/convertToNonTarget.js', 'client'); api.addFiles('lib/setTimepointActiveTool.js', 'client'); - api.addFiles('lib/syncMeasurementAndToolData.js', 'client'); api.addFiles('lib/syncImageMeasurementAndToolData.js', 'client'); api.addFiles('lib/updateRelatedElements.js', 'client'); diff --git a/Packages/viewerbase/client/components/viewer/toolbar/toolbar.html b/Packages/viewerbase/client/components/viewer/toolbar/toolbar.html index e9f084cbf..279e36c80 100644 --- a/Packages/viewerbase/client/components/viewer/toolbar/toolbar.html +++ b/Packages/viewerbase/client/components/viewer/toolbar/toolbar.html @@ -16,6 +16,10 @@ {{ #if includeHangingProtocolButtons }} {{ >hangingProtocolButtons }} {{ /if }} + + {{ #each btnGroup }} + {{ >toolbarGroupButton}} + {{ /each }} \ No newline at end of file diff --git a/Packages/viewerbase/client/components/viewer/toolbar/toolbar.js b/Packages/viewerbase/client/components/viewer/toolbar/toolbar.js index ca492e614..17f6c1fb2 100644 --- a/Packages/viewerbase/client/components/viewer/toolbar/toolbar.js +++ b/Packages/viewerbase/client/components/viewer/toolbar/toolbar.js @@ -172,5 +172,11 @@ Template.toolbar.helpers({ return this.toolbarOptions.includeHangingProtocolButtons; } return true; + }, + 'btnGroup': function() { + if (this.toolbarOptions && this.toolbarOptions.btnGroup !== undefined) { + return this.toolbarOptions.btnGroup; + } + return []; } }); \ No newline at end of file diff --git a/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.html b/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.html new file mode 100644 index 000000000..272f6be98 --- /dev/null +++ b/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.html @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.js b/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.js new file mode 100644 index 000000000..e69de29bb diff --git a/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.styl b/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.styl new file mode 100644 index 000000000..44030d6ee --- /dev/null +++ b/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.styl @@ -0,0 +1,10 @@ +#toolbarGroupButton + .dropdown-menu + background-color: black + border: solid 1px #333 + padding: 5px + margin-top: 0 + + div + padding: 5px + float: left \ No newline at end of file diff --git a/Packages/viewerbase/package.js b/Packages/viewerbase/package.js index 684c68fd6..12baa7486 100644 --- a/Packages/viewerbase/package.js +++ b/Packages/viewerbase/package.js @@ -114,6 +114,11 @@ Package.onUse(function(api) { api.addFiles('client/components/basic/progressDialog/progressDialog.styl', 'client'); api.addFiles('client/components/basic/progressDialog/progressDialog.js', 'client'); + api.addFiles('client/components/viewer/toolbarGroupButton/toolbarGroupButton.html', 'client'); + api.addFiles('client/components/viewer/toolbarGroupButton/toolbarGroupButton.styl', 'client'); + api.addFiles('client/components/viewer/toolbarGroupButton/toolbarGroupButton.js', 'client'); + + // Library functions api.addFiles('lib/accountsConfig.js', 'client'); api.addFiles('lib/createStacks.js', 'client');