-
-
-
-
- 
|
+
', + 'text_end' => '', + 'columns' => array( + 'off' => array('%05X', ' '), + 'g' => array('0x%04X', ':'), + 'e' => array('0x%04X', ' '), + 'name' => array('%-30.30s', ' '), + 'vr' => array('%2s', ' '), + 'len' => array('%-3d', ' '), + 'val' => array('[%s]', ''), + ), + ); + + // Default echo output + protected $_output_echo = array( + 'dataset_begin' => '', + 'dataset_end' => '', + 'item_begin' => '', + 'item_end' => "\n", + 'spacer' => ' ', + 'text_begin' => '', + 'text_end' => '', + 'columns' => array( + 'off' => array('%05X', ' '), + 'g' => array('%04X', ':'), + 'e' => array('%04X', ' '), + 'name' => array('%-30.30s', ' '), + 'vr' => array('%2s', ' '), + 'len' => array('%-3d', ' '), + 'val' => array('[%s]', ''), + ), + ); + + // For formatting + protected $output = array(); + + // The output + protected $_out = ''; + + /** + * Public method for dump + * + * @param mixed for formatting + * @return string the dumped full dataset + */ + public function dump($output = 'echo') + { + $this->parse(); + + // TODO: + // - Check if $output exists. + // - Max number of nested datasets + // - Show binary in hexdump format + $this->profiler['dump']['start'] = microtime(TRUE); + + if (is_array($output)) + { + // Merge arrays from default and given + $this->output = array_merge($this->_output_echo, $output); + } + else + { + $output = '_output_'.$output; + foreach ($this->$output as $var => $value) + { + // Load the output + $this->output[$var] = $value; + } + } + $dump = $this->_dump($this->_dataset); + $this->profiler['dump']['end'] = microtime(TRUE); + return $dump; + } + + /** + * Internal method for dumping + * + * @param object the dataset + * @param string the spacer + * @return string the dumped dataset + */ + protected function _dump($dataset, $spacer = '') + { + $out = ''; + foreach ($dataset as $group => $elements) + { + // Load dictionaries (Forced loading) + Nanodicom_Dictionary::load_dictionary($group, TRUE); + foreach ($elements as $element => $indexes) + { + foreach ($indexes as $values) + { + $elem = $values; + $elem['g'] = $group; + $elem['e'] = $element; + + if ( ! isset($elem['done'])) + { + // Read value if not read yet + $this->_read_value_from_blob($elem, $group, $element); + } + + // Indent back when a delimiter was found. Must be done before dumping. + if ($group == Nanodicom::ITEMS_GROUP AND in_array($element, array(Nanodicom::ITEM_DELIMITER, Nanodicom::SEQUENCE_DELIMITER))) + { + $spacer = substr($spacer, 0, -1*strlen($this->output['spacer'])); + } + + // Start the dataset and dump the current element + $out .= $this->output['dataset_begin'].$this->_dump_element($elem, $spacer); + + if (count($elem['ds']) > 0) + { + // Take care of items + $out .= $this->_dump($elem['ds'], $spacer.$this->output['spacer']); + } + + // Close the dataset + $out .= $this->output['dataset_end']; + } + unset($values); + } + unset($element, $indexes); + } + unset($group, $elements); + return $out; + } + + /** + * Dumps an element + * + * @param object the element + * @param string the spacer + * @return string the full dumped element + */ + protected function _dump_element($element, $space = '') + { + $row = $this->_print_element($element); + return $this->output['item_begin'].$this->output['text_begin'].$space.$row.$this->output['text_end'].$this->output['item_end']; + } + + /** + * Prints an element + * + * @param object the element + * @return string the basic dumped element + */ + protected function _print_element($element) + { + $out = ''; + + foreach ($this->output['columns'] as $column => $values) + { + switch ($column) + { + case 'name' : $string = isset(Nanodicom_Dictionary::$dict[$element['g']][$element['e']]) + ? Nanodicom_Dictionary::$dict[$element['g']][$element['e']][2] + : 'NA'; + break; + case 'val' : + if ($element['vr'] == 'AT') + { + // AT (Attribute Tags) look "nicer" being displayed in Hex to match Group, Elements format + $elements = array(); + for($i = 0; $i < count($element['val']); $i++) + { + $elements[] = '['.sprintf("0x%04X", $element['val'][$i][0]).','.sprintf("0x%04X", $element['val'][$i][1]).']'; + } + $element['val'] = $elements; + } + + $string = ($element['bin']) + ? 'BINARY. Element starts at '.$element['off'] + : ((is_array($element['val'])) + ? implode(',', $element['val']) + : (isset(Nanodicom_Dictionary::$dict[$element['g']][$element['e']]) + ? trim($element['val']) + : 'UNKNOWN')); + break; + case 'vr' : + $vr_index = ($element['vr'] != $element['_vr'] AND ! empty($element['_vr'])) ? '_vr' : 'vr'; + $string = trim($element[$vr_index]); + break; + default : $string = trim($element[$column]); + break; + } + $out .= sprintf($values[0], $string).$values[1]; + } + return $out; + } + +} // End Dicom_Dumper diff --git a/lib/Nanodicom/tools/getter.php b/lib/Nanodicom/tools/getter.php new file mode 100644 index 0000000..a23ff45 --- /dev/null +++ b/lib/Nanodicom/tools/getter.php @@ -0,0 +1,42 @@ + + * @version 1.3.1 + * @copyright (c) 2010-2011 + * @license http://www.opensource.org/licenses/mit-license.php MIT-license + */ + +/** + * Dicom_Getter class. + * + * Extends Nanodicom. Simplifies the access to fields by element name. + * @package Nanodicom + * @category Tools + * @author Nano Documet
' + - `${t('dicomviewer', 'There is no available DICOM image to display')}` + - '
'; - $loadingViewerMain.append(content); - }, 500); - } - - /** - * Load single DICOM instance - */ - loadSingleDICOMInstance() { - const self = this; - const { context, fileName } = this; - const fileDownloadUrl = context.fileList.getDownloadUrl(fileName, context.dir); - if (!fileDownloadUrl || fileDownloadUrl === '#') { - return; - } - - // Listen to update loading progress - cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.imageLoadProgressHandler); - - return new Promise((resolve, reject) => { - const { dataSetCacheManager } = cornerstoneWADOImageLoader.wadouri; - const viewerData = { - studies: [] - }; - - const fullUrl = generateFullUrl(fileDownloadUrl); - const wadouri = `wadouri:${fullUrl}`; - - const isLoaded = dataSetCacheManager.isLoaded(fullUrl); - if (isLoaded) { - const dataSet = dataSetCacheManager.get(fullUrl); - createMetadata(wadouri, dataSet, viewerData.studies); - resolve(viewerData); - } else { - const dataSetPromise = dataSetCacheManager.load(fullUrl); - dataSetPromise.then((dataSet) => { - // Reject if it is canceled/destroyed - if (self.destroyed) { - reject(); - return; - } - - createMetadata(wadouri, dataSet, viewerData.studies); - resolve(viewerData); - }).catch(self.handleError); - } - }); - } - - /** - * Get all files and folders in the given folder path - * @param folderPath - */ - async getFolderContents(folderPath) { - const self = this; - const { context } = this; - - return new Promise((resolve, reject) => { - const filePromise = context.fileList.filesClient.getFolderContents(folderPath); - filePromise.then((status, files) => { - // Reject if it is canceled/destroyed - if (self.destroyed) { - reject(); - return; - } - - resolve(files); - }); - }); - } - - /** - * Get all DICOM files in all levels of the folder in parallel - * @param files - */ - getAllDicomFiles(files) { - const self = this; - const noExtension = 'application/octet-stream'; - - return new Promise((resolve, reject) => { - let allDicomFiles = files.filter(file => file.mimetype === self.mimeType || file.mimetype === noExtension); - - const folderMimeType = 'httpd/unix-directory'; - const folders = files.filter(file => file.mimetype === folderMimeType); - - const filePromises = []; - - for (let i = 0; i < folders.length; i++) { - // Reject if it is canceled/destroyed - if (self.destroyed) { - reject(); - return; - } - - const folder = folders[i]; - const folderPath = `${folder.path}/${folder.name}`; - - const filePromise = new Promise((fileResolve, fileReject) => { - const folderPromise = self.getFolderContents(folderPath); - folderPromise.then((subFiles) => { - // Reject if it is canceled/destroyed - if (self.destroyed) { - fileReject(); - return; - } - - const subDicomFilesPromise = self.getAllDicomFiles(subFiles); - subDicomFilesPromise.then((subDicomFiles) => { - // Reject if it is canceled/destroyed - if (self.destroyed) { - fileReject(); - return; - } - - fileResolve(subDicomFiles); - }).catch(self.handleError); - }).catch(self.handleError); - }); - filePromises.push(filePromise); - } - - if (filePromises.length < 1) { - resolve(allDicomFiles); - } else { - // Wait for all files to read in parallel - Promise.all(filePromises).then((subDicomFiles) => { - // Reject if it is canceled/destroyed - if (self.destroyed) { - reject(); - return; - } - - allDicomFiles = allDicomFiles.concat(...subDicomFiles); - resolve(allDicomFiles); - }).catch(self.handleError); - } - }); - } - - /** - * Read all DICOM files and wait for all to be read - */ - async readAllDicomFiles() { - const folderPath = `${this.context.dir}/${this.fileName}`; - const files = await this.getFolderContents(folderPath); - const allDicomFiles = await this.getAllDicomFiles(files); - return allDicomFiles; - } - - /** - * Load multiple instances - */ - loadMultipleDICOMInstances(options) { - const { context } = this; - const self = this; - - return new Promise((resolve, reject) => { - this.readAllDicomFiles().then((allDicomFiles) => { - // Reject if it is canceled/destroyed - if (self.destroyed) { - reject(); - return; - } - - // Warn if no DICOM file is available - if (!allDicomFiles || !allDicomFiles.length) { - self.noAvailableDicomFileWarning(); - return; - } - - const allImagePromises = []; - const imagesData = []; - let loadedImageCount = 0; - - const updateLoadingPercentage = () => { - loadedImageCount += 1; - const percentage = Math.floor((loadedImageCount / allDicomFiles.length) * 100); - const $loadingPercentage = $('#loadingPercentage'); - $loadingPercentage.text(percentage); - }; - - for (let i = 0; i < allDicomFiles.length; i++) { - // Reject if it is canceled/destroyed - if (self.destroyed) { - reject(); - return; - } - - const file = allDicomFiles[i]; - const fileUrl = context.fileList.getDownloadUrl(file.name, file.path); - const fullUrl = generateFullUrl(fileUrl); - const wadouri = `wadouri:${fullUrl}`; - const isFileToJump = options && options.jumpToFileName === file.name; - - const { dataSetCacheManager } = cornerstoneWADOImageLoader.wadouri; - const isLoaded = dataSetCacheManager.isLoaded(fullUrl); - - if (isLoaded) { - const dataSet = dataSetCacheManager.get(fullUrl); - - const imageData = { - dataSet, - wadouri, - }; - - if (isFileToJump) { - imageData.imageToJump = { - studyInstanceUid: dataSet.string(STUDY_INSTANCE_UID), - seriesInstanceUid: dataSet.string(SERIES_INSTANCE_UID), - sopInstanceUid: dataSet.string(SOP_INSTANCE_UID) - }; - } - - imagesData.push(imageData); - - updateLoadingPercentage(); - - // Resolve immediately because it is in cache - allImagePromises.push(Promise.resolve()); - } else { - const imagePromise = new Promise((imageResolve, imageReject) => { - const dataSetPromise = dataSetCacheManager.load(fullUrl); - dataSetPromise.then((dataSet) => { - // Reject if it is canceled/destroyed - if (self.destroyed) { - imageReject(); - return; - } - - const imageData = { - dataSet, - wadouri, - }; - - if (isFileToJump) { - imageData.imageToJump = { - studyInstanceUid: dataSet.string(STUDY_INSTANCE_UID), - seriesInstanceUid: dataSet.string(SERIES_INSTANCE_UID), - sopInstanceUid: dataSet.string(SOP_INSTANCE_UID) - }; - } - - imagesData.push(imageData); - - updateLoadingPercentage(); - - imageResolve(); - }).catch(() => imageReject()); - }); - - // Resolve when image is loaded - allImagePromises.push(imagePromise); - } - } - - // Handle when all images are loaded - Promise.all(Array.from(allImagePromises.map(p => p.catch(() => null)))).then(() => { - // Reject if it is canceled/destroyed - if (self.destroyed) { - reject(); - return; - } - - // Stop if there is no available image data - if (!imagesData.length) { - self.noAvailableDicomFileWarning(); - return; - } - - const viewerData = { - studies: [] - }; - - // Create metadata and set into viewerData - imagesData.forEach((imageData) => { - if (imageData.imageToJump) { - viewerData.imageToJump = imageData.imageToJump; - } - createMetadata(imageData.wadouri, imageData.dataSet, viewerData.studies); - }); - - // Sort series in viewerData - viewerData.studies.forEach((study) => { - study.seriesList.sort((a, b) => parseInt(a.seriesNumber, 10) - parseInt(b.seriesNumber, 10)); - }); - - // Resolve when all images are loaded and ready to display - resolve(viewerData); - }).catch(self.handleError); - }).catch(self.handleError); - }); - } -} - -export default ImageLoader; diff --git a/src/components/dicomViewer/index.js b/src/components/dicomViewer/index.js deleted file mode 100644 index 15c0417..0000000 --- a/src/components/dicomViewer/index.js +++ /dev/null @@ -1 +0,0 @@ -import './registerDicomViewer'; diff --git a/src/components/dicomViewer/initializeViewerMain.js b/src/components/dicomViewer/initializeViewerMain.js deleted file mode 100644 index 6e90c71..0000000 --- a/src/components/dicomViewer/initializeViewerMain.js +++ /dev/null @@ -1,72 +0,0 @@ -import $ from 'jquery'; -import { cornerstone } from '../../lib/cornerstonejs'; -import { DCMViewer } from '../../lib/viewerMain/index'; -import { DCMViewerLog } from '../../lib/DCMViewerLog'; - -export default function initializeViewerMain(viewerData) { - // Hide loading view - $('.loadingViewerMain').css({ display: 'none' }); - - DCMViewer.ui.hasMultipleInstances = false; - - // Manage resizing of viewport - window.ResizeViewportManager = window.ResizeViewportManager || new DCMViewer.viewerbase.ResizeViewportManager(); - - window.addEventListener('resize', window.ResizeViewportManager.getResizeHandler()); - - // Reload previous series data - if (DCMViewer.viewer.data && DCMViewer.viewer.data.loadedSeriesData) { - DCMViewerLog.info('Reloading previous loadedSeriesData'); - DCMViewer.viewer.loadedSeriesData = DCMViewer.viewer.data.loadedSeriesData; - } else { - DCMViewerLog.info('Setting default viewer data'); - DCMViewer.viewer.loadedSeriesData = {}; - DCMViewer.viewer.data = {}; - DCMViewer.viewer.data.loadedSeriesData = DCMViewer.viewer.loadedSeriesData; - - // Update the viewer data object - DCMViewer.viewer.data.viewportColumns = 1; - DCMViewer.viewer.data.viewportRows = 1; - DCMViewer.viewer.data.activeViewport = 0; - DCMViewer.viewer.data.viewportIndex = 0; - } - - // Update Studies - DCMViewer.viewer.studies = []; - DCMViewer.viewer.StudyMetadataList = []; - - DCMViewer.viewer.data.studyInstanceUids = []; - viewerData.studies.forEach((study) => { - const studyMetadata = new DCMViewer.metadata.StudyMetadata(study, study.studyInstanceUid); - let { displaySets } = study; - - if (!study.displaySets) { - displaySets = DCMViewer.viewerbase.sortingManager.getDisplaySets(studyMetadata); - study.displaySets = displaySets; - } - - // Sort display sets - studyMetadata.setDisplaySets(displaySets); - studyMetadata.sortSeriesByDisplaySets(); - - study.selected = true; - DCMViewer.viewer.Studies.push(study); - DCMViewer.viewer.StudyMetadataList.push(studyMetadata); - DCMViewer.viewer.data.studyInstanceUids.push(study.studyInstanceUid); - - const hasMultipleInstances = study.seriesList.filter(series => series.instances.length > 1); - - if (hasMultipleInstances.length && !DCMViewer.ui.hasMultipleInstances) { - DCMViewer.ui.hasMultipleInstances = true; - } - }); - - DCMViewer.viewerbase.data = viewerData; - - DCMViewer.viewer.metadataProvider = new DCMViewer.cornerstone.MetadataProvider(); - const metaDataProvider = DCMViewer.viewer.metadataProvider; - cornerstone.metaData.addProvider(metaDataProvider.provider.bind(metaDataProvider)); - - // Render all content - DCMViewer.ui.renderViewer(); -} diff --git a/src/components/dicomViewer/lib/createMetadata.js b/src/components/dicomViewer/lib/createMetadata.js deleted file mode 100644 index 5ba8237..0000000 --- a/src/components/dicomViewer/lib/createMetadata.js +++ /dev/null @@ -1,72 +0,0 @@ -/** - * Get required metadata of studies, series and instances - * @param wadouri - * @param dataSet - * @param studies - */ -export default function createMetadata(wadouri, dataSet, studies) { - const patientName = dataSet.string('x00100010'); - const patientId = dataSet.string('x00100020'); - if (!patientId) { - return; - } - - const studyInstanceUid = dataSet.string('x0020000d'); - if (!studyInstanceUid) { - return; - } - const studyDate = dataSet.string('x00080020'); - const studyTime = dataSet.string('x00080030'); - const studyDescription = dataSet.string('x00081030'); - - const seriesInstanceUid = dataSet.string('x0020000e'); - const seriesDescription = dataSet.string('x0008103e'); - const seriesNumber = dataSet.string('x00200011'); - const modality = dataSet.string('x00080060'); - - const sopInstanceUid = dataSet.string('x00080018'); - const rows = dataSet.uint16('x00280010'); - const instanceNumber = dataSet.string('x00200013'); - - const targetInstance = { - sopInstanceUid, - rows, - instanceNumber, - url: wadouri - }; - - const targetSeries = { - seriesInstanceUid, - seriesDescription, - seriesNumber, - modality, - instances: [targetInstance] - }; - - const targetStudy = { - patientId, - patientName, - studyInstanceUid, - studyDate, - studyTime, - studyDescription, - seriesList: [targetSeries], - }; - - const study = studies.find(entry => entry.patientId === patientId && entry.studyInstanceUid === studyInstanceUid); - if (study) { - study.seriesList = study.seriesList || []; - const series = study.seriesList.find(entry => entry.seriesInstanceUid === seriesInstanceUid); - if (series) { - series.instances = series.instances || []; - const instance = series.instances.find(entry => entry.sopInstanceUid === sopInstanceUid); - if (!instance) { - series.instances.push(targetInstance); - } - } else { - study.seriesList.push(targetSeries); - } - } else { - studies.push(targetStudy); - } -} diff --git a/src/components/dicomViewer/registerDicomViewer.js b/src/components/dicomViewer/registerDicomViewer.js deleted file mode 100644 index f153f5f..0000000 --- a/src/components/dicomViewer/registerDicomViewer.js +++ /dev/null @@ -1,8 +0,0 @@ -import DicomViewer from './classes/DicomViewer'; -import generateFullUrl from '../../lib/generateFullUrl'; - -// Add MimeType Icon -OC.MimeType._mimeTypeIcons['application/dicom'] = `${generateFullUrl(OC.filePath('dicomviewer', 'img', 'app-dark.svg'))}`; - -// Register DICOM Viewer -OC.Plugins.register('OCA.Files.FileList', new DicomViewer()); diff --git a/src/components/helpers/index.js b/src/components/helpers/index.js deleted file mode 100644 index e907a9b..0000000 --- a/src/components/helpers/index.js +++ /dev/null @@ -1,5 +0,0 @@ -import './logical'; -import './thumbnail'; -import './toolbar'; -import './translation'; -import './viewport'; diff --git a/src/components/helpers/logical.js b/src/components/helpers/logical.js deleted file mode 100644 index 8cb5a4e..0000000 --- a/src/components/helpers/logical.js +++ /dev/null @@ -1,55 +0,0 @@ -/* eslint import/no-extraneous-dependencies:0 */ - -import Handlebars from 'handlebars'; -import _ from 'underscore'; - -// Convert any value into a boolean value -Handlebars.registerHelper('bool', value => !!value); - -// Check if two values are identical -Handlebars.registerHelper('eq', (a, b) => a === b); - -// Check if two values are different -Handlebars.registerHelper('ne', (a, b) => a !== b); - -// Check if the first value is greater than the second one -Handlebars.registerHelper('gt', (a, b) => a > b); - -// Check if the first value is lesser than the second one -Handlebars.registerHelper('lt', (a, b) => a < b); - -// Check if the first value is greater than or equals the second one -Handlebars.registerHelper('gte', (a, b) => a >= b); - -// Check if the first value is lesser than or equals the second one -Handlebars.registerHelper('lte', (a, b) => a <= b); - -// Get the boolean negation for the given value -Handlebars.registerHelper('not', value => !value); - -// Check if all the given values are true -Handlebars.registerHelper('and', (...values) => { - let result = true; - _.each(_.initial(values, 1), (value) => { - if (!value) result = false; - }); - return result; -}); - -// Check if one of the given values is true -Handlebars.registerHelper('or', (...values) => { - let result = false; - _.each(_.initial(values, 1), (value) => { - if (value) result = true; - }); - return result; -}); - -// Return the second parameter if the first is true or the third if it's false -Handlebars.registerHelper('valueIf', (condition, valueIfTrue, valueIfFalse) => { - if (condition) { - return valueIfTrue; - } - - return valueIfFalse; -}); diff --git a/src/components/helpers/thumbnail.js b/src/components/helpers/thumbnail.js deleted file mode 100644 index 2e624f7..0000000 --- a/src/components/helpers/thumbnail.js +++ /dev/null @@ -1,116 +0,0 @@ -/* eslint import/no-extraneous-dependencies:0 */ - -import $ from 'jquery'; -import _ from 'underscore'; -import Handlebars from 'handlebars'; -import { cornerstone } from '../../lib/cornerstonejs'; -import { DCMViewer } from '../../lib/viewerMain'; - -/** - * Create data for thumbnails - * - */ -Handlebars.registerHelper('studyThumbnails', (study) => { - if (!study) { - return; - } - - // Find the study's stacks - const stacks = study.displaySets; - - // Defines the resulting thumbnails list - const thumbnails = []; - - // Iterate over the stacks and add one by one with its index - _.each(stacks, (stack, thumbnailIndex) => { - thumbnails.push({ - thumbnailIndex, - stack - }); - }); - - return thumbnails; -}); - - -function getThumbnailImageId(stack) { - const useMiddleFrame = true; - const lastIndex = (stack.numImageFrames || stack.images.length || 1) - 1; - let imageIndex = useMiddleFrame ? Math.floor(lastIndex / 2) : 0; - let imageInstance; - - if (stack.isMultiFrame) { - imageInstance = stack.images[0]; - } else { - imageInstance = stack.images[imageIndex]; - imageIndex = undefined; - } - - return imageInstance.getImageId(imageIndex, true); -} - - -/** - * Render each thumbnail image - * - */ -Handlebars.registerHelper('imageThumbnailCanvas', function () { - setTimeout(() => { - const { stack } = this; - const { isActiveStudy } = this; - const activeThumbnail = (this.thumbnailIndex === 0); - const thumbnailCanvasId = `imageThumbnailCanvas${stack.seriesNumber}_${stack.displaySetInstanceUid}`; - const imageId = getThumbnailImageId(stack); - const $element = $(`#${thumbnailCanvasId}`); - const element = $element.get(0); - const { imageToJump } = DCMViewer.viewerbase.data; - const isActiveSeries = imageToJump && imageToJump.seriesInstanceUid && imageToJump.seriesInstanceUid === stack.seriesInstanceUid; - - // Highlight active thumbnail - if (isActiveSeries || (isActiveStudy && activeThumbnail)) { - $('.imageThumbnail').removeClass('active'); - $element.parent('.imageThumbnail').addClass('active'); - } - - // Enable element - cornerstone.enable(element); - - // Display image in thumbnail - cornerstone.loadAndCacheImage(imageId).then((image) => { - cornerstone.displayImage(element, image); - }); - - // Activate series if clicked - $element.click(() => { - DCMViewer.layoutManager.rerenderViewportWithNewDisplaySet(0, stack); - - // Highlight active series - $('.imageThumbnail').removeClass('active'); - $element.parent('.imageThumbnail').addClass('active'); - }); - }, 300); -}); - -/** - * List all modalities inside a study - * - */ -Handlebars.registerHelper('modalitiesList', (study) => { - if (!study) { - return; - } - - const { seriesList } = study; - - if (!seriesList) { - return; - } - - const modalities = _.uniq(seriesList.map(series => series.modality)); - - if (modalities.length > 1) { - return `${modalities[0]}…`; - } - - return modalities[0]; -}); diff --git a/src/components/helpers/toolbar.js b/src/components/helpers/toolbar.js deleted file mode 100644 index 314cda5..0000000 --- a/src/components/helpers/toolbar.js +++ /dev/null @@ -1,118 +0,0 @@ -/* eslint import/no-extraneous-dependencies:0 */ - -import Handlebars from 'handlebars'; -import { DCMViewer } from '../../lib/viewerMain'; - -const tools = [{ - id: 'stackScroll', - title: t('dicomviewer', 'Stack Scroll'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-bars fa-lg', -}, { - id: 'wwwc', - title: t('dicomviewer', 'Levels'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-sun-o fa-lg', -}, { - id: 'wwwcRegion', - title: t('dicomviewer', 'Levels ROI'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-square fa-lg', -}, { - id: 'zoom', - title: t('dicomviewer', 'Zoom'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-search fa-lg', -}, { - id: 'pan', - title: t('dicomviewer', 'Pan'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-arrows fa-lg', -}, { - id: 'invert', - title: t('dicomviewer', 'Invert'), - classes: 'imageViewerCommand', - iconClasses: 'fa fa-adjust fa-lg', -}, { - id: 'flipH', - title: t('dicomviewer', 'Flip H'), - classes: 'imageViewerCommand', - iconClasses: 'fa fa-ellipsis-h fa-lg', -}, { - id: 'flipV', - title: t('dicomviewer', 'Flip V'), - classes: 'imageViewerCommand', - iconClasses: 'fa fa-ellipsis-v fa-lg', -}, { - id: 'rotateL', - title: t('dicomviewer', 'Rotate L'), - classes: 'imageViewerCommand', - svgClasses: 'svgContent rotate-left', -}, { - id: 'rotateR', - title: t('dicomviewer', 'Rotate R'), - classes: 'imageViewerCommand', - svgClasses: 'svgContent rotate-right' -}, { - id: 'magnify', - title: t('dicomviewer', 'Magnify'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-circle' -}, { - id: 'length', - title: t('dicomviewer', 'Length'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-arrows-v fa-lg', -}, { - id: 'angle', - title: t('dicomviewer', 'Angle'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-angle-left fa-lg', -}, { - id: 'dragProbe', - title: t('dicomviewer', 'Probe'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-dot-circle-o fa-lg', -}, { - id: 'ellipticalRoi', - title: t('dicomviewer', 'Elliptical ROI'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-circle-o fa-lg', -}, { - id: 'rectangleRoi', - title: t('dicomviewer', 'Rectangle ROI'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-square-o fa-lg', -}, { - id: 'annotate', - title: t('dicomviewer', 'Annotate'), - classes: 'imageViewerTool', - iconClasses: 'fa fa-long-arrow-down fa-lg', -}, { - id: 'clearTools', - title: t('dicomviewer', 'Clear'), - classes: 'imageViewerCommand', - iconClasses: 'fa fa-trash fa-lg', -}, { - id: 'reset', - title: t('dicomviewer', 'Reset'), - classes: 'imageViewerCommand', - iconClasses: 'fa fa-undo fa-lg', -}, { - id: 'toggleCaptureImageDialog', - title: t('dicomviewer', 'Capture'), - classes: 'imageViewerCommand', - iconClasses: 'fa fa-camera fa-lg', -}]; - - -Handlebars.registerHelper('toolbarButtons', () => { - const activeTool = DCMViewer.tools.toolManager.getActiveTool(); - - // Highlight active tool - tools.forEach((tool) => { - tool.toolActive = (tool.id === activeTool); - }); - - return tools; -}); diff --git a/src/components/helpers/translation.js b/src/components/helpers/translation.js deleted file mode 100644 index 79743b5..0000000 --- a/src/components/helpers/translation.js +++ /dev/null @@ -1,36 +0,0 @@ -/* eslint import/no-extraneous-dependencies:0 */ - -import Handlebars from 'handlebars'; - -// AnnotationDialogs.html -Handlebars.registerHelper('EnterAnnotationText', t('dicomviewer', 'Enter your annotation')); -Handlebars.registerHelper('NewLabelText', t('dicomviewer', 'New label')); -Handlebars.registerHelper('EditAnnotationText', t('dicomviewer', 'Edit your annotation')); -Handlebars.registerHelper('OKText', t('dicomviewer', 'OK')); -Handlebars.registerHelper('RemoveMarkerText', t('dicomviewer', 'Remove Marker')); - -// CaptureImageDialog.html -Handlebars.registerHelper('CaptureImageTitleText', t('dicomviewer', 'Capture High Quality Image')); -Handlebars.registerHelper('CaptureImageDescText', t('dicomviewer', 'Please specify the dimensions, and desired type for the output image.')); -Handlebars.registerHelper('WidthText', t('dicomviewer', 'Width (px)')); -Handlebars.registerHelper('HeightText', t('dicomviewer', 'Height (px)')); -Handlebars.registerHelper('FileNameText', t('dicomviewer', 'File Name')); -Handlebars.registerHelper('FileTypeText', t('dicomviewer', 'File Type')); -Handlebars.registerHelper('ShowAnnotationsText', t('dicomviewer', 'Show Annotations')); -Handlebars.registerHelper('ImageQualityText', t('dicomviewer', 'Image Quality (%)')); -Handlebars.registerHelper('ImagePreviewText', t('dicomviewer', 'Image Preview')); -Handlebars.registerHelper('CloseText', t('dicomviewer', 'Close')); -Handlebars.registerHelper('DownloadText', t('dicomviewer', 'Download')); - -// Toolbar.html -Handlebars.registerHelper('ToggleSeriesPanelText', t('dicomviewer', 'Toggle Series Panel')); -Handlebars.registerHelper('SeriesText', t('dicomviewer', 'Series')); -Handlebars.registerHelper('MoreText', t('dicomviewer', 'More')); -Handlebars.registerHelper('CloseViewerText', t('dicomviewer', 'Close Viewer')); - -// ViewerMain.html -Handlebars.registerHelper('LoadingText', t('dicomviewer', 'Loading…')); - -// ViewportOverlay.html -Handlebars.registerHelper('SerText', t('dicomviewer', 'Ser:')); -Handlebars.registerHelper('ImgText', t('dicomviewer', 'Img:')); diff --git a/src/components/helpers/viewport.js b/src/components/helpers/viewport.js deleted file mode 100644 index 8aad5e7..0000000 --- a/src/components/helpers/viewport.js +++ /dev/null @@ -1,47 +0,0 @@ -/* eslint import/no-extraneous-dependencies:0 */ - -import Handlebars from 'handlebars'; -import moment from 'moment/min/moment-with-locales'; - -const momentLocale = OC.getLocale().replace('_', '-').toLowerCase().split('-')[0]; - -Handlebars.registerHelper('formatPN', (context) => { - if (!context) { - return; - } - - return context.replace('^', ', '); -}); - -Handlebars.registerHelper('formatDA', (context, format, options) => { - if (!context) { - return undefined; - } - const dateAsMoment = moment(context, 'YYYYMMDD').locale(momentLocale); - let strFormat = 'MMM D, YYYY'; - if (options) { - strFormat = format; - } - return dateAsMoment.format(strFormat); -}); - -Handlebars.registerHelper('formatTM', (context, options) => { - if (!context) { - return; - } - // DICOM Time is stored as HHmmss.SSS, where: - // HH 24 hour time: - // m mm 0..59 Minutes - // s ss 0..59 Seconds - // S SS SSS 0..999 Fractional seconds - // - // See MomentJS: http://momentjs.com/docs/#/parsing/string-format/ - const dateTime = moment(context, 'HHmmss.SSS').locale(momentLocale); - - let format = 'HH:mm:ss'; - if (options && options.format) { - ({ format } = options); - } - - return dateTime.format(format); -}); diff --git a/src/components/index.js b/src/components/index.js deleted file mode 100644 index 8229f33..0000000 --- a/src/components/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import './helpers'; -import './sidebar'; -import './dicomViewer'; diff --git a/src/components/templates/AnnotationDialogs.html b/src/components/templates/AnnotationDialogs.html deleted file mode 100644 index 30692f9..0000000 --- a/src/components/templates/AnnotationDialogs.html +++ /dev/null @@ -1,32 +0,0 @@ -| {{WidthText}} | -- - | -- - | -
| {{HeightText}} | -- - | -
| {{FileNameText}} | -- - | -
| {{FileTypeText}} | -- - | -
|
-
-
-
-
- |
- |
| {{ImageQualityText}} | -- - | -