pull/2/head
miguel 2020-10-18 17:16:51 +11:00
rodzic ea5af6c249
commit 82e40164f8
2 zmienionych plików z 38 dodań i 13 usunięć

Wyświetl plik

@ -54,7 +54,7 @@ section.controls div {
section.controls div label { section.controls div label {
background:rgb(94, 245, 94); background:rgb(94, 245, 94);
display: inline-block; display: inline-block;
width: 150px; width: 20%;
font-size: 0.8em; font-size: 0.8em;
text-align: right; text-align: right;
} }

Wyświetl plik

@ -58,7 +58,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.js"></script>
<script> <script>
const frequencies = [ const frequencies = [
1.8, 2.2, 2.5, 3.5, 5.0, 7.0, 10.1, 14.0, 18.068, 21.0, 24.89, 28.0 1.8, 2.2, 2.8, 3.5, 5.0, 7.0, 10.1, 14.0, 18.068, 21.0, 24.89, 28.0
]; ];
var loop_diameter_slider = document.getElementById("loop_diameter_slider"); var loop_diameter_slider = document.getElementById("loop_diameter_slider");
@ -196,12 +196,13 @@
} }
function calculateQualityFactor() { function calculateQualityFactor() {
const RL = calculateLossResistance(); const Xl = calculateInductiveReactance();
const RR = calculateRadiationResistance(); const Rl = calculateLossResistance();
const Rr = calculateRadiationResistance();
var retval = []; var retval = [];
for (let index = 0; index < RR.length; index++) { for (let index = 0; index < Xl.length; index++) {
const Q = 1.0 / (1.0 + (RL[index].y / RR[index].y)); const Q = Xl[index].y / (Rl[index].y + Rr[index].y);
retval.push({x:RL[index].x, y:Q}); retval.push({x:Xl[index].x, y:Q});
} }
return retval; return retval;
} }
@ -212,7 +213,8 @@
myChart.data.datasets[1].data = calculateInductiveReactance(); myChart.data.datasets[1].data = calculateInductiveReactance();
myChart.data.datasets[2].data = calculateTuningCapacitor(); myChart.data.datasets[2].data = calculateTuningCapacitor();
myChart.data.datasets[3].data = calculateLossResistance(); myChart.data.datasets[3].data = calculateLossResistance();
myChart.data.datasets[4].data = calculateQualityFactor(); myChart.data.datasets[4].data = calculateEfficiencyFactor();
myChart.data.datasets[5].data = calculateQualityFactor();
myChart.update(); myChart.update();
} }
@ -222,7 +224,8 @@
myChart.data.datasets[1].data = calculateInductiveReactance(); myChart.data.datasets[1].data = calculateInductiveReactance();
// myChart.data.datasets[2].data = calculateTuningCapacitor(); // myChart.data.datasets[2].data = calculateTuningCapacitor();
myChart.data.datasets[3].data = calculateLossResistance(); myChart.data.datasets[3].data = calculateLossResistance();
myChart.data.datasets[4].data = calculateQualityFactor(); myChart.data.datasets[4].data = calculateEfficiencyFactor();
myChart.data.datasets[5].data = calculateQualityFactor();
myChart.update(); myChart.update();
} }
@ -232,7 +235,8 @@
myChart.data.datasets[1].data = calculateInductiveReactance(); myChart.data.datasets[1].data = calculateInductiveReactance();
myChart.data.datasets[2].data = calculateTuningCapacitor(); myChart.data.datasets[2].data = calculateTuningCapacitor();
myChart.data.datasets[3].data = calculateLossResistance(); myChart.data.datasets[3].data = calculateLossResistance();
myChart.data.datasets[4].data = calculateQualityFactor(); myChart.data.datasets[4].data = calculateEfficiencyFactor();
myChart.data.datasets[5].data = calculateQualityFactor();
myChart.update(); myChart.update();
} }
@ -242,7 +246,8 @@
myChart.data.datasets[1].data = calculateInductiveReactance(); myChart.data.datasets[1].data = calculateInductiveReactance();
myChart.data.datasets[2].data = calculateTuningCapacitor(); myChart.data.datasets[2].data = calculateTuningCapacitor();
myChart.data.datasets[3].data = calculateLossResistance(); myChart.data.datasets[3].data = calculateLossResistance();
myChart.data.datasets[4].data = calculateQualityFactor(); myChart.data.datasets[4].data = calculateEfficiencyFactor();
myChart.data.datasets[5].data = calculateQualityFactor();
myChart.update(); myChart.update();
} }
@ -302,9 +307,18 @@
fill: false, fill: false,
borderColor: 'black', borderColor: 'black',
backgroundColor: 'black', backgroundColor: 'black',
data: calculateQualityFactor(), data: calculateEfficiencyFactor(),
borderWidth: 1, borderWidth: 1,
yAxisID: 'effID' yAxisID: 'effID'
},
{
label: 'Q Factor',
fill: false,
borderColor: 'purple',
backgroundColor: 'purple',
data: calculateQualityFactor(),
borderWidth: 1,
yAxisID: 'qID'
}] }]
}, },
options: { options: {
@ -340,7 +354,7 @@
fontStyle: 'bold' fontStyle: 'bold'
}, },
position: 'left', position: 'left',
id: 'mohmsID' id: 'mohmsID',
},{ },{
type: 'linear', type: 'linear',
display: true, display: true,
@ -363,6 +377,17 @@
}, },
position: 'right', position: 'right',
id: 'effID' id: 'effID'
},{
type: 'linear',
display: true,
scaleLabel: {
display: true,
labelString: 'Quality',
fontColor: 'purple',
fontStyle: 'bold'
},
position: 'right',
id: 'qID'
}] }]
}, },
showLines: true showLines: true