Commit 0375b551 authored by r03ert0's avatar r03ert0

refactor atlasMaker to all lowercase

parent d91fcda8
......@@ -17,10 +17,10 @@ jobs:
command: 'echo "{ \"clientID\": \"$GITHUB_CLIENT_ID\", \"clientSecret\": \"$GITHUB_CLIENT_SECRET\", \"callbackURL\": \"$GITHUB_CALLBACK_URL\"}">github-keys.json'
- run:
name: Instantiate blacklist
command: 'echo {} > controller/atlasMakerServer/blacklist.json'
command: 'echo {} > controller/atlasmakerServer/blacklist.json'
- run:
name: Instantiate whitelist
command: 'echo "{}" > controller/atlasMakerServer/whitelist.json'
command: 'echo "{}" > controller/atlasmakerServer/whitelist.json'
- run:
name: Run server in background
command: 'PORT=3001 npm start'
......
......@@ -18,14 +18,14 @@ public/js/project-page.js
public/js/project-settings-page.js
public/js/user-page.js
public/lib/.DS_Store
public/lib/atlasMaker.js
public/lib/atlasMaker-tools
public/lib/atlasmaker.js
public/lib/atlasmaker-tools
public/lib/brainbox.js
scripts/atlasMaker-resources.js
scripts/atlasmaker-resources.js
test/screenshots/
tmp
view/atlasMaker/dist/
view/atlasMaker/src/tools/dist/
view/atlasmaker/dist/
view/atlasmaker/src/tools/dist/
view/brainbox/dist/
whitelist.json
ws_cfg.json
......@@ -75,8 +75,8 @@ If you want to work on BrainBox's code, you'll need a local installation:
2. clone the repo and `cd` to the brainbox directory
4. [create a new OAuth application](https://github.com/settings/applications/new) for your local brainbox url (http://localhost:3000 by default)
5. paste the keys into the github-keys.json.example file, and drop the .example
6. drop the `.example` from `controller/atlasMakerServer/blacklist.json.example`
7. drop the `.example` from `controller/atlasMakerServer/whitelist.json.example`
6. drop the `.example` from `controller/atlasmakerServer/blacklist.json.example`
7. drop the `.example` from `controller/atlasmakerServer/whitelist.json.example`
8. drop the `.example` from `blacklist.json.example`
9. drop the `.example` from `whitelist.json.example`
10. `npm install`
......@@ -94,8 +94,8 @@ These installation instructions may need to be updated.
3. `cd` to brainbox
4. [create a new OAuth application](https://github.com/settings/applications/new) for your local brainbox url (http://localhost:3000 by default)
5. paste the keys into the github-keys.json.example file, change the `callbackURL` to `"http://localhost:3000/auth/github/callback"` and drop the .example
6. drop the `.example` from `controller/atlasMakerServer/blacklist.json.example`
7. drop the `.example` from `controller/atlasMakerServer/whitelist.json.example`
6. drop the `.example` from `controller/atlasmakerServer/blacklist.json.example`
7. drop the `.example` from `controller/atlasmakerServer/whitelist.json.example`
7. make sure Docker is installed
8. `docker-compose up`
9. Then open `http://localhost:3000` in your browser.
......
......@@ -5,7 +5,7 @@
Atlas Maker Server
Roberto Toro, 25 July 2014
Launch using > node atlasMakerServer.js
Launch using > node atlasmakerServer.js
*/
const fs = require('fs');
......@@ -95,9 +95,9 @@ app.use((req, res, next) => {
// }
// { Init web socket server
const atlasMakerServer = require('./controller/atlasMakerServer/atlasMakerServer.js');
atlasMakerServer.initSocketConnection();
atlasMakerServer.dataDirectory = dirname + '/public';
const atlasmakerServer = require('./controller/atlasmakerServer/atlasmakerServer.js');
atlasmakerServer.initSocketConnection();
atlasmakerServer.dataDirectory = dirname + '/public';
// }
// { Check that the 'anyone' user exists. Insert it otherwise
......
......@@ -94,7 +94,7 @@ function bufferTag(str, sz) {
return buf;
}
const atlasMakerServer = (function() {
const atlasmakerServer = (function() {
const me = {
debug: 2,
dataDirectory: '',
......@@ -2316,7 +2316,7 @@ const atlasMakerServer = (function() {
/*
Init
*/
tracer.log("atlasMakerServer.js");
tracer.log("atlasmakerServer.js");
tracer.log("date:", new Date());
setInterval(function() { tracer.log("date:", new Date()); }, me.timeMarkInterval); // time mark
tracer.log("free memory", os.freemem());
......@@ -2605,7 +2605,7 @@ const atlasMakerServer = (function() {
return me;
}());
module.exports = atlasMakerServer;
module.exports = atlasmakerServer;
/*
Atlases
......
......@@ -5,7 +5,7 @@ const url = require('url');
const fs = require('fs');
const request = require('request');
const path = require('path');
const atlasMakerServer = require('../atlasMakerServer/atlasMakerServer');
const atlasmakerServer = require('../atlasmakerServer/atlasmakerServer');
const checkAccess = require('../checkAccess/checkAccess.js');
const dataSlices = require('../dataSlices/dataSlices.js');
......@@ -121,7 +121,7 @@ function downloadMRI(myurl, req, res, callback) {
dest = newDest;
// NOTE: getBrainAtPath has to be called with a client-side path like "/data/[md5hash]/..."
atlasMakerServer.getBrainAtPath('/data/' + hash + '/' + filename)
atlasmakerServer.getBrainAtPath('/data/' + hash + '/' + filename)
.then(mri => {
// Create json file for new dataset
const ip = req.headers['x-forwarded-for'] ||
......@@ -455,7 +455,7 @@ const reset = function reset(req, res) {
req.db.get('mri').findOne({source: myurl, backup: {$exists: 0}})
.then(mridb => {
const filename = mridb.filename;
atlasMakerServer.getBrainAtPath('/data/' + hash + '/' + filename)
atlasmakerServer.getBrainAtPath('/data/' + hash + '/' + filename)
.then(mri => {
req.db.get('mri').update({source: myurl, backup: {$exists: 0}}, {$set: {
dim: mri.dim,
......
"use strict";
const fs = require('fs');
const atlasMakerServer = require('../atlasMakerServer/atlasMakerServer');
const atlasmakerServer = require('../atlasmakerServer/atlasmakerServer');
// ExpressValidator = require('express-validator')
var validator = function (req, res, next) {
......@@ -130,7 +130,7 @@ var upload = function(req, res) {
// Check that the dimensions of the atlas are the same as its parent mri
console.log("> load parent mri");
atlasMakerServer.loadMRI(path)
atlasmakerServer.loadMRI(path)
.then(function(atlas){
console.log("atlas.dim: ",atlas.dim);
console.log("mri.dim: ",mri.dim);
......
......@@ -4,8 +4,8 @@
"private": true,
"scripts": {
"start": "PORT=3001 node ./bin/www",
"build-atlasmaker": "webpack --config webpack.atlasmaker.config.js && cp view/atlasMaker/dist/atlasMaker.js public/lib/atlasMaker.js",
"build-atlasmaker-tools": "webpack --config webpack.atlasmaker-tools.config.js && cp -r view/atlasMaker/dist/atlasMaker-tools public/lib/",
"build-atlasmaker": "webpack --config webpack.atlasmaker.config.js && cp view/atlasmaker/dist/atlasmaker.js public/lib/atlasmaker.js",
"build-atlasmaker-tools": "webpack --config webpack.atlasmaker-tools.config.js && cp -r view/atlasmaker/dist/atlasmaker-tools public/lib/",
"build-brainbox": "webpack --config webpack.brainbox.config.js && cp view/brainbox/dist/brainbox.js public/lib/brainbox.js",
"build-pages": "webpack --config webpack.pages.config.js && cp view/brainbox/dist/*-page.js public/js/",
"build": "npm run build-atlasmaker && npm run build-atlasmaker-tools && npm run build-brainbox && npm run build-pages",
......
......@@ -6,7 +6,7 @@
<title>Sloth_bear</title>
<link href='https://fonts.googleapis.com/css?family=Droid+Serif' rel='stylesheet' type='text/css'/>
<link href='https://fonts.googleapis.com/css?family=Quicksand' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/stylesheets/atlasMaker.css" />
<link rel="stylesheet" href="/stylesheets/atlasmaker.css" />
<link rel="stylesheet" href="/stylesheets/ui.css" />
<link rel="stylesheet" href="/stylesheets/loading-style.css" />
<style>
......
......@@ -15,13 +15,13 @@
<script>
DOCJS.Generate([
"/js/brainbox.js",
"/js/atlasMaker.js",
"/js/atlasMaker-draw.js",
"/js/atlasMaker-interaction.js",
"/js/atlasMaker-io.js",
"/js/atlasMaker-paint.js",
"/js/atlasMaker-ui.js",
"/js/atlasMaker-ws.js",
"/js/atlasmaker.js",
"/js/atlasmaker-draw.js",
"/js/atlasmaker-interaction.js",
"/js/atlasmaker-io.js",
"/js/atlasmaker-paint.js",
"/js/atlasmaker-ui.js",
"/js/atlasmaker-ws.js",
"/js/surfacenets-worker.js",
"/js/twoWayBinding.js"
]);
......
......@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<title>A page with a BrainBox widget</title>
<link rel="stylesheet" href="/stylesheets/atlasMaker.css" />
<link rel="stylesheet" href="/stylesheets/atlasmaker.css" />
<link rel="stylesheet" href="/stylesheets/ui.css" />
<link rel="stylesheet" href="/stylesheets/loading-style.css" />
<style>
......
......@@ -133,11 +133,11 @@ var AtlasMakerDraw = {
str="";
if(me.User.measureLength) {
var W=parseFloat($('#atlasMaker canvas').css('width'));
var w=parseFloat($('#atlasMaker canvas').attr('width'));
var W=parseFloat($('#atlasmaker canvas').css('width'));
var w=parseFloat($('#atlasmaker canvas').attr('width'));
var zx=W/w,zy=zx*me.brain_Hdim/me.brain_Wdim,p=me.User.measureLength,str1;
var W=parseFloat($('#atlasMaker canvas').css('width'));
var w=parseFloat($('#atlasMaker canvas').attr('width'));
var W=parseFloat($('#atlasmaker canvas').css('width'));
var w=parseFloat($('#atlasmaker canvas').attr('width'));
str1="M"+zx*p[0].x+","+zy*p[0].y;
for(i=1;i<p.length;i++)
str1+="L"+zx*p[i].x+","+zy*p[i].y;
......
......@@ -85,8 +85,8 @@ var BrainBox={
var def=$.Deferred();
// Add AtlasMaker and friends
$("#stereotaxic").html('<div id="atlasMaker"></div>');
$("#atlasMaker").addClass('edit-mode');
$("#stereotaxic").html('<div id="atlasmaker"></div>');
$("#atlasmaker").addClass('edit-mode');
BrainBox.loadScript('/lib/jquery-ui.min.js', function(){return window.jQuery.ui != undefined})
.then(function(){return BrainBox.loadScript('/lib/pako/pako.min.js', function(){return window.pako != undefined})})
......@@ -96,13 +96,13 @@ var BrainBox={
.then(function(){return BrainBox.loadScript('/js/twoWayBinding.js')})
.then(function(){
$.when(
BrainBox.loadScript('/js/atlasMaker-draw.js'),
BrainBox.loadScript('/js/atlasMaker-interaction.js'),
BrainBox.loadScript('/js/atlasMaker-io.js'),
BrainBox.loadScript('/js/atlasMaker-paint.js'),
BrainBox.loadScript('/js/atlasMaker-ui.js'),
BrainBox.loadScript('/js/atlasMaker-ws.js'),
BrainBox.loadScript('/js/atlasMaker.js')
BrainBox.loadScript('/js/atlasmaker-draw.js'),
BrainBox.loadScript('/js/atlasmaker-interaction.js'),
BrainBox.loadScript('/js/atlasmaker-io.js'),
BrainBox.loadScript('/js/atlasmaker-paint.js'),
BrainBox.loadScript('/js/atlasmaker-ui.js'),
BrainBox.loadScript('/js/atlasmaker-ws.js'),
BrainBox.loadScript('/js/atlasmaker.js')
).then(function () {
$.extend(AtlasMakerWidget,AtlasMakerDraw);
$.extend(AtlasMakerWidget,AtlasMakerInteraction);
......@@ -110,7 +110,7 @@ var BrainBox={
$.extend(AtlasMakerWidget,AtlasMakerPaint);
$.extend(AtlasMakerWidget,AtlasMakerUI);
$.extend(AtlasMakerWidget,AtlasMakerWS);
AtlasMakerWidget.initAtlasMaker($("#atlasMaker"))
AtlasMakerWidget.initAtlasMaker($("#atlasmaker"))
.then(function() {
def.resolve();
});
......@@ -135,7 +135,7 @@ var BrainBox={
// Copy MRI from source
$("#msgLog").html("<p>Downloading from source to server...");
// Configure MRI into atlasMaker
// Configure MRI into atlasmaker
if(param.info.success===false) {
date=new Date();
$("#msgLog").append("<p>ERROR: "+param.info.message+".");
......@@ -412,6 +412,6 @@ var BrainBox={
return BrainBox.configureBrainBox(param)
});
$('#atlasMaker').append('<div style="position:absolute;top:5px;right:5px;width:42px;height:42px;background-color:#222;border-radius:32px;border:2px solid black;z-index:10"><img style="width:32px" src="http://brainbox.dev/img/brainbox-logo-small_noFont.svg"/></div>');
$('#atlasmaker').append('<div style="position:absolute;top:5px;right:5px;width:42px;height:42px;background-color:#222;border-radius:32px;border:2px solid black;z-index:10"><img style="width:32px" src="http://brainbox.dev/img/brainbox-logo-small_noFont.svg"/></div>');
}
}
\ No newline at end of file
......@@ -143,7 +143,7 @@ var params = {{{params}}};
var mriInfo = {{{mriInfo}}};
const info_proxy = {};
</script>
<script src="/lib/atlasMaker.js"></script>
<script src="/lib/atlasmaker.js"></script>
<script src="/lib/brainbox.js"></script>
<script src="/js/mri-page.js"></script>
<script>
......
......@@ -98,7 +98,7 @@
const projectInfo={{{projectInfo}}};
const info_proxy = {};
</script>
<script src="/lib/atlasMaker.js"></script>
<script src="/lib/atlasmaker.js"></script>
<script src="/lib/brainbox.js"></script>
<script src="/js/project-page.js"></script>
<script>
......
......@@ -174,7 +174,7 @@
</div>
<script src="/lib/atlasMaker.js"></script>
<script src="/lib/atlasmaker.js"></script>
<script src="/lib/brainbox.js"></script>
<script>
var projectInfo={{{projectInfo}}};
......
......@@ -121,8 +121,8 @@ export var AtlasMakerDraw = {
str = "";
if(me.User.measureLength) {
var W = parseFloat($('#atlasMaker canvas').css('width'));
var w = parseFloat($('#atlasMaker canvas').attr('width'));
var W = parseFloat($('#atlasmaker canvas').css('width'));
var w = parseFloat($('#atlasmaker canvas').attr('width'));
var zx = W/w;
var zy = zx*me.brain_Hdim/me.brain_Wdim;
var p = me.User.measureLength;
......
......@@ -91,7 +91,7 @@ export var AtlasMakerInteraction = {
case 'Adjust':
me.User.tool = 'adjust';
if($("#adjust").length==0) {
me.loadScript("/lib/atlasMaker-tools/adjust.js");
me.loadScript("/lib/atlasmaker-tools/adjust.js");
}
break;
case 'Eyedrop':
......@@ -204,8 +204,8 @@ export var AtlasMakerInteraction = {
$('body').append(black);
// configure display mode
$("body").addClass('atlasMaker-fullscreen');
$("#atlasMaker")
$("body").addClass('atlasmaker-fullscreen');
$("#atlasmaker")
.detach()
.appendTo('body');
me.resizeWindow();
......@@ -221,8 +221,8 @@ export var AtlasMakerInteraction = {
$("#blackOverlay").remove();
// go back to display mode
$("body").removeClass('atlasMaker-fullscreen');
$("#atlasMaker").detach()
$("body").removeClass('atlasmaker-fullscreen');
$("#atlasmaker").detach()
.appendTo('#stereotaxic');
me.resizeWindow();
me.fullscreen = false;
......@@ -400,10 +400,10 @@ export var AtlasMakerInteraction = {
*/
initCursor: function initCursor() {
var me = AtlasMakerWidget;
var W = parseFloat($('#atlasMaker canvas').css('width'));
var H = parseFloat($('#atlasMaker canvas').css('height'));
var w = parseFloat($('#atlasMaker canvas').attr('width'));
var h = parseFloat($('#atlasMaker canvas').attr('height'));
var W = parseFloat($('#atlasmaker canvas').css('width'));
var H = parseFloat($('#atlasmaker canvas').css('height'));
var w = parseFloat($('#atlasmaker canvas').attr('width'));
var h = parseFloat($('#atlasmaker canvas').attr('height'));
me.Crsr.x = parseInt(w/2);
me.Crsr.y = parseInt(h/2);
......@@ -464,11 +464,11 @@ export var AtlasMakerInteraction = {
var me = AtlasMakerWidget;
e.preventDefault();
var W = parseFloat($('#atlasMaker canvas').css('width'));
var H = parseFloat($('#atlasMaker canvas').css('height'));
var w = parseFloat($('#atlasMaker canvas').attr('width'));
var h = parseFloat($('#atlasMaker canvas').attr('height'));
var o = $('#atlasMaker canvas').offset();
var W = parseFloat($('#atlasmaker canvas').css('width'));
var H = parseFloat($('#atlasmaker canvas').css('height'));
var w = parseFloat($('#atlasmaker canvas').attr('width'));
var h = parseFloat($('#atlasmaker canvas').attr('height'));
var o = $('#atlasmaker canvas').offset();
var x = parseInt((e.pageX-o.left)*(w/W));
// i have to add here the compensation for rectangular pixels: f(brain_Wdim, brain_Hdim)
var y = parseInt((e.pageY-o.top)*(h/H));
......@@ -484,11 +484,11 @@ export var AtlasMakerInteraction = {
mousemove: function mousemove(e) {
var me = AtlasMakerWidget;
e.preventDefault();
var W = parseFloat($('#atlasMaker canvas').css('width'));
var H = parseFloat($('#atlasMaker canvas').css('height'));
var w = parseFloat($('#atlasMaker canvas').attr('width'));
var h = parseFloat($('#atlasMaker canvas').attr('height'));
var o = $('#atlasMaker canvas').offset();
var W = parseFloat($('#atlasmaker canvas').css('width'));
var H = parseFloat($('#atlasmaker canvas').css('height'));
var w = parseFloat($('#atlasmaker canvas').attr('width'));
var h = parseFloat($('#atlasmaker canvas').attr('height'));
var o = $('#atlasmaker canvas').offset();
var x = parseInt((e.pageX-o.left)*(w/W));
var y = parseInt((e.pageY-o.top)*(h/H));
......@@ -520,11 +520,11 @@ export var AtlasMakerInteraction = {
var me = AtlasMakerWidget;
e.preventDefault();
var W = parseFloat($('#atlasMaker canvas').css('width'));
var H = parseFloat($('#atlasMaker canvas').css('height'));
var w = parseFloat($('#atlasMaker canvas').attr('width'));
var h = parseFloat($('#atlasMaker canvas').attr('height'));
var o = $('#atlasMaker canvas').offset();
var W = parseFloat($('#atlasmaker canvas').css('width'));
var H = parseFloat($('#atlasmaker canvas').css('height'));
var w = parseFloat($('#atlasmaker canvas').attr('width'));
var h = parseFloat($('#atlasmaker canvas').attr('height'));
var o = $('#atlasmaker canvas').offset();
var touchEvent;
if(e.originalEvent) { touchEvent = e.originalEvent.changedTouches[0]; } else { touchEvent = e.changedTouches[0]; }
var x = parseInt((touchEvent.pageX-o.left)*(w/W));
......@@ -571,11 +571,11 @@ export var AtlasMakerInteraction = {
e.preventDefault();
var W = parseFloat($('#atlasMaker canvas').css('width'));
var H = parseFloat($('#atlasMaker canvas').css('height'));
var w = parseFloat($('#atlasMaker canvas').attr('width'));
var h = parseFloat($('#atlasMaker canvas').attr('height'));
var o = $('#atlasMaker canvas').offset();
var W = parseFloat($('#atlasmaker canvas').css('width'));
var H = parseFloat($('#atlasmaker canvas').css('height'));
var w = parseFloat($('#atlasmaker canvas').attr('width'));
var h = parseFloat($('#atlasmaker canvas').attr('height'));
var o = $('#atlasmaker canvas').offset();
var touchEvent;
if(e.originalEvent) { touchEvent = e.originalEvent.changedTouches[0]; } else { touchEvent = e.changedTouches[0]; }
var x = parseInt((touchEvent.pageX-o.left)*(w/W));
......
......@@ -13,10 +13,10 @@ import {AtlasMakerPaint} from './atlasmaker-paint.js';
import {AtlasMakerUI} from './atlasmaker-ui.js';
import {AtlasMakerWS} from './atlasmaker-ws.js';
import "./css/atlasMaker.css";
import "./css/atlasmaker.css";
import "./css/loading-style.css";
// import {AtlasMakerResources} from '../../dist/atlasMaker-resources.js';
// import {AtlasMakerResources} from '../../dist/atlasmaker-resources.js';
window.$ = $;
......@@ -30,7 +30,7 @@ export var AtlasMakerWidget = {
debug: 1,
hostname: 'http://localhost:3001', // '', // 'http://brainbox.pasteur.fr',
wshostname: 'localhost:8080', // 'ws://brainbox.pasteur.fr:8080',
container: null, // Element where atlasMaker lives
container: null, // Element where atlasmaker lives
brain_offcn: null,
brain_offtx: null,
canvas: null,
......@@ -163,7 +163,7 @@ export var AtlasMakerWidget = {
// Set widget div (create one if none)
if(typeof elem === 'undefined') {
me.container=$("<div class='atlasMaker'");
me.container=$("<div class='atlasmaker'");
$(document.body).append(me.container);
} else {
me.container=elem;
......
/* atlasMaker
/* atlasmaker
-----------------------------------------------------------------------------*/
#atlasMaker {
#atlasmaker {
position: relative;
background-color:#222;
color:white;
......@@ -57,7 +57,7 @@
#tools-side #tools-maximized {
pointer-events: all;
}
.atlasMaker-fullscreen #atlasMaker {
.atlasmaker-fullscreen #atlasmaker {
position:fixed;
top:0px;
left:0px;
......@@ -66,23 +66,23 @@
height:100%;
z-index:10;
}
.atlasMaker-fullscreen #tools-side {
.atlasmaker-fullscreen #tools-side {
position:fixed;
top:0px;
width:250px;
height:100%;
z-index:11;
}
.atlasMaker-fullscreen[data-toolbarDisplay=left] #tools-side {
.atlasmaker-fullscreen[data-toolbarDisplay=left] #tools-side {
left: 0;
}
.atlasMaker-fullscreen[data-toolbarDisplay=right] #tools-side {
.atlasmaker-fullscreen[data-toolbarDisplay=right] #tools-side {
right: 0;
}
.atlasMaker-fullscreen[data-toolbarDisplay=left] #text-layer {
.atlasmaker-fullscreen[data-toolbarDisplay=left] #text-layer {
text-align: right;
}
.atlasMaker-fullscreen[data-toolbarDisplay=right] #text-layer {
.atlasmaker-fullscreen[data-toolbarDisplay=right] #text-layer {
text-align: left;
}
......@@ -97,11 +97,11 @@
margin: 10px;
cursor: pointer;
}
.atlasMaker-fullscreen[data-toolbarDisplay=left] #tools-minimized div {
.atlasmaker-fullscreen[data-toolbarDisplay=left] #tools-minimized div {
top: 0;
left: 0;
}
.atlasMaker-fullscreen[data-toolbarDisplay=right] #tools-minimized div {
.atlasmaker-fullscreen[data-toolbarDisplay=right] #tools-minimized div {
top: 0;
right: 0;
}
......@@ -109,7 +109,7 @@
#headerBlock {
display: none;
}
.atlasMaker-fullscreen #headerBlock {
.atlasmaker-fullscreen #headerBlock {
display: block;
}
......@@ -127,12 +127,12 @@
/* cursor
------------------------------- */
#atlasMaker .drawingcursor {
#atlasmaker .drawingcursor {
border: 1px solid #F00;
position: absolute;
pointer-events:none;
}
#atlasMaker .hidepaintcursor {
#atlasmaker .hidepaintcursor {
display: none;
}
......
......@@ -108,7 +108,7 @@
</div>
<script src='../../downloads/jquery-3.2.1.min.js'></script>
<script src='../atlasMaker-ui.js'></script>
<script src='../atlasmaker-ui.js'></script>
<script>
const mui = AtlasMakerUI;
mui.push($("#display-minimize"),()=>console.log("minimize"));
......
......@@ -76,7 +76,7 @@
</div>
<script src='../../downloads/jquery-3.2.1.min.js'></script>
<script src='../atlasMaker-ui.js'></script>
<script src='../atlasmaker-ui.js'></script>
<script>
const mui = AtlasMakerUI;
mui.push($("#display-minimize"),()=>console.log("minimize"));
......
......@@ -87,10 +87,10 @@ export var BrainBox={
initBrainBox: function initBrainBox() {
var pr = new Promise(function(resolve, reject) {
// Add AtlasMaker and friends
$("#stereotaxic").html('<div id="atlasMaker"></div>');
$("#atlasMaker").addClass('edit-mode');
$("#stereotaxic").html('<div id="atlasmaker"></div>');
$("#atlasmaker").addClass('edit-mode');
AtlasMakerWidget.initAtlasMaker($("#atlasMaker"))
AtlasMakerWidget.initAtlasMaker($("#atlasmaker"))
.then(function() {
resolve();
})
......@@ -118,7 +118,7 @@ export var BrainBox={
// Copy MRI from source
$("#msgLog").html("<p>Downloading from source to server...");
// Configure MRI into atlasMaker
// Configure MRI into atlasmaker
if(param.info.success===false) {
$("#msgLog").append("<p>ERROR: "+param.info.message+".");
console.log("<p>ERROR: "+param.info.message+".");
......@@ -504,7 +504,7 @@ export var BrainBox={
}
}
$('#atlasMaker').append([
$('#atlasmaker').append([
`<a href="${BrainBox.hostname}/mri?url=${param.url}">`,
'<div style="',
'position:absolute;',
......
......@@ -6,20 +6,21 @@ import 'jquery-ui/themes/base/autocomplete.css';
import 'jquery-ui/ui/core';
import 'jquery-ui/ui/widgets/autocomplete';
import freeform from '../tools/freeform.js';
import hidden from '../tools/hidden.js';
import multiple from '../tools/multiple.js';
import '../style/style.css';
import '../style/textAnnotations.css';
import '../style/ui.css';
import '../style/project-style.css';
import freeform from '../tools/freeform.js';
import hidden from '../tools/hidden.js';
import multiple from '../tools/multiple.js';
const projShortname = projectInfo.shortname;
const numFilesQuery = 20;