summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-03-09 23:23:07 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-03-09 23:23:07 -0500
commitfdfb331555ba8b9fcb69f9942aa0b780edb573ae (patch)
treee0d2519a8dba78eeae4ead1a7f3d490d0efb9fa7
parent9b51480997c6fd7627b065df3c9222389f7243ec (diff)
Rename the RobotCameraViewer widget to CameraServerViewer.HEADmaster
-rw-r--r--smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/CameraServerViewer.java (renamed from smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/RobotCameraViewer.java)6
-rw-r--r--smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/DefaultDisplayElementRegistrar.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/RobotCameraViewer.java b/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/CameraServerViewer.java
index 5227b0e..e36adbc 100644
--- a/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/RobotCameraViewer.java
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/CameraServerViewer.java
@@ -30,9 +30,9 @@ import java.util.Arrays;
* @author Tom Clark
* @author Ryan Cahoon
*/
-public class RobotCameraViewer extends StaticWidget implements Runnable {
+public class CameraServerViewer extends StaticWidget implements Runnable {
- public static final String NAME = "Robot Camera Viewer";
+ public static final String NAME = "Robot CameraServer Viewer";
public final IntegerProperty fpsProperty = new IntegerProperty(this, "FPS", 30);
public final MultiProperty sizeProperty;
@@ -51,7 +51,7 @@ public class RobotCameraViewer extends StaticWidget implements Runnable {
private Socket socket;
private Thread thread;
- public RobotCameraViewer() {
+ public CameraServerViewer() {
super();
sizeProperty = new MultiProperty(this, "Size");
sizeProperty.add("640x480", SIZE_640x480);
diff --git a/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/DefaultDisplayElementRegistrar.java b/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/DefaultDisplayElementRegistrar.java
index db42035..23969d4 100644
--- a/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/DefaultDisplayElementRegistrar.java
+++ b/smartdashboard/src/edu/wpi/first/smartdashboard/gui/elements/DefaultDisplayElementRegistrar.java
@@ -30,7 +30,7 @@ public class DefaultDisplayElementRegistrar {
DisplayElementRegistry.registerStaticWidget(Label.class);
DisplayElementRegistry.registerStaticWidget(RobotPreferences.class);
- DisplayElementRegistry.registerStaticWidget(RobotCameraViewer.class);
+ DisplayElementRegistry.registerStaticWidget(CameraServerViewer.class);
DisplayElementRegistry.registerStaticWidget(AxisCameraViewer.class);
DisplayElementRegistry.registerStaticWidget(VideoURLViewer.class);
}