Final Bugfixes and units addition

chrisvrose · Mar 4, 2019 · 407abbd · 407abbd
1 parent f9f3898
commit 407abbd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,24 @@
 # eee-assn-freq
+
 Project for Semester 2 - Program to calculate the effect of change in frequency on the series AC circuit
 
-Languages used: `HTML`,`CSS`,`Javascript`
+## Usage
+ - Grab the latest release based on the required platform
+
+*OR*
+
+ 1. `npm -i` - Setup all dependencies
+ 2. `npm test` - Start the app (Debugging only)
+
+## Info
+
+Languages:
+`HTML`,`CSS`,`Javascript`
+
+
 
-Base: `nodeJS` + `electron`
+Base: 
+`nodeJS` + `electron`
 
-Dependencies: `electron`,`math.js`,`plotly.js`,`jquery`
+Dependencies: 
+`electron`,`math.js`,`plotly.js`,`jquery`
diff --git a/main.js b/main.js
@@ -7,7 +7,7 @@ let graphingwin = null;
 graphSet = []
 
 function initGrapher(functionCall= ()=>{}){
-    graphingwin = new BrowserWindow({show:false,minWidth:854,minHeight:480,frame:false,webPreferences:{devTools:true}/*,parent:win*/});
+    graphingwin = new BrowserWindow({show:false,minWidth:854,minHeight:480,frame:false,webPreferences:{devTools:false}/*,parent:win*/});
     graphingwin.loadFile('./resources/grapher.html')
     graphingwin.setMenuBarVisibility(false)
     graphingwin.on('closed',()=>{
@@ -42,7 +42,7 @@ app.on('ready',()=>{
         minHeight:720,
         frame:false,
         webPreferences:{
-            devTools:true
+            devTools:false
         }
     })
     win.loadFile('./resources/index.html')

diff --git a/resources/graphing.js b/resources/graphing.js
@@ -38,11 +38,10 @@ $(document).ready(function(){
             math.round(args[args.length-1][1].i*Math.SQRT2,4),
         ]
         const prettyToolTips=[
-            `v = ${prettyVals[4]} * sin(${prettyVals[3]} * x + ${prettyVals[2]})`,
-            `i = ${prettyVals[5]} * sin(${prettyVals[3]} * x)`
+            `v = ${prettyVals[4]} * sin(${prettyVals[3]} * t + ${prettyVals[2]})`,
+            `i = ${prettyVals[5]} * sin(${prettyVals[3]} * t)`
         ]
-        $('#ordered-plots').append(`<li id='plot-list-item'><span title="${prettyToolTips[0]}">V<sub>rms</sub> = ${prettyVals[0]}</span>,<br /><span title="${prettyToolTips[1]}">I<sub>rms</sub> = ${prettyVals[1]}</span>,<br /> &#981; = ${prettyVals[2]}</li>`);
-        //console.log("YEET")
+        $('#ordered-plots').append(`<li id='plot-list-item'><span title="${prettyToolTips[0]}">V<sub>rms</sub> = ${prettyVals[0]} V</span>,<br /><span title="${prettyToolTips[1]}">I<sub>rms</sub> = ${prettyVals[1]} A</span>,<br /> &#981; = ${prettyVals[2]} rad</li>`);
         args.forEach(element => {
             if(element[0].F > maxF) maxF = element[0].F
             if(element[0].V > maxV) maxV = element[0].V

diff --git a/resources/page.js b/resources/page.js
@@ -104,20 +104,13 @@ function setResults(rState){
 
 function calculateResults(cState){
     resultStates.X = 2*Math.PI*cState.F*cState.L - (1/(2*Math.PI*cState.F*cState.C))
-    //console.log(resultStates.X)
     resultStates.Z = Math.sqrt(resultStates.X * resultStates.X + cState.R*cState.R)
     resultStates.phi = Math.atan2(resultStates.X, currentState.R)
     resultStates.i = currentState.V/resultStates.Z;
     resultStates.P = currentState.V*resultStates.i*(resultStates.cphi = Math.cos(resultStates.phi))
     resultStates.Q = currentState.V*resultStates.i*Math.sin(resultStates.phi)
     resultStates.S = currentState.V*resultStates.i
-    //resultStates.P = currentState.V * currentState.V / (resultStates.Z * resultStates.Z) * currentState.R;
-    //console.log("UPDATE",cState)
+
     setResults(resultStates)
     return null;
-}
-
-
-
-
-//ipcRenderer.send('setGWV',true);
+}