Merge branch 'master' into 39-polyphase-channelizer

This commit is contained in:
Denny
2017-02-26 13:35:33 -05:00
34 changed files with 1285 additions and 1301 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -30,6 +30,7 @@ import java.util.Arrays;
import javax.swing.JPanel;
import org.apache.commons.lang3.Validate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -276,7 +277,7 @@ public class SpectrumPanel extends JPanel implements DFTResultsListener, Setting
*/
public void setZoom( int zoom )
{
assert( 0 <= zoom && zoom <= 5 );
Validate.isTrue( 0 <= zoom && zoom <= 5 );
mZoom = zoom;
}
@@ -299,7 +300,7 @@ public class SpectrumPanel extends JPanel implements DFTResultsListener, Setting
*/
public void setSampleSize( double sampleSize )
{
assert( 2.0 <= sampleSize && sampleSize <= 32.0 );
Validate.isTrue(2.0 <= sampleSize && sampleSize <= 32.0);
mDBScale = (float)( 20.0 * Math.log10( Math.pow( 2.0, sampleSize - 1 ) ) );
}