aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/jsyn/scope
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/jsyn/scope')
-rw-r--r--src/com/jsyn/scope/AudioScope.java12
-rw-r--r--src/com/jsyn/scope/TriggerModel.java5
-rw-r--r--src/com/jsyn/scope/swing/AudioScopeView.java6
-rw-r--r--src/com/jsyn/scope/swing/ScopeTriggerPanel.java5
4 files changed, 15 insertions, 13 deletions
diff --git a/src/com/jsyn/scope/AudioScope.java b/src/com/jsyn/scope/AudioScope.java
index 32268cd..9ab4a73 100644
--- a/src/com/jsyn/scope/AudioScope.java
+++ b/src/com/jsyn/scope/AudioScope.java
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@ import com.jsyn.scope.swing.AudioScopeView;
// TODO Continuous capture
/**
* Digital oscilloscope for JSyn.
- *
+ *
* @author Phil Burk (C) 2010 Mobileer Inc
*/
public class AudioScope {
@@ -90,7 +90,11 @@ public class AudioScope {
return getModel().getTriggerModel().getLevelModel().getDoubleValue();
}
- public void setViewMode(ViewMode waveform) {
+ /**
+ * Not yet implemented.
+ * @param waveform
+ */
+ public void setViewMode(ViewMode viewMode) {
// TODO Auto-generated method stub
}
diff --git a/src/com/jsyn/scope/TriggerModel.java b/src/com/jsyn/scope/TriggerModel.java
index 7081b2c..0367d71 100644
--- a/src/com/jsyn/scope/TriggerModel.java
+++ b/src/com/jsyn/scope/TriggerModel.java
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,6 @@
package com.jsyn.scope;
-import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import com.jsyn.scope.AudioScope.TriggerMode;
diff --git a/src/com/jsyn/scope/swing/AudioScopeView.java b/src/com/jsyn/scope/swing/AudioScopeView.java
index 31f1264..ec1afa3 100644
--- a/src/com/jsyn/scope/swing/AudioScopeView.java
+++ b/src/com/jsyn/scope/swing/AudioScopeView.java
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -77,7 +77,7 @@ public class AudioScopeView extends JPanel {
setMaximumSize(new Dimension(1200, 300));
}
- /** @deprecated */
+ /** @deprecated Use setControlsVisible() instead. */
@Deprecated
public void setShowControls(boolean show) {
setControlsVisible(show);
diff --git a/src/com/jsyn/scope/swing/ScopeTriggerPanel.java b/src/com/jsyn/scope/swing/ScopeTriggerPanel.java
index a5f1541..9c22aa1 100644
--- a/src/com/jsyn/scope/swing/ScopeTriggerPanel.java
+++ b/src/com/jsyn/scope/swing/ScopeTriggerPanel.java
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,6 @@ package com.jsyn.scope.swing;
import java.awt.BorderLayout;
-import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.JPanel;