Merge pull request #33 from virtual-labs/dev

Dev
virtual-labs · Oct 19, 2024 · 0dce14e · 0dce14e
2 parents 5b6e833 + 9d9704c
commit 0dce14e
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 44 deletions.
diff --git a/experiment/aim.md b/experiment/aim.md
@@ -1,12 +1,11 @@
 # Aim 
-Design of Load cell and its characterization.
+Design of Load cell and its characterization
 
 ## Objectives  
 - Understand operation of load cell
 - Configuration of load cell
-- Validate stress and strain for change in pressure.
-- Design signal conditioning for load cell. 
-- Observe performance of designed load cell.
-
+- Validate stress and strain for change in pressure
+- Design signal conditioning for load cell
+- Observe performance of designed load cell
 
 
diff --git a/experiment/experiment-name.md b/experiment/experiment-name.md
@@ -1 +1 @@
-# Design of load cell and its applications
+# Design of load cell and its characterization
diff --git a/experiment/simulation/css/style.css b/experiment/simulation/css/style.css
@@ -30,13 +30,16 @@
         }
         #delete-btn {
             display: block;
-            margin: 10px auto;
-            padding: 10px;
+           margin: 1px auto 1px 20px;
+/*             padding: 10px; */
             background-color: red;
             color: white;
             border: none;
             cursor: pointer;
         }
+
+
+
         .dot {
             fill: blue;
             stroke: none;

diff --git a/experiment/simulation/index.html b/experiment/simulation/index.html
@@ -28,6 +28,14 @@
  font-family:'digital-clock-font';
  src: url('font/digital-7.ttf');
 }
+.modal-header1{
+    text-align: center;
+    font-size: 22px;
+    font-weight: 600;
+     background-color: #001f3f; /* Navy blue background */
+    color: white; /* White text color */
+
+    }
 </style>
 
 <body style="padding: 0px 0px 0px 0px;">
@@ -41,17 +49,12 @@
 
 
 	</header>
-	<div  class="row container" id = "rowHide" style="margin-top:20px;">
-	<div  class="col-sm-2">
-
-	  <button type="button" class="btn btn-primary btnMarin" data-toggle="modal" style="margin-bottom:15px;" data-target="#exampleModal" id = "btnForModal">
-	  Procedure
-	</button>
-
-<!-- 	 <label for="sel1">Select list (select one):</label> -->
-	 </div>
+	<div  class="row container" id = "rowHide" style="margin-top:10px;">
+
+	<div  class="col-sm-1">
+	</div>
 	<div  class="col-sm-3">
-	 <label for="sel1">Select type of load cell : </label>
+	 <label for="sel1" style="margin-top:5px;">Select type of load cell : </label>
 	 </div>
 
      <div  class="col-sm-3"> 
@@ -63,27 +66,36 @@
       </select>
       </div>
 
+   <div  class="col-sm-1">
+
+	   <button type="button" class="btn btn-primary btnMarin" data-toggle="modal" style="margin-bottom:10px;" data-target="#exampleModal1" id = "btnForModal">
+	  Procedure
+	</button>
+
+<!-- 	 <label for="sel1">Select list (select one):</label> -->
+	 </div>
+
    <div  class="col-sm-2"> 
-      <button type="button" id="delete-btn" class="btn" data-dismiss="modal" style="margin-top:-1px;margin-bottom:10px;" hidden>Delete Selected</button>
+      <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-2"> 
-      <button type="button" id="validateCon" class="btn-info" data-dismiss="modal" data-toggle="modal" data-target="#myModal" style="margin-top:-1px;margin-bottom:10px;" hidden>Validate Connection</button>
+      <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>
 
       </div>
 
 
-      <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+      <div class="modal fade" id="exampleModal1" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
   <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel">PROCEDURE</h5>
+      <div class="modal-header1" >
+        <h3 class="modal-title1" id="exampleModalLabel">Procedure</h3>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
-      <div class="modal-body1" style="    overflow-y: scroll;height:600px;margin-left:10px;margin-top:10px; ">
+      <div class="modal-body11" style="    overflow-y: scroll;height:600px;margin-left:10px; ">
         ...
       </div>
       <div class="modal-footer">
@@ -92,7 +104,29 @@ <h5 class="modal-title" id="exampleModalLabel">PROCEDURE</h5>
       </div>
     </div>
   </div>
-  </div>
+</div>
+
+
+
+<!--       <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> -->
+<!--   <div class="modal-dialog modal-lg" role="document"> -->
+<!--     <div class="modal-content"> -->
+<!--       <div class="modal-header"> -->
+<!--         <h5 class="modal-title" id="exampleModalLabel">PROCEDURE</h5> -->
+<!--         <button type="button" class="close" data-dismiss="modal" aria-label="Close"> -->
+<!--           <span aria-hidden="true">&times;</span> -->
+<!--         </button> -->
+<!--       </div> -->
+<!--       <div class="modal-body1" style="    overflow-y: scroll;height:600px;margin-left:10px;margin-top:10px; "> -->
+<!--         ... -->
+<!--       </div> -->
+<!--       <div class="modal-footer"> -->
+<!--         <button type="button" class="btn btn-secondary" data-dismiss="modal">OK</button> -->
+<!-- <!--         <button type="button" class="btn btn-primary">OK</button> -->
+<!--       </div> -->
+<!--     </div> -->
+<!--   </div> -->
+<!--   </div> -->
 
 
 <div  class="row container-fluid" id="main-div" >
@@ -208,7 +242,8 @@ <h4 class="modal-title" style="font-weight: 600;"></h4>
 
 var ht = '';
 
-ht += '<li>'
+ht += '<br>'
+	 +'<li>'
 +'<strong>BASIC KNOWLEDGE:</strong>'
 +'<ol>'
 +'<li>Select the type of load cell from the options at the top.</li>'
@@ -257,9 +292,11 @@ <h4 class="modal-title" style="font-weight: 600;"></h4>
 +'</ol>'
 +'</li>'
 +'</ol>'
-$(".modal-body1").html(ht);
 
 
+$(".modal-body11").html(ht);
+$(".modal-title1").html("Procedure");
+
 </script>
 
 </html>
diff --git a/experiment/simulation/src/calculation.js b/experiment/simulation/src/calculation.js
@@ -819,7 +819,7 @@ $("#submit_load3").click(function(){
 //							   console.log(arrayJson);
 							   masterJson.demo=arrayJson;							    
 							   tableReadingAdded1();
-							   console.log(masterJson);
+//							   console.log(masterJson);
 
 			}
 

diff --git a/experiment/simulation/src/questions.js b/experiment/simulation/src/questions.js
@@ -135,7 +135,7 @@ $( "#typeCell" ).on( "change", function() {
 						tempCountJson.correctAnswer = ansCount; 
 						tempCountJson.wrongAnswer = wrongAns; 
 						counterMasterJson.questionary = tempCountJson;
-						 console.log(counterMasterJson);
+//						 console.log(counterMasterJson);
 //						 console.log(data);
 
 						 $("#btnModal").removeClass("btn-danger").addClass("btn-success");

diff --git a/experiment/simulation/src/result.js b/experiment/simulation/src/result.js
@@ -8,36 +8,36 @@ if(typeCell==15){
 	var correctVal = (counterMasterJson.questionary.correctAnswer/6).toFixed(2);
 	 quesPercent = (correctVal*100).toFixed(1);
 	quesPercent = parseFloat(quesPercent);
-    console.log(quesPercent);
+//    console.log(quesPercent);
 
 
     var config = ((1/(counterMasterJson.columnTypeConfig.wrongAreaConfig+1))*100).toFixed(1);
     config = parseFloat(config);
-    console.log(config);
+//    console.log(config);
 
     var wheatStone = ((1/(counterMasterJson.constLib.invalidCnt+1))*100).toFixed(1);
 	wheatStone = parseFloat(wheatStone);
-	console.log(wheatStone);
+//	console.log(wheatStone);
 
 	var loadCellCal1 = parseInt(counterMasterJson.stdCalculations.inValidForce)+parseInt(counterMasterJson.stdCalculations.axialCalculate)+parseInt(counterMasterJson.stdCalculations.transverseCal);
 	var loadCal = ((15/(loadCellCal1+15))*100).toFixed(1);
 	loadCal = parseFloat(loadCal);
-	console.log(loadCal);
+//	console.log(loadCal);
 
 	var outputPer = ((5/(counterMasterJson.outputVoltage.outPut+5))*100).toFixed(1);
 	outputPer = parseFloat(outputPer);
-	console.log(outputPer);
+//	console.log(outputPer);
 
 	var character = parseInt(counterMasterJson.charectarization.errorCount)+parseInt(counterMasterJson.charectarization.sensitivityCount);
 	var characterVal = ((2/(character+2))*100).toFixed(1);
 	characterVal = parseFloat(characterVal);
-	console.log(characterVal);
+//	console.log(characterVal);
 }if(typeCell==25){
 
 	var correctVal = (counterMasterJson.questionary.correctAnswer/6).toFixed(2);
 	var quesPercent = (correctVal*100).toFixed(1);
 	quesPercent = parseFloat(quesPercent);
-    console.log(quesPercent);
+//    console.log(quesPercent);
 
 
 //    var config = ((1/(counterMasterJson.columnTypeConfig.wrongAreaConfig+1))*100).toFixed(1);
@@ -46,21 +46,21 @@ if(typeCell==15){
 
     var wheatStone = ((1/(counterMasterJson.constLib.invalidCnt+1))*100).toFixed(1);
 	wheatStone = parseFloat(wheatStone);
-	console.log(wheatStone);
+//	console.log(wheatStone);
 
 	var loadCellCal1 = parseInt(counterMasterJson.stdCalculations.inValidForce)+parseInt(counterMasterJson.stdCalculations.axialCalculate)+parseInt(counterMasterJson.stdCalculations.transverseCal);
 	var loadCal = ((15/(loadCellCal1+15))*100).toFixed(1);
 	loadCal = parseFloat(loadCal);
-	console.log(loadCal);
+//	console.log(loadCal);
 
 	var outputPer = ((5/(counterMasterJson.outputVoltage.outPut+5))*100).toFixed(1);
 	outputPer = parseFloat(outputPer);
-	console.log(outputPer);
+//	console.log(outputPer);
 
 	var character = parseInt(counterMasterJson.charectarization.errorCount)+parseInt(counterMasterJson.charectarization.sensitivityCount);
 	var characterVal = ((2/(character+2))*100).toFixed(1);
 	characterVal = parseFloat(characterVal);
-	console.log(characterVal);
+//	console.log(characterVal);
 
 }	
 

diff --git a/experiment/simulation/src/table.js b/experiment/simulation/src/table.js
@@ -319,7 +319,7 @@ var width = $(window).width();
 //					}
 //					if(loadCheck!=0)
 //					{
-	                  console.log("selLoadOut : "+selLoadOut);
+//	                  console.log("selLoadOut : "+selLoadOut);
 						flg = 1;
 					bridgeCalculate();
 						$("#ebVal").prop("hidden",false);
@@ -1133,7 +1133,7 @@ $("body").css("padding","0px 0px 0px 0px");
 	 tempJson.ranOutput=ranOutput;
 	 arrayJsong.push(tempJson);
 	 graphJson.demo=arrayJsong;
-	 console.log(graphJson);
+//	 console.log(graphJson);
 				}
 
 

diff --git a/experiment/simulation/src/wheatStoneBuild.js b/experiment/simulation/src/wheatStoneBuild.js
@@ -579,7 +579,7 @@ function checkAllConnections() {
     }  
     }
     idd++;
-    console.log("idd : "+idd);
+//    console.log("idd : "+idd);
 }
 
 
@@ -602,7 +602,7 @@ function setPointerPosition(x, y) {
         clientY: y  
     });  
     const position = getCursorPosition(event);  
-    console.log(position); // This will log the new cursor position  
+//    console.log(position); // This will log the new cursor position  
 }  
 
 function handleDotDragStart(event, dot) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		# Design of load cell and its applications
		# Design of load cell and its characterization