Area slider adjustments, add NT for local testing

This commit is contained in:
Banks Troutman
2019-09-25 13:32:24 -04:00
parent e8dc3ed3ac
commit d4842154a3
2 changed files with 5 additions and 2 deletions

View File

@@ -4,6 +4,7 @@ import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.camera.CameraManager;
import com.chameleonvision.vision.process.VisionProcess;
import com.chameleonvision.web.Server;
import edu.wpi.first.networktables.NetworkTableInstance;
public class Main {
public static void main(String[] args) {
@@ -12,6 +13,8 @@ public class Main {
for (var camSet : CameraManager.getAllCamerasByName().entrySet()) {
new Thread(new VisionProcess(camSet.getValue())).start();
}
NetworkTableInstance.getDefault().startClient("localhost");
// NetworkTableInstance.getDefault().startClientTeam(SettingsManager.GeneralSettings.team_number);
Server.main(8888);
} else {

View File

@@ -58,8 +58,8 @@ public class CVProcess {
try {
double contourArea = Imgproc.contourArea(Contour); //TODO change scaling
double targetArea = (contourArea / CamVals.ImageArea) * 100;
double minArea = Math.pow(area.get(0), 4);
double maxArea = Math.pow(area.get(1), 4);
double minArea = (double) area.get(0) / 100;
double maxArea = (double) area.get(1) / 100;
if (targetArea < minArea || targetArea > maxArea) {
continue;
}