Skip to content
Snippets Groups Projects
Commit b0f4f813 authored by juanf's avatar juanf
Browse files

SSDM-7275 : Microscopy dataset viewer working on the ELN + fixes to v3

requireJS config to make this possible.
parent 78b8b742
No related branches found
No related tags found
No related merge requests found
......@@ -21,7 +21,13 @@ var require = (function() {
"jquery" : "lib/jquery/js/jquery",
"stjs" : "lib/stjs/js/stjs",
"underscore" : "lib/underscore/js/underscore",
"moment" : "lib/moment/js/moment"
"moment" : "lib/moment/js/moment",
// Backwards compatibility with V1 Components
"components" : "../../components",
// "openbis" : "../../js/openbis",
"openbis-screening" : "../../js/openbis-screening",
"bootstrap" : "../../lib/bootstrap/js/bootstrap.min",
"bootstrap-slider" : "../../lib/bootstrap-slider/js/bootstrap-slider.min"
},
shim : {
"stjs" : {
......@@ -30,6 +36,15 @@ var require = (function() {
},
"underscore" : {
exports : "_"
},
// Backwards compatibility with V1 Components
// "openbis" : {
// deps : [ "jquery" ],
// exports : "openbis"
// },
"openbis-screening" : {
deps : [ "openbis" ],
exports : "openbis"
}
}
}
......
......@@ -42,6 +42,7 @@
<!-- ELN UI Stylesheets -->
<link type="text/css" rel="stylesheet" href="./css/style.css" />
<link type="text/css" rel="stylesheet" href="/openbis/resources/components/imageviewer/css/image-viewer.css" />
<!-- Third party libraries -->
<script type="text/javascript" src="./lib/cycle/js/cycle.js"></script>
......
......@@ -357,6 +357,26 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
$wrapper.append($('<div>', { 'id' : 'fileOptionsContainer' } ));
//Microscopy images viewer MICROSCOPY_IMG
if(_this._dataSetFormModel.dataSetV3.type.code === "MICROSCOPY_IMG_CONTAINER") {
var $imageWidget = new $('<div>');
$wrapper.append($imageWidget);
require(["openbis-screening", "components/imageviewer/ImageViewerWidget" ], function(openbis, ImageViewerWidget) {
var screningFacade = new openbis(null);
screningFacade._internal.sessionToken = mainController.openbisV1._internal.sessionToken;
// Create the image viewer component for the specific data sets
var widget = new ImageViewerWidget(screningFacade, [_this._dataSetFormModel.dataSetV3.permId.permId]);
// Render the component and add it to the page
$imageWidget.append($('<legend>').text('Microscopy Viewer'));
var $imageWidgetContainer = new $('<div>');
$imageWidgetContainer.css("margin", "20px");
$imageWidget.append($imageWidgetContainer);
$imageWidgetContainer.append(widget.render());
});
}
//Show Files
var filesViewer = $('<div>', { 'id' : 'filesViewer' } );
$wrapper.append(filesViewer);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment