diff --git a/LoadFile.js b/LoadFile.js
index 18f862d78f4b3e5160b4e39bb9d5f2ccaeb2e79a..be863258bc033b31c7a16ac7f045d31af797eadc 100644
--- a/LoadFile.js
+++ b/LoadFile.js
@@ -57,71 +57,71 @@ makeDroppable(element, callback);
// //xmlDoc.getElementsByTagName("d:getcontenttype")[0].childNodes[0].nodeValue;
// }
//creo l'albero con treeview
-/*function getTree() {
- var tree = [
- {
- text: "XRFfilesystem",
- nodes: [
+function getTree() {
+ var tree = [
{
- text: "Pergamena-Medioevale",
- nodes: [
- {
- text: "La-muta",
- nodes: [
+ text: "XRFfilesystem",
+ nodes: [
{
- text: "La-muta",
- nodes: [
- {
- text: "file.txt",
- icon: "glyphicon glyphicon-file",
- selectedIcon: "glyphicon glyphicon-file",
- url: "https://oc-chnet.cr.cnaf.infn.it:8443/owncloud/remote.php/webdav/Documents/XRFfilesystem/Pergamena-Medioevale/La-muta/La-muta/file.txt"
- }
- ]
- }
- ]
- },
- {
- text: "file.txt",
- icon: "glyphicon glyphicon-file",
- selectedIcon: "glyphicon glyphicon-file",
- url: "https://oc-chnet.cr.cnaf.infn.it:8443/owncloud/remote.php/webdav/Documents/XRFfilesystem/Pergamena-Medioevale/file.txt"
- },
- {
- text: "file.txt",
- icon: "glyphicon glyphicon-file",
- selectedIcon: "glyphicon glyphicon-file",
- url: "https://oc-chnet.cr.cnaf.infn.it:8443/owncloud/remote.php/webdav/Documents/XRFfilesystem/Pergamena-Medioevale/file.txt"
- },
- {
- text: "file.txt",
- icon: "glyphicon glyphicon-file",
- selectedIcon: "glyphicon glyphicon-file",
- url: "https://oc-chnet.cr.cnaf.infn.it:8443/owncloud/remote.php/webdav/Documents/XRFfilesystem/Pergamena-Medioevale/file.txt"
- }
- ]
- },
- {
- text: "Raffaello",
- nodes: [
- {
- text: "La-muta",
- nodes: [
+ text: "Pergamena-Medioevale",
+ nodes: [
+ {
+ text: "La-muta",
+ nodes: [
+ {
+ text: "La-muta",
+ nodes: [
+ {
+ text: "file.txt",
+ icon: "glyphicon glyphicon-file",
+ selectedIcon: "glyphicon glyphicon-file",
+ url: "https://oc-chnet.cr.cnaf.infn.it:8443/owncloud/remote.php/webdav/Documents/XRFfilesystem/Pergamena-Medioevale/La-muta/La-muta/file.txt"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ text: "file.txt",
+ icon: "glyphicon glyphicon-file",
+ selectedIcon: "glyphicon glyphicon-file",
+ url: "https://oc-chnet.cr.cnaf.infn.it:8443/owncloud/remote.php/webdav/Documents/XRFfilesystem/Pergamena-Medioevale/file.txt"
+ },
+ {
+ text: "file.txt",
+ icon: "glyphicon glyphicon-file",
+ selectedIcon: "glyphicon glyphicon-file",
+ url: "https://oc-chnet.cr.cnaf.infn.it:8443/owncloud/remote.php/webdav/Documents/XRFfilesystem/Pergamena-Medioevale/file.txt"
+ },
+ {
+ text: "file.txt",
+ icon: "glyphicon glyphicon-file",
+ selectedIcon: "glyphicon glyphicon-file",
+ url: "https://oc-chnet.cr.cnaf.infn.it:8443/owncloud/remote.php/webdav/Documents/XRFfilesystem/Pergamena-Medioevale/file.txt"
+ }
+ ]
+ },
{
- text: "file.txt",
- icon: "glyphicon glyphicon-file",
- selectedIcon: "glyphicon glyphicon-file",
- url: "https://oc-chnet.cr.cnaf.infn.it:8443/owncloud/remote.php/webdav/Documents/XRFfilesystem/Raffaello/La-muta/file.txt"
+ text: "Raffaello",
+ nodes: [
+ {
+ text: "La-muta",
+ nodes: [
+ {
+ text: "file.txt",
+ icon: "glyphicon glyphicon-file",
+ selectedIcon: "glyphicon glyphicon-file",
+ url: "https://oc-chnet.cr.cnaf.infn.it:8443/owncloud/remote.php/webdav/Documents/XRFfilesystem/Raffaello/La-muta/file.txt"
+ }
+ ]
+ }
+ ]
}
- ]
- }
- ]
+ ]
}
- ]
- }
- ];
- return tree;
-}*/
+ ];
+ return tree;
+}
//funzione che genera automaticamente l'albero
function generateTree(xmlDoc) {
var tree = [];
@@ -228,8 +228,8 @@ $(document).ready(function () {
var parser = new DOMParser();
var xmlDoc = parser.parseFromString(contentfilesystem, "text/xml");
//ora genero l'albero
- //$('#FileTreeview').treeview({data: getTree()}); //manuale
- $('#FileTreeview').treeview({ data: generateTree(xmlDoc) }); //automatico
+ $('#FileTreeview').treeview({ data: getTree() }); //manuale
+ //$('#FileTreeview').treeview({data: generateTree(xmlDoc)}); //automatico
$('#FileTreeview').on('nodeSelected', function (e, node) {
if (node['url'] != undefined) {
openFileFromServer(node['url']);
diff --git a/LoadFile.ts b/LoadFile.ts
index 19f7a71188f347d8d48196c4964f558fc9cec720..348dded995995899a05f6ab4d72f600ee54b7c01 100644
--- a/LoadFile.ts
+++ b/LoadFile.ts
@@ -70,7 +70,7 @@ makeDroppable(element, callback);
// }
//creo l'albero con treeview
-/*function getTree() {
+function getTree() {
var tree = [
{
text: "XRFfilesystem",
@@ -134,7 +134,7 @@ makeDroppable(element, callback);
}
];
return tree;
-}*/
+}
//funzione che genera automaticamente l'albero
function generateTree(xmlDoc){
@@ -244,8 +244,8 @@ $(document).ready( function() {
var xmlDoc = parser.parseFromString(contentfilesystem, "text/xml");
//ora genero l'albero
- //$('#FileTreeview').treeview({data: getTree()}); //manuale
- $('#FileTreeview').treeview({data: generateTree(xmlDoc)}); //automatico
+ $('#FileTreeview').treeview({data: getTree()}); //manuale
+ //$('#FileTreeview').treeview({data: generateTree(xmlDoc)}); //automatico
$('#FileTreeview').on('nodeSelected', function(e, node){
if(node['url'] != undefined){
openFileFromServer(node['url']);
diff --git a/index.html b/index.html
deleted file mode 100644
index c25023d20380de8211b1c9cf8954c20f620a26f9..0000000000000000000000000000000000000000
--- a/index.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta charset="utf-8">
-
- <!--Compatibilità con Microsoft e Responsività -->
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
- <title>XRF analysis viewer</title>
-
- <!-- CSS -->
- <link href="src/css/bootstrap.min.css" rel="stylesheet" media="screen">
- <link rel="stylesheet" type="text/css" href="style.css">
- <link rel="stylesheet" type="text/css" href="src/bootstrap-treeview/dist/bootstrap-treeview.min.css">
- <link rel="stylesheet" type="text/css" href="src/bootstrap-select/dist/css/bootstrap-select.min.css">
-
- </head>
-
- <body>
- <!-- NAVBAR -->
- <div class="navbar navbar-fixed-top navbar-inverse" role="navigation" id="top-navbar">
- <div class="container-fluid">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="#">XRF Analysis Viewer</a>
- </div>
- <div class="collapse navbar-collapse" id="myNavbar">
- <ul class="nav navbar-nav navbar-right">
- <li><a href="#"><span class="glyphicon glyphicon-user"></span> Sign Up</a></li>
- <li><a href="#"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
- </ul>
- </div>
- <!-- /.nav-collapse -->
- </div>
- <!-- /.container -->
- </div>
- <!-- /.navbar -->
-
- <div id="wrapper">
- <!-- FILE-SYSTEM -->
- <button type="button" class="fs-label is-closed" id="fsbtn">
- <span class="glyphicon glyphicon-chevron-right"></span>
- </button>
- <div id="mySidenavfs" class="sidenav">
- <h3> Import File From Server </h3>
- <div id="FileTreeview"></div>
- <h3> Import File From Local Repository </h3>
- <label class="btn-bs-file btn btn-primary">
- <span class="glyphicon glyphicon-open"></span> Choose a file...
- <input id="myImport" type="file" / >
- </label>
- </div>
- <!-- ./file-system -->
-
- <!-- SETTINGS -->
- <button type="button" class="btn-settings" id="setbtn">
- <span class="glyphicon glyphicon-cog"></span>
- </button>
- <div id="mySidenavSet" class="sidenav">
- <!--<div class="panel panel-default" id="pannelSettings">-->
- <p><button id="reset" class="btn btn-primary">Reset</button></p>
- <p><div class="btn-group">
- <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
- <span class="glyphicon glyphicon-download-alt"></span>
- Export <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" role="menu">
- <li><a href="#" id="ExportImage">Map</a></li>
- <li><a href="#" id="ExportGraph">Chart</a></li>
- </ul>
- </div></p>
- <ul class="nav nav-pills nav-stacked">
- <li> <!-- Settings -->
- <a href="#setmap" data-toggle="collapse" class="DropMenu">
- Settings <span class="glyphicon glyphicon-chevron-down"></span>
- </a>
- <div id="setmap" class="collapse"><p>
- <p><button type="button" class="btn btn-primary" id="rePlot">Re-color</button></p>
- <p><div class="btn-group">
- <div class="btn-group">
- <button type="button" class="btn dropdown-toggle btn-primary" data-toggle="dropdown">Scale <span class="caret"></span></button>
- <ul class="dropdown-menu" role="menu">
- <li><a href="#" id="setlinearButton">Linear</a></li>
- <li><a href="#" id="setlogButton">Log</a></li>
- </ul>
- </div>
- <div class="btn-group">
- <button type="button" class="btn dropdown-toggle btn-primary" data-toggle="dropdown">x Label <span class="caret"></span></button>
- <ul class="dropdown-menu" role="menu">
- <li><a href="#" id="setEnergyButton">Energy</a></li>
- <li><a href="#" id="setChannelsButton">Channels</a></li>
- </ul>
- </div>
- </div></p>
- <p>Saturation<input type="range" id="SaturationSlider" value="100"></p>
- <p>Opacity<input type="range" id="TrasparencySlider" value="0"></p>
- </p></div>
- </li> <!-- ./Settings -->
- <li>
- <a href="#peackselect" data-toggle="collapse" class="DropMenu">
- Peack selection <span class="glyphicon glyphicon-chevron-down"></span>
- </a>
- <div id="peackselect" class="collapse"><p>
- <p><select class="form-control selectpicker" data-style="btn-primary" data-width="75%" data-live-search="true" id="elementSelect" onchange="setElement()">
- <option value="0">- inspect element -</option>
- <option value="1">Ca</option>
- <option value="2">Pb</option>
- <option value="3">Hg</option>
- <option value="4">Fe</option>
- <option value="5">Cu</option>
- <option value="6">Zn</option>
- <option value="7">Ti</option>
- <option value="8">K</option>
- <option value="9">Co</option>
- </select></p>
- <div class="form-group">
- <label for="spinBoxMin">Peak selection (only calibrated)</label>
- <input type="number" class="form-control" id="spinBoxMin" min="0" max="55" step="0.01">
- <input type="number" class="form-control" id="spinBoxMax" min="0" max="55" step="0.01">
- </div>
- <button id="readSpinbox" class="btn btn-primary">Select range</button>
- </p></div>
- </li>
- </ul>
- <!--</div>-->
- </div>
- <!-- ./settings -->
-
-
- <!-- COLLAPSABLE PAGE -->
- <div class="container-fluid droppable" id="myContent" dropzone="copy f:text/plain">
-
- <!-- TITOLO -->
- <div class="page-header well text-center"><h1>XRF analysis viewer</h1></div>
-
- <!-- PAGE CONTENT -->
- <div class="row">
-
- <!-- MAPPA -->
- <div class="col-md-4">
- <div class="well" id="mappa-pannel">
- <h2>XRF Image</h2>
- <canvas id="myCanvas" onmousedown="findPosDown(event);" onmouseup="findPosUp(event);">
- Browser doesn't support canvas tag
- </canvas>
- </div>
- </div>
- <!-- ./mappa -->
-
- <!-- SPETTRO -->
- <div class="col-md-8">
- <div class="well" id="chart-pannel">
- <h2>XRF Spectrum</h2>
- <p id="chart" class="p-chart"></p>
- <img id="chartToImg" style="display:none;">
- </div>
- </div>
- <!-- ./spettro -->
-
- </div>
- <!-- ./page-content -->
-
- </div>
- <!-- /.collapsable-page -->
-
- </div>
- <!-- ./wrapper -->
-
- <footer>
- <p>© CHNET 2017</p>
- <img width="150" src="Digilab2.png" class="img-responsive center-block">
- </footer>
-
- <!--Librerie -->
- <script type="text/javascript" src="src/jquery/dist/jquery.min.js"></script>
- <script type="text/javascript" src="src/js/bootstrap.min.js"></script>
- <script type="text/javascript" src="src/bootstrap-treeview/public/js/bootstrap-treeview.js"></script>
- <script type="text/javascript" src="src/bootstrap-select/dist/js/bootstrap-select.js"></script>
- <script type="text/javascript" src="LoadFile.js"></script>
- <script type="text/javascript" src="src/dygraph-combined-dev.js"></script>
- <script type="text/javascript" src="src/dygraph-extra.js"></script>
- </body>
-
-</html>