Skip to content
Snippets Groups Projects
Commit 8791223a authored by Xiao Gui's avatar Xiao Gui
Browse files

jugex fixes

parent 9ef15bba
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 104 additions and 40 deletions
src/atlasViewer/widgetUnit/widgetService.service.ts
+ 0
− 1
View file @ 8791223a
......@@ -130,7 +130,6 @@ function safeGetSingle(obj:any, arg:string){
}
function safeGet(obj:any, ...args:string[]){
debugger
let _obj = Object.assign({}, obj)
while(args.length > 0){
const arg = args.shift()
......
src/plugin_examples/newWebJugex/app.js
+ 1
− 1
View file @ 8791223a
This diff is collapsed.
src/plugin_examples/newWebJugex/app.js.map
+ 1
− 1
View file @ 8791223a
This diff is collapsed.
src/plugin_examples/newWebJugex/manifest.js.map
+ 1
− 1
View file @ 8791223a
{"version":3,"sources":["webpack:///webpack/bootstrap 5735c67e542cf68358f5"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,GAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 5735c67e542cf68358f5"],"sourceRoot":""}
\ No newline at end of file
{"version":3,"sources":["webpack:///webpack/bootstrap 48e9dd598f93f03d55e3"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,GAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 48e9dd598f93f03d55e3"],"sourceRoot":""}
\ No newline at end of file
src/plugin_examples/newWebJugex/script.js
+ 2
− 0
View file @ 8791223a
......@@ -67,6 +67,8 @@
singleProbeMode:true,
simpleMode:true,
ignoreCustomProbe:false,
lefthemisphere:true,
righthemisphere:true,
nPermutations:1000
},
methods: {
......
src/plugin_examples/newWebJugex/template.html
+ 89
− 34
View file @ 8791223a
......@@ -25,19 +25,14 @@
<div class="fzj.xg.newWebJugex.spacer"></div>
<div class="btn-group">
<div
@click = "simpleMode = true"
:class = "{'btn-active': simpleMode === true}"
class = "btn btn-default">
Simple
</div>
<div
@click = "simpleMode = false"
:class = "{'btn-active': simpleMode === false}"
class = "btn btn-default">
Advanced
</div>
<div class = "input-group">
<span class = "input-group-addon">
Simple mode:
</span>
<vue-checkbox
:flag = "simpleMode === true"
@togglecheckbox = "simpleMode = !simpleMode">
</vue-checkbox>
</div>
<div class="fzj.xg.newWebJugex.spacer"></div>
......@@ -104,25 +99,63 @@
<div class="fzj.xg.newWebJugex.spacer"></div>
<div
@click = "singleProbeMode = !singleProbeMode"
class = "btn btn-default"
:class = "{'btn-active': singleProbeMode === true}">
<small>
Single Probe Mode
</small>
</div>
<div
@click = "ignoreCustomProbe = !ignoreCustomProbe"
class = "btn btn-default"
:class = "{'btn-active': ignoreCustomProbe === true}">
<small>
Ignore Custom Probe
</small>
</div>
<transition name = "fade">
<div v-if = "!simpleMode">
<div class="fzj.xg.newWebJugex.spacer"></div>
<div class="input-group">
<span class="input-group-addon">
Single probe mode
</span>
<vue-checkbox
:flag = "singleProbeMode"
@togglecheckbox = "singleProbeMode = !singleProbeMode">
</vue-checkbox>
</div>
<div class="input-group">
<span class="input-group-addon">
Ignore custom probe
</span>
<vue-checkbox
:flag = "ignoreCustomProbe"
@togglecheckbox = "ignoreCustomProbe = !ignoreCustomProbe">
</vue-checkbox>
</div>
<div class="fzj.xg.newWebJugex.spacer"></div>
<div class="input-group">
<span class="input-group-addon">
Hemisphere
</span>
<div
@click = "lefthemisphere = !lefthemisphere"
:class = " lefthemisphere == true ? 'btn-active' : 'btn-inactive'"
class="btn btn-default">
Left
</div>
<div
@click = "righthemisphere = !righthemisphere"
:class = " righthemisphere == true ? 'btn-active' : 'btn-inactive'"
class="btn btn-default">
Right
</div>
</div>
<div class="fzj.xg.newWebJugex.spacer"></div>
<div class="input-group">
<span class="input-group-addon">
Number of permutations
</span>
<input v-model = "nPermutations" type="text" class="form-control">
</div>
<div class="fzj.xg.newWebJugex.spacer"></div>
</div>
</transition>
<div
@click = "startAnalysis"
......@@ -215,9 +248,20 @@
opacity: 1;
}
#fzj\.xg\.newWebJugex\.container .btn-inactive
{
transition: all 0.2s;
color:rgba(0,0,0,0.5);
text-shadow: 1px 0 0 rgba(0, 0, 0, 0.15),
-1px 0 0 rgba(0, 0, 0, 0.15),
0 1px 0 rgba(0, 0, 0, 0.15),
0 -1px 0 rgba(0, 0, 0, 0.15);
}
#fzj\.xg\.newWebJugex\.container .btn-active
{
color:rgba(255, 255, 255, 1.0);
transition: all 0.2s;
color:rgba(200, 255, 125, 1.0);
text-shadow: 1px 0 0 rgba(0, 255, 0, 0.15),
-1px 0 0 rgba(0, 255, 0, 0.15),
0 1px 0 rgba(0, 255, 0, 0.15),
......@@ -231,10 +275,10 @@
#fzj\.xg\.newWebJugex\.result .fzj\.xg\.newWebJugex\.spinner
{
animation: slidein 0.7s ease-in-out 0s infinite both;
animation: thinking 0.7s ease-in-out 0s infinite both;
}
@keyframes slidein {
@keyframes thinking {
0% { transform: translateX(0px); }
50% { transform: translateX(10px); }
100% { transform: translateX(0px); }
......@@ -245,4 +289,15 @@
{
margin-bottom: 0;
}
[darktheme="true"] #fzj\.xg\.newWebJugex\.container .checkbox-dial
{
background-color:rgba(210,210,210,1.0);
}
[darktheme="true"] #fzj\.xg\.newWebJugex\.container .checkbox-on
{
background-color:rgba(50,150,50,1.0);
}
</style>
\ No newline at end of file
src/res/css/plugin_styles.css
+ 10
− 2
View file @ 8791223a
......@@ -31,14 +31,22 @@
/* colour */
[darktheme="true"] [plugincontainer] .btn,
[darktheme="true"] [plugincontainer] .input-group-addon,
[darktheme="true"] [plugincontainer] input[type="text"],
[darktheme="true"] [plugincontainer] .panel
{
background-color:rgba(80,80,80,0.8);
background-color:rgba(81,81,81,0.8);
color:rgba(255,255,255,0.8);
}
[darktheme="true"] [plugincontainer] .input-group-addon
{
background-color:rgba(60,60,60,0.2);
color:rgba(255,255,255,0.8);
/* border-top:1px solid rgba(255,255,255,0.05);
border-left:1px solid rgba(255,255,255,0.05);
border-right:1px solid rgba(255,255,255,0.05); */
}
[darktheme="true"] [plugincontainer] hr
{
border-color:rgba(100,100,100,0.5);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment