Skip to content
This repository has been archived by the owner on May 3, 2023. It is now read-only.

Google Summer of Code - The Oscilloscope quality measure #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Google Summer of Code - The Oscilloscope quality measure #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68a99c8
Update oscilloscope.js
jnowosinski May 9, 2013
3f1bab2
Update oscilloscope.js
jnowosinski May 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions app/circuit/oscilloscope.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,32 @@
//
getGoodnessOfScale: function() {
var self = this,

timescale,
ampscale,
goodnessOfScale = function(channel) {
var timeScale = self.signals[channel].frequency * (self._horizontalScale * 10), // 0-inf, best is 1
ampScale = (self.signals[channel].amplitude * 2) / (self._verticalScale[channel] * 8),
timeGoodness = timeScale > 1 ? 1/timeScale : timeScale, // 0-1, best is 1

if (channel==2 || channel==1)
{
timeScale = self.signals[channel].frequency * (self._horizontalScale * 10); // 0-inf, best is 1
ampScale = (self.signals[channel].amplitude * 2) / (self._verticalScale[channel] * 8);
}
else if (channel==3)//A-B
{
timeScale = Math.abs(self.signals[1].frequency-self.signals[2].frequency);
timeScale = timeScale * (self._horizontalScale * 10);
ampScale = self.signals[1].amplitude-self.signals[2].amplitude;
ampScale = (ampScale * 2) / (self._verticalScale[channel] * 8);
}
else//A+B
{
timeScale = self.signals[1].frequency+self.signals[2].frequency;
timeScale = timeScale * (self._horizontalScale * 10);
ampScale = self.signals[1].amplitude+self.signals[2].amplitude;
ampScale = (ampScale * 2) / (self._verticalScale[channel] * 8);

}

var timeGoodness = timeScale > 1 ? 1/timeScale : timeScale, // 0-1, best is 1
ampGoodness = ampScale > 1 ? 1/ampScale : ampScale,
timeScore = (timeGoodness - 0.3) / 0.5, // scaled such that 0.3 = 0 and 0.8 = 1
ampScore = (ampGoodness - 0.3) / 0.5,
Expand All @@ -299,7 +320,7 @@
return ((minScore * 3) + maxScore) / 4;
},

goodnesses = [null, null];
goodnesses = [null, null,null,null];

if (this.signals[1]) {
goodnesses[0] = goodnessOfScale([1]);
Expand All @@ -308,6 +329,15 @@
if (this.signals[2]) {
goodnesses[1] = goodnessOfScale([2]);
}
if (this.signals[2] && this.signals[1] && this.showAminusB==true)
{
goodnesses[2] = goodfnessofScale([3]);
}
if (this.signals[2] && this.signals[1] && this.showAplusB==true)
{
goodnesses[3] = goodfnessofScale([4]);
}

return goodnesses;
}

Expand Down