/belle2/masterclass/BelleIILabManual.pdf |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes: |
Deleted: svn:executable |
## -1 +0,0 ## |
-* |
\ No newline at end of property |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-application/octet-stream |
\ No newline at end of property |
Index: masterclass/license.html |
=================================================================== |
--- masterclass/license.html (revision 324) |
+++ masterclass/license.html (nonexistent) |
@@ -1,19 +0,0 @@ |
-<html> |
-<h1>Belle II Lab</h1> |
- |
-<p>Copyright (C) Rok Pestotnik, Jozef Stefan Institute, Ljubljana, March 2018<p> |
- |
-<p>This application is free software: you can redistribute it and/or modify |
-it under the terms of the GNU General Public License as published by |
-the Free Software Foundation, either version 3 of the License, or |
-(at your option) any later version.</p> |
- |
-This program is distributed in the hope that it will be useful, |
-but WITHOUT ANY WARRANTY; without even the implied warranty of |
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
-GNU General Public License for more details. |
- |
-You should have received a copy of the GNU General Public License |
-along with this program. If not, see <a href="https://www.gnu.org/licenses/gpl-3.0.en.html">GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007</a> |
- |
-</html> |
Index: masterclass/index.php |
=================================================================== |
--- masterclass/index.php (revision 324) |
+++ masterclass/index.php (revision 323) |
@@ -98,7 +98,7 @@ |
function startTask() { |
var r = document.getElementById('results'); |
- //if ( r.style.display == 'none' ) switchTask(); |
+ if ( r.style.display == 'none' ) switchTask(); |
r.innerHTML = ''; |
var btnstart = document.getElementById('btnstart'); |
btnstart.value= "Stop Analysis"; |
@@ -131,30 +131,6 @@ |
startTask(); |
} |
} |
- |
-function toProcess() { |
- window.location.hash='#btnstart'; |
- //window.location.hash='#blocklyDiv'; |
-} |
- |
-function showDebug() { |
- var btnstart = document.getElementById('btndebug'); |
- var div = document.getElementById('results'); |
- |
- if (btnstart.value=== "Show Text"){ |
- btnstart.value = "Hide Text"; |
- div.style.display = 'block'; |
- } else { |
- btnstart.value = "Show Text"; |
- div.style.display = 'none'; |
- } |
-} |
- |
-function showLicense() { |
- window.location.href="license.html"; |
-} |
- |
- |
function EventListener(e) { |
//addLog(JSON.stringify(e) ); |
@@ -161,7 +137,7 @@ |
var result = JSON.parse( e.data ); |
if(e.lastEventId == 'CLOSE') { |
- //addLog('Received CLOSE closing'); |
+ addLog('Received CLOSE closing'); |
stopTask(); |
// es.close(); |
@@ -181,9 +157,9 @@ |
var sframe = jsonobj.fName; |
- //addLog('Histogram :'+ sframe ); |
- //var r = document.getElementById('results'); |
- var r = document.getElementById('drawing'); |
+ addLog('Histogram :'+ sframe ); |
+ var r = document.getElementById('results'); |
+ //var r = document.getElementById('drawing'); |
if (document.getElementById(sframe) == null ){ |
r.insertAdjacentHTML('beforeend', '<div id="' + sframe +'" style="width:1000px; height:600px"></div><br/>'); |
r.insertAdjacentHTML('beforeend', '<div id="fit' + sframe +'" style="display: none"></div><br/>'); |
@@ -199,8 +175,7 @@ |
mform += '</form>'; |
fit.insertAdjacentHTML('beforeend', '<div id="param' + sframe +'"></div><br/>'); |
fit.insertAdjacentHTML('beforeend', mform); |
- r.insertAdjacentHTML('beforeend','<input type="button" onclick="togglevisibility(\'fit'+sframe+'\');" class="mybutton" value="Show/Hide Fit Panel" />' ); |
- r.insertAdjacentHTML('beforeend',' <input type="button" onclick="toProcess();" class="mybutton" value="To Process" /><hr/>' ); |
+ r.insertAdjacentHTML('beforeend','<input type="button" onclick="togglevisibility(\'fit'+sframe+'\');" class="mybutton" value="Show/Hide Fit Panel" /><hr/>' ); |
document.getElementById('data'+ sframe).value=result.message; |
//r.insertAdjacentHTML('beforeend', JSON.stringify(result.message)); |
} |
@@ -224,7 +199,7 @@ |
function stopTask() { |
es.close(); |
- //addLog('Task end'); |
+ addLog('Task end'); |
var btnstart = document.getElementById('btnstart'); |
btnstart.value= "Run Analysis"; |
@@ -357,11 +332,9 @@ |
<!-- <input type="button" onclick="showCode();" class="mybutton" value="Show JavaScript" /> --> |
<input type="button" id="btnstart" onclick="startAction();" class="mybutton" value="Run Analysis" /> |
+<!-- <input type="button" onclick="switchTask();" class="mybutton" value="Switch between Diagram and Results" /> --> |
<input type="button" onclick="saveBlockly();" class="mybutton" value="Save Diagram" /> |
<form style="display:inline;"><label for="file-input" class="mybutton" style="">Load Diagram</label> |
- <input type="button" id="btndebug" onclick="showDebug();" class="mybutton" value="Hide Text" /> |
- <input type="button" id="btnhelp" onclick="window.location.href='BelleIILabManual.pdf';" class="mybutton" value="Help" /> |
- <input type="button" id="btnabout" onclick="showLicense();" class="mybutton" value="About" /> |
<input type="file" style="visibility:hidden;" id="file-input" onClick="this.form.reset()" data-buttonText="Load Diagram"/></form> |
<br/> |
<progress id='progressor' value="0" max='100' style="width:95%"></progress> |
@@ -370,9 +343,9 @@ |
<br /> |
+ <div id="blocklyDiv" style="height:500px; width:95%"></div><br /> |
<div id="results" style="border:1px solid #000; padding:10px; width:95%; height:80% ; overflow:auto; background:#eee;"></div> |
<br /> |
- <div id="blocklyDiv" style="height:900px; width:95%"></div><br /> |
<script> |