Merge pull request #3 from virtual-labs/dev

Dev
virtual-labs · Jan 14, 2025 · 7806694 · 7806694
2 parents 1803e4f + 81ed5d6
commit 7806694
Show file tree

Hide file tree

Showing 13 changed files with 639 additions and 364 deletions.
diff --git a/experiment/simulation/css/task10.css b/experiment/simulation/css/task10.css
@@ -185,15 +185,16 @@ color: #0f69cd;
 
 #jog_dial_one,#jog_dial_two {
   position: relative;
-  width: 30px;
-  height: 30px;
+  width: 40px;
+  height: 40px;
   margin: 5px auto;
   background: #0f69cd;
   -webkit-border-radius: 150px;
   -moz-border-radius: 150px;
   -ms-border-radius: 150px;
   -o-border-radius: 150px;
   border-radius: 150px;
+  cursor:not-allowed;
 } 
 #jog_dial_3,#jog_dial_4,#jog_dial_5,#jog_dial_6{
   position: relative;

diff --git a/experiment/simulation/css/task7.css b/experiment/simulation/css/task7.css
@@ -189,15 +189,16 @@ color: #0f69cd;
 
 #jog_dial_one,#jog_dial_two {
   position: relative;
-  width: 30px;
-  height: 30px;
+  width: 40px;
+  height: 40px;
   margin: 5px auto;
   background: #0f69cd;
   -webkit-border-radius: 150px;
   -moz-border-radius: 150px;
   -ms-border-radius: 150px;
   -o-border-radius: 150px;
   border-radius: 150px;
+  cursor:not-allowed;
 } 
 #jog_dial_3,#jog_dial_4,#jog_dial_5,#jog_dial_6{
   position: relative;

diff --git a/experiment/simulation/css/task9.css b/experiment/simulation/css/task9.css
@@ -247,15 +247,16 @@ html,body{
 
   #jog_dial_one,#jog_dial_two {
     position: relative;
-    width: 30px;
-    height: 30px;
+    width: 40px;
+    height: 40px;
     margin: 5px auto;
     background: #0f69cd;
     -webkit-border-radius: 150px;
     -moz-border-radius: 150px;
     -ms-border-radius: 150px;
     -o-border-radius: 150px;
     border-radius: 150px;
+    cursor:not-allowed;
   } 
   #jog_dial_3,#jog_dial_4,#jog_dial_5,#jog_dial_6{
     position: relative;

diff --git a/experiment/simulation/index.html b/experiment/simulation/index.html
@@ -155,8 +155,8 @@
         <td>
 
           <div id="exph">
-            <h2 id="expm"> To Study The Characteristics Of Multihole Directional Coupler &nbsp; &nbsp; &nbsp; &nbsp;
-              &nbsp; &nbsp; &nbsp; &nbsp; <button ondblclick="hide()" onclick="hov()" id="help">INSTRUCTIONS</button>
+            <h2 id="expm"> Directional Coupler Characteristics &emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;
+              &nbsp; &nbsp; &nbsp; &nbsp; <button style="font-family: 'Times New Roman', Times, serif;" ondblclick="hide()" onclick="hov()" id="help">INSTRUCTIONS</button>
             </h2>
 
 
@@ -203,7 +203,7 @@ <h2 id="expm"> To Study The Characteristics Of Multihole Directional Coupler &nb
                 </div>
                 <div class="carousel-item ">
 
-                  As soon as you observe square waveform on CRO, count the division covered by the square waveform.
+                  As soon as you observe square waveform(at 150, 164, 199, 233) on CRO, count the division covered by the square waveform.
                 </div>
                 <div class="carousel-item ">
 
@@ -622,8 +622,6 @@ <h5 class="heading4">Frequency</h5>
           <td> <input value="90" id="P3" onclick="cal()">
             &nbsp; <output></output><sup>o</sup></td>
         </tr>
-
-
       </table>
 
       <div>
@@ -645,7 +643,7 @@ <h5 class="heading4">Frequency</h5>
 
 
 
-<script src="js/JogDial.js"></script>
+<script src="js/jogDial.js"></script>
 <script src="js/jsplumb1.js"></script>
 <!-- /JS -->
 

diff --git a/experiment/simulation/js/demo1.js b/experiment/simulation/js/demo1.js
@@ -1,5 +1,6 @@
 var rightconnection=false;
 var datapoints1 = [];
+var knobFlag=false;
 jsPlumb.ready(function () {
 
     var instance,
@@ -221,11 +222,15 @@ document.getElementById("check11").addEventListener("click", function () {
                   container: 'position-absolute',
                   popup:"swal2-popup"
                 },
-                title:"Good Job",      
-                text:"Correct Connection",
+                title:"Correct Connection!!",      
+                text:"Connection established",
                 icon:'success',
                 });
 
+                knobFlag=true;
+                document.getElementById('jog_dial_one').style.cursor='pointer';
+                document.getElementById('jog_dial_two').style.cursor='pointer';
+
             document.getElementById("name").style.visibility = "visible";
          document.getElementById("cch").disabled= false;
          document.getElementById("check").disabled= true;
@@ -286,7 +291,7 @@ document.getElementById("check11").addEventListener("click", function () {
                       container: 'position-absolute',
                       popup:"swal2-popup"
                     },
-                    title:'Incomplete connections',     
+                    title:'Incomplete connections!!',     
                     icon:'warning',
                     });
                 return;

diff --git a/experiment/simulation/js/demo2.js b/experiment/simulation/js/demo2.js
@@ -1,5 +1,6 @@
 var rightconnection=false;
 var datapoints1 = [];
+var knobFlag=false;
 jsPlumb.ready(function () {
 
     var instance,
@@ -221,11 +222,15 @@ document.getElementById("check11").addEventListener("click", function () {
                   container: 'position-absolute',
                   popup:"swal2-popup"
                 },
-                title:"Good Job",      
-                text:"Correct Connection",
+                title:"Correct Connection!!",      
+                text:"Connection established",
                 icon:'success',
                 });
 
+                knobFlag=true;
+                document.getElementById('jog_dial_one').style.cursor='pointer';
+                document.getElementById('jog_dial_two').style.cursor='pointer';
+
             document.getElementById("name").style.visibility = "visible";
          document.getElementById("cch").disabled= false;
          document.getElementById("check").disabled= true;
@@ -288,7 +293,7 @@ document.getElementById("check11").addEventListener("click", function () {
                   container: 'position-absolute',
                   popup:"swal2-popup"
                 },
-                text:'Incomplete connections',     
+                text:'Incomplete connections!!',     
                 icon:'warning',
                 });
             return;

diff --git a/experiment/simulation/js/demo3.js b/experiment/simulation/js/demo3.js
@@ -1,5 +1,6 @@
 var rightconnection=false;
 var datapoints1 = [];
+var knobFlag=false;
 jsPlumb.ready(function () {
 
     var instance,
@@ -221,11 +222,15 @@ document.getElementById("check11").addEventListener("click", function () {
                   container: 'position-absolute',
                   popup:"swal2-popup"
                 },
-                title:"Good Job",      
-                text:"Correct Connection",
+                title:"Correct Connection!!",      
+                text:"Connection established",
                 icon:'success',
                 });
 
+                knobFlag=true;
+                document.getElementById('jog_dial_one').style.cursor='pointer';
+                document.getElementById('jog_dial_two').style.cursor='pointer';
+
             document.getElementById("name").style.visibility = "visible";
          document.getElementById("cch").disabled= false;
          document.getElementById("check").disabled= true;
@@ -272,7 +277,7 @@ document.getElementById("check11").addEventListener("click", function () {
                       container: 'position-absolute',
                       popup:"swal2-popup"
                     },
-                    title:'No wires connected!',
+                    title:'No wires connected!!',
                     html:'Please connect <b style="color:red">A</b> &harr; <b style="color:red">D</b> and <b style="color:red">B</b> &harr; <b style="color:red">E</b>.',
                     icon:'warning',
                     });
@@ -290,7 +295,7 @@ document.getElementById("check11").addEventListener("click", function () {
                           container: 'position-absolute',
                           popup:"swal2-popup"
                         },
-                        text:'Incomplete connections',     
+                        text:'Incomplete connections!!',     
                         icon:'warning',
                         });
                     return;