fixed the camera jumping bug.

Signed-off-by: Nicholas Jerome <nicholas.jerome@kit.edu>

cache.yaml

@@ -1,103 +1,103 @@
-1A_02_00s_048: ''
-1A_15_30e_019: ''
-1A_15_30w_072: ''
-1A_15_45e_010: ''
-1A_15_45w_087: ''
-1A_30_00s_050: ''
-1A_30_15e_036: ''
-1A_30_15w_063: ''
-1A_30_60e_004: ''
-1A_30_60w_098: ''
-1A_45_15e_039: ''
-1A_45_15w_066: ''
-1A_45_30e_028: ''
-1A_45_30w_081: ''
-1A_45_60e_006: ''
-1A_45_60w_100: ''
-1A_60_15e_043: ''
-1A_60_15w_070: ''
-1A_60_30e_031: ''
-1A_60_30w_085: ''
-1B_15_15e_033: ''
-1B_15_15w_060: ''
-1B_15_30e_020: ''
-1B_15_30w_073: ''
-1B_30_00s_051: ''
-1C_15_30e_022: ''
-1C_15_30w_075: ''
-1C_30_00s_053: ''
-1C_60_60e_008: ''
-1C_60_60w_102: ''
-1D_15_30e_021: ''
-1D_15_30w_074: ''
-1D_30_00s_052: ''
-1D_30_30w_079: ''
-2A_02_00s_047: '1.638'
-2A_15_45e_009: '1.89'
-2A_15_45w_086: '1.829'
-2A_15_60e_001: '1.739'
-2A_15_60w_096: '1.666'
-2A_30_45e_013: '1.811'
-2A_30_45w_090: '1.776'
-2A_45_45e_014: '1.714'
-2A_60_45e_017: '1.497'
-2A_60_45w_094: '1.254'
-2C_45_45w_091: '1.6728372'
-2C_60_60w_101: '1.4102118'
-3A_15_15e_032: '1.863'
-3A_15_30e_018: '1.854'
-3A_15_30w_071: '1.744'
-3A_30_15e_035: '1.761'
-3A_30_15w_062: '1.789'
-3A_45_00s_055: '1.711'
-3A_45_15e_038: '1.693'
-3A_45_15w_065: '1.654'
-3A_45_30e_027: '1.7'
-3A_45_30w_080: '1.674'
-3A_60_00s_058: '1.46'
-3A_60_15e_042: '1.458'
-3A_60_15w_069: '1.382'
-3A_60_30e_030: '1.511'
-3A_60_30w_084: '1.379'
-3B_15_00s_044: '1.769'
-3B_15_15w_059: '1.811'
-3C_30_00s_049: '1.9551776'
-3D_30_30e_025: '1.767044189453125'
-3D_30_30w_078: '1.777392578125'
-4A_15_45e_011: '1.677'
-4A_15_45w_088: '1.592'
-4A_45_00s_056: '1.525'
-4A_45_15e_040: '1.549'
-4A_45_15w_067: '1.503'
-4A_45_45e_015: '1.598'
-4B_15_00s_045: '1.529'
-4B_15_15e_034: '1.52'
-4B_15_15w_061: '1.527'
-4C_45_45w_092: '1.5731305'
-4D_30_00s_054: '1.6454599609375'
-5A_15_30e_023: '1.628'
-5A_15_60e_002: '1.441'
-5A_30_15e_037: '1.61'
-5A_30_15w_064: '1.577'
-5A_45_30w_082: '1.428'
-5D_15_30w_076: '1.5689521484375'
-6A_02_00s_046: '1.145'
-6A_15_60w_095: '1.648'
-6A_30_45e_012: '1.753'
-6A_30_45w_089: '1.694'
-6A_30_60e_003: '1.735'
-6A_30_60w_097: '1.689'
-6A_45_30e_026: '1.642'
-6A_45_60e_005: '1.609'
-6A_45_60w_099: '1.503'
-6A_60_00s_057: '1.437'
-6A_60_15e_041: '1.48'
-6A_60_15w_068: '1.42'
-6A_60_30e_029: '1.474'
-6A_60_30w_083: '1.356'
-6A_60_45e_016: '1.457'
-6A_60_45w_093: '1.32'
-6C_60_60e_007: '1.5459464'
-6D_30_30e_024: '1.752326171875'
-6D_30_30w_077: '1.7538525390625'
-time: '2016-10-10 14:43:53'
+1A_02_00s_048: '0.9690000000000001'
+1A_15_30e_019: '1.404'
+1A_15_30w_072: '1.385'
+1A_15_45e_010: '1.385'
+1A_15_45w_087: '1.413'
+1A_30_00s_050: '1.504'
+1A_30_15e_036: '1.445'
+1A_30_15w_063: '1.484'
+1A_30_60e_004: '1.283'
+1A_30_60w_098: '1.446'
+1A_45_15e_039: '1.441'
+1A_45_15w_066: '1.505'
+1A_45_30e_028: '1.347'
+1A_45_30w_081: '1.458'
+1A_45_60e_006: '1.154'
+1A_45_60w_100: '1.431'
+1A_60_15e_043: '1.35'
+1A_60_15w_070: '1.369'
+1A_60_30e_031: '1.211'
+1A_60_30w_085: '1.373'
+1B_15_15e_033: '1.344'
+1B_15_15w_060: '1.375'
+1B_15_30e_020: '1.389'
+1B_15_30w_073: '1.14'
+1B_30_00s_051: '1.45'
+1C_15_30e_022: '1.4597762'
+1C_15_30w_075: '1.4897125'
+1C_30_00s_053: '1.492176'
+1C_60_60e_008: '1.0131686'
+1C_60_60w_102: '1.2741762'
+1D_15_30e_021: '1.389591796875'
+1D_15_30w_074: '1.449740966796875'
+1D_30_00s_052: '1.50433544921875'
+1D_30_30w_079: '1.519749145507812'
+2A_02_00s_047: '1.226'
+2A_15_45e_009: '1.406'
+2A_15_45w_086: '1.429'
+2A_15_60e_001: '1.3'
+2A_15_60w_096: '1.299'
+2A_30_45e_013: '1.351'
+2A_30_45w_090: '1.497'
+2A_45_45e_014: '1.292'
+2A_60_45e_017: '1.141'
+2A_60_45w_094: '1.25'
+2C_45_45w_091: '1.4225975'
+2C_60_60w_101: '1.2804036'
+3A_15_15e_032: '1.445'
+3A_15_30e_018: '1.409'
+3A_15_30w_071: '1.41'
+3A_30_15e_035: '1.404'
+3A_30_15w_062: '1.482'
+3A_45_00s_055: '1.507'
+3A_45_15e_038: '1.428'
+3A_45_15w_065: '1.488'
+3A_45_30e_027: '1.367'
+3A_45_30w_080: '1.548'
+3A_60_00s_058: '1.345'
+3A_60_15e_042: '1.308'
+3A_60_15w_069: '1.329'
+3A_60_30e_030: '1.171'
+3A_60_30w_084: '1.343'
+3B_15_00s_044: '1.356'
+3B_15_15w_059: '1.401'
+3C_30_00s_049: '1.5194222'
+3D_30_30e_025: '1.347306030273437'
+3D_30_30w_078: '1.547711303710938'
+4A_15_45e_011: '1.246'
+4A_15_45w_088: '1.283'
+4A_45_00s_056: '1.341'
+4A_45_15e_040: '1.313'
+4A_45_15w_067: '1.366'
+4A_45_45e_015: '1.206'
+4B_15_00s_045: '1.16'
+4B_15_15e_034: '1.184'
+4B_15_15w_061: '1.15'
+4C_45_45w_092: '1.4148018'
+4D_30_00s_054: '1.3295888671875'
+5A_15_30e_023: '1.24'
+5A_15_60e_002: '1.092'
+5A_30_15e_037: '1.288'
+5A_30_15w_064: '1.322'
+5A_45_30w_082: '1.299'
+5D_15_30w_076: '1.214766845703125'
+6A_02_00s_046: '1.033'
+6A_15_60w_095: '1.303'
+6A_30_45e_012: '1.322'
+6A_30_45w_089: '1.457'
+6A_30_60e_003: '1.255'
+6A_30_60w_097: '1.439'
+6A_45_30e_026: '1.319'
+6A_45_60e_005: '1.144'
+6A_45_60w_099: '1.38'
+6A_60_00s_057: '1.306'
+6A_60_15e_041: '1.28'
+6A_60_15w_068: '1.332'
+6A_60_30e_029: '1.21'
+6A_60_30w_083: '1.292'
+6A_60_45e_016: '1.1'
+6A_60_45w_093: '1.289'
+6C_60_60e_007: '0.9969980999999999'
+6D_30_30e_024: '1.335453857421875'
+6D_30_30w_077: '1.486044921875'
+time: '2017-01-26 14:36:53'

core.py

@@ -67,12 +67,6 @@ class RepeatedTimer(object):
 
 
 def fetchDataADEI():
-    if os.path.isfile(os.getcwd()+"/.mutex"):
-        #print("Process running...")
-        return
-    else:
-        #print("Created mutex")
-        file = open(os.getcwd()+'/.mutex', 'w+')
     
     with open("varname.yaml", 'r') as stream:
         try:
@@ -82,7 +76,6 @@ def fetchDataADEI():
             print(exc)
     if varname == None:
         print("Error: Empty varname file.")
-    	os.remove(os.getcwd()+"/.mutex")
         return
     
     cache_data = {}
@@ -121,7 +114,6 @@ def fetchDataADEI():
     shutil.copy(src_file, dst_file)
     
     
-    os.remove(os.getcwd()+"/.mutex")
 
     
 print "Start torrenting..."
@@ -160,8 +152,6 @@ class StopHandler(tornado.web.RequestHandler):
     def get(self):
         print "Stop fetchData"
         rt.stop()
-        if os.path.isfile(os.getcwd()+"/.mutex"):
-            os.remove(os.getcwd()+"/.mutex")
 
 
 class SetTimerHandler(tornado.web.RequestHandler):

index.html

@@ -32,7 +32,6 @@
         </div>
     </div>
     
-    <!--
     <div class="window-item window-unitem" id="settings">
         <div class="bar-header">
             <div class="bar-title noselect">Settings</div>
@@ -60,7 +59,6 @@
             </div>
         </div>
     </div> 
-    -->
     
     <div class="window-item" id="orientation">
         <div class="bar-header">
@@ -174,6 +172,7 @@
         var container;
         var mycontrol;
         var enableControls = true;
+        var enableRotate = false;
         var pv001;
         var data;
 	var labelFlag;
@@ -1908,6 +1907,12 @@
             } else {
                 mycontrol.enabled = false;
             }
+
+            if (enableRotate) {
+                mycontrol.rotate = true;
+            } else {
+                mycontrol.rotate = false;
+            }
             
             mycontrol.update();
 
@@ -2025,11 +2030,18 @@
             //render();
         });
         
-        $("#container").click(function() {
+        $("#container").mousedown(function() {
             enableControls = true;
+            enableRotate = true;
             animate();
             setMessage("GUI", "Selected main scene.");
         });
+        
+        $("#container").mouseup(function() {
+            enableRotate = false;
+            //animate();
+            setMessage("GUI", "Selected main scene.");
+        });
     </script>
 <script>
 jQuery(window).load(function () {