Merge pull request #44 from virtual-labs/testing

Testing
virtual-labs · Nov 8, 2024 · 5d2c34c · 5d2c34c
2 parents ed55300 + 0242beb
commit 5d2c34c
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 39 deletions.
diff --git a/experiment/simulation/css/style.css b/experiment/simulation/css/style.css
@@ -28,17 +28,23 @@
             stroke: red !important;
             stroke-width: 4 !important;
         }
-        #delete-btn {
-            display: block;
-           margin: 1px auto 1px 20px;
+        #delete-btn   {
+
+
 /*             padding: 10px; */
             background-color: red;
             color: white;
             border: none;
             cursor: pointer;
         }
 
-
+     #btnVideo {    	
+            background-color: red;
+            color: white;
+            border: none;
+            cursor: pointer;
+
+     }   
 
         .dot {
             fill: blue;

diff --git a/experiment/simulation/images/amplifier1.png b/experiment/simulation/images/amplifier1.png
diff --git a/experiment/simulation/index.html b/experiment/simulation/index.html
@@ -37,17 +37,26 @@
 
     }
 
+    .btn1 {
+        margin-left:10px;
+        margin-right: 10px;
+        float:right;
+        margin-bottom:10px;
+        padding: 7px; 
+        border:none; 
+        border-radius: 5px;
+        }
+
   .button1 {
   background-color: #004A7F;
   -webkit-border-radius: 10px;
-  border-radius: 10px;
+  border-radius: 5px;
   border: none;
   color: #FFFFFF;
   cursor: pointer;
   display: inline-block;
   font-family: Arial;
-  font-size: 15px;
- padding: 5px 10px; 
+  font-size: 15px; 
   text-align: center;
   text-decoration: none;
   -webkit-animation: glowing 1500ms infinite;
@@ -107,11 +116,9 @@
 
 
 
-	<div  class="row container" id = "rowHide" style="margin-top:10px;">
-
-	<div  class="col-sm-1">
-	</div>
-	<div  class="col-sm-3">
+	<div  class="row container-fluid" id = "rowHide" style="margin-top:10px;">
+
+	<div  class="col-sm-2">
 	 <label for="sel1" style="margin-top:5px;">Select type of load cell : </label>
 	 </div>
 
@@ -124,25 +131,18 @@
       </select>
       </div>
 
-
-
-
-
-<!-- 	 <label for="sel1">Select list (select one):</label> -->
-
-
-   <div  class="col-sm-2"> 
-      <button type="button" id="delete-btn" class="btn btn-danger" data-dismiss="modal" style="margin-bottom:10px;" hidden>Delete Selected</button>
-     </div>
+   <div  class="col-sm-7"> 
+      <button type="button" id="delete-btn" class="btn btn-danger btn1"  hidden>Delete Selected</button>
 
-     <div  class="col-sm-2"> 
-      <button type="button" id="validateCon" class="btn-info" data-dismiss="modal" data-toggle="modal" data-target="#myModal" style="margin-bottom:10px;" hidden>Validate Connection</button>
-     </div>
+      <button type="button" id="validateCon" class="btn btn-info btn1" data-dismiss="modal" data-toggle="modal" data-target="#myModal" hidden>Validate Connection</button>
 
-   <div  class="col-sm-1">
-       <button type="button" class="btn btn-danger btnMarin button1" data-toggle="modal" style="margin-bottom:10px;" data-target="#exampleModal1" id = "btnForModal">
+       <button type="button" class="btn btn-danger btn1 button1" data-toggle="modal"  data-target="#exampleModal1" id = "btnForModal" >
 	  Procedure
 	</button>
+
+	<button type="button"  id = "btnVideo" class="btn btn-danger btn1" data-toggle="modal" data-target="#exampleModal1" >
+	  Simulation Demo
+	</button>
    </div>
       </div>
 
@@ -153,7 +153,7 @@
   <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header1" >
-        <h3 class="modal-title1" id="exampleModalLabel">Procedure</h3>
+        <h3 class="modal-title1" id="exampleModalLabel" style="color:#fff;">Procedure</h3>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>

diff --git a/experiment/simulation/src/graphPage.js b/experiment/simulation/src/graphPage.js
@@ -351,9 +351,21 @@ tableMainDiv =	'<div class="col-sm-12">'
 
 
 	              $("#canvas-div-sub").html(htm);
-
-	        var htm11 = '<img src="images/amplifier.png"  class="img-responsive">'
-	        $("#main-div-conf11").append(htm11);
+	               typeCell = $("#typeCell").val();
+	        var htm11 = '';
+	         if(typeCell==15){
+//					wheatStoneCon();
+					htm11 = '<img src="images/amplifier.png"  class="img-responsive">'
+					 $("#main-div-conf11").append(htm11);
+					console.log("columnType");
+				}else if(typeCell==25){
+//					wheatStoneCon();
+					htm11 = '<img src="images/amplifier1.png"  class="img-responsive">'
+					console.log("cantilever");
+					 $("#main-div-conf11").append(htm11);
+				}
+
+//	        $("#main-div-conf11").append(htm11);
 
 
 	        var loadErrVal=0;
@@ -500,9 +512,20 @@ tableMainDiv =	'<div class="col-sm-12">'
 //		sensitivityCal = sensitivityCal.toFixed(2);
 
         var sensitivityCal1 = (ranVal1/selValue).toFixed(4);
-		var sensitivityCal2 = (sensitivityCal1*1000).toFixed(4);
+		var sensitivityCal2 = 0;
+		 typeCell = $("#typeCell").val();
+		 if(typeCell==15){
+//					wheatStoneCon();
+					sensitivityCal2 = (sensitivityCal1*1000).toFixed(4);
+					sensitivityCal = parseFloat(sensitivityCal2);
+				}else if(typeCell==25){
+//					wheatStoneCon();
+					sensitivityCal2 = (sensitivityCal1*10).toFixed(4);
+					sensitivityCal = parseFloat(sensitivityCal2);
+				}
+
 
-		sensitivityCal = parseFloat(sensitivityCal2);
+
 
 		var senseEnter = $("#sensitivity").val();
 
@@ -711,8 +734,19 @@ tableMainDiv =	'<div class="col-sm-12">'
 
 		      $("#canvas-div-sub").html(htm);
 
-	         var htm11 = '<img src="images/amplifier.png"  class="img-responsive">'
-	        $("#main-div-conf11").append(htm11);
+	        typeCell = $("#typeCell").val();
+	        var htm11 = '';
+	         if(typeCell==15){
+//					wheatStoneCon();
+					htm11 = '<img src="images/amplifier.png"  class="img-responsive">'
+					 $("#main-div-conf11").append(htm11);
+					console.log("columnType");
+				}else if(typeCell==25){
+//					wheatStoneCon();
+					htm11 = '<img src="images/amplifier1.png"  class="img-responsive">'
+					console.log("cantilever");
+					 $("#main-div-conf11").append(htm11);
+				}
 
 	        var loadErrVal=0;
 	        var selValue = 0;
@@ -851,7 +885,20 @@ tableMainDiv =	'<div class="col-sm-12">'
 	 $("#submitSensitivityCheck").click(function(){
 		$("body").css("padding","0px 0px 0px 0px");
 		var sensitivityCal1 = (ranVal1/selValue).toFixed(4);
-		var sensitivityCal2 = (sensitivityCal1*1000).toFixed(4);
+		var sensitivityCal2;
+		 typeCell = $("#typeCell").val();
+		 if(typeCell==15){
+//					wheatStoneCon();
+					sensitivityCal2 = (sensitivityCal1*1000).toFixed(4);
+					sensitivityCal = parseFloat(sensitivityCal2);
+				}else if(typeCell==25){
+//					wheatStoneCon();
+					sensitivityCal2 = (sensitivityCal1*10).toFixed(4);
+					sensitivityCal = parseFloat(sensitivityCal2);
+				}
+
+
+
 //		sensitivityCal = sensitivityCal.toFixed(2);
 		sensitivityCal = parseFloat(sensitivityCal2);
 

diff --git a/experiment/simulation/src/questions.js b/experiment/simulation/src/questions.js
@@ -1,7 +1,7 @@
 
    counterMasterJson = {};
    var ansCount = 0;	
-
+	var typeCell = 0;
 
 $( "#typeCell" ).on( "change", function() {
  $("#typeCell").prop('disabled', true);
@@ -150,7 +150,7 @@ $( "#typeCell" ).on( "change", function() {
 
 
 					}
-					var typeCell;
+
 					$('#nextLevelConfig').on('click', function() {	
 
 //	      if(ansCount != 0){

diff --git a/experiment/simulation/src/result.js b/experiment/simulation/src/result.js
@@ -422,7 +422,7 @@ let chart = Highcharts.chart('graph-div', {
         type: 'pie'
     },
     title: {
-        text: 'Observations'
+        text: ''
     },
     series: [{
         name: 'Observed',