diff --git a/.gitignore b/.gitignore index eaa45f922..68d549817 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,14 @@ -Python/__pycache__/WebSiteHandler\.cpython-37\.pyc - \.idea/ *.pyc - -Python/app/__pycache__/ - -Python/app/handlers/__pycache__/ - -\.vscode/ +__pycache__/ /.vs - backend/settings/ -/.vscode/ +.vscode/ +# Docs +source/_build +source/docs/_build # Compiled class file *.class @@ -109,7 +104,6 @@ fabric.properties # Temporary build files **/.gradle -**/target **/src/main/java/META-INF **/.settings **/.classpath @@ -125,8 +119,6 @@ compile_commands.json .clangd/ .cache/ -New client/photon-client/* - *.prefs *.jfr .DS_Store @@ -146,11 +138,12 @@ photonlib-cpp-examples/*/vendordeps/* photonlib-cpp-examples/*/networktables.json.bck photonlib-java-examples/*/networktables.json.bck *.sqlite -photon-server/src/main/resources/web/* venv .venv/* .venv networktables.json - -website/node_modules -website/dist +# Web stuff +photon-server/src/main/resources/web/* +node_modules +dist +components.d.ts diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index b7a9f77ac..000000000 --- a/docs/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -build/* -.DS_Store -.vscode/* -.idea/* -source/_build -source/docs/_build - -venv/* -.venv/* diff --git a/photon-client/.gitignore b/photon-client/.gitignore index fe2c4f9b8..0f57d3477 100644 --- a/photon-client/.gitignore +++ b/photon-client/.gitignore @@ -1,28 +1,8 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* -lerna-debug.log* - node_modules .DS_Store dist dist-ssr -*.local - -/cypress/videos/ -/cypress/screenshots/ # Editor directories and files -.vscode -!.vscode/extensions.json .idea -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? components.d.ts diff --git a/photon-core/.gitignore b/photon-core/.gitignore deleted file mode 100644 index ad3d67bb8..000000000 --- a/photon-core/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -bin/* -.settings/* -.project -.classpath -*.prefs -.gradle -.gradle/* -build -build/* -photonvision/* -photonvision_config/* -photon-server/lib/* -photon-server/package-lock.json diff --git a/photon-core/src/main/java/org/photonvision/vision/target/PotentialTarget.java b/photon-core/src/main/java/org/photonvision/vision/target/PotentialTarget.java index 01f8dddfc..520f1d454 100644 --- a/photon-core/src/main/java/org/photonvision/vision/target/PotentialTarget.java +++ b/photon-core/src/main/java/org/photonvision/vision/target/PotentialTarget.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package org.photonvision.vision.target; import java.util.ArrayList; @@ -26,7 +27,6 @@ import org.photonvision.vision.opencv.Releasable; import org.photonvision.vision.pipe.impl.NeuralNetworkPipeResult; public class PotentialTarget implements Releasable { - public final Contour m_mainContour; public final List m_subContours; public final CVShape shape; diff --git a/photon-core/src/main/java/org/photonvision/vision/target/RobotOffsetPointMode.java b/photon-core/src/main/java/org/photonvision/vision/target/RobotOffsetPointMode.java index 434e2de6f..caa5bf331 100644 --- a/photon-core/src/main/java/org/photonvision/vision/target/RobotOffsetPointMode.java +++ b/photon-core/src/main/java/org/photonvision/vision/target/RobotOffsetPointMode.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package org.photonvision.vision.target; public enum RobotOffsetPointMode { diff --git a/photon-core/src/main/java/org/photonvision/vision/target/RobotOffsetPointOperation.java b/photon-core/src/main/java/org/photonvision/vision/target/RobotOffsetPointOperation.java index d5aefd432..b925bd767 100644 --- a/photon-core/src/main/java/org/photonvision/vision/target/RobotOffsetPointOperation.java +++ b/photon-core/src/main/java/org/photonvision/vision/target/RobotOffsetPointOperation.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package org.photonvision.vision.target; public enum RobotOffsetPointOperation { diff --git a/photon-core/src/main/java/org/photonvision/vision/target/TargetCalculations.java b/photon-core/src/main/java/org/photonvision/vision/target/TargetCalculations.java index 0ed64b82c..22c92ae2c 100644 --- a/photon-core/src/main/java/org/photonvision/vision/target/TargetCalculations.java +++ b/photon-core/src/main/java/org/photonvision/vision/target/TargetCalculations.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package org.photonvision.vision.target; import org.opencv.calib3d.Calib3d; @@ -27,7 +28,6 @@ import org.photonvision.vision.calibration.CameraCalibrationCoefficients; import org.photonvision.vision.opencv.DualOffsetValues; public class TargetCalculations { - /** * Calculates the yaw and pitch of a point in the image. Yaw and pitch must be calculated together * to account for perspective distortion. Yaw is positive right, and pitch is positive up. @@ -49,7 +49,6 @@ public class TargetCalculations { double targetCenterY, double verticalFocalLength, CameraCalibrationCoefficients cameraCal) { - if (cameraCal != null) { // undistort MatOfPoint2f temp = new MatOfPoint2f(new Point(targetCenterX, targetCenterY)); diff --git a/photon-core/src/main/java/org/photonvision/vision/target/TargetModel.java b/photon-core/src/main/java/org/photonvision/vision/target/TargetModel.java index 04cc9bcd3..65b7ec22c 100644 --- a/photon-core/src/main/java/org/photonvision/vision/target/TargetModel.java +++ b/photon-core/src/main/java/org/photonvision/vision/target/TargetModel.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package org.photonvision.vision.target; import com.fasterxml.jackson.annotation.JsonAlias; diff --git a/photon-core/src/main/java/org/photonvision/vision/target/TargetOffsetPointEdge.java b/photon-core/src/main/java/org/photonvision/vision/target/TargetOffsetPointEdge.java index eccf287ec..add407ea3 100644 --- a/photon-core/src/main/java/org/photonvision/vision/target/TargetOffsetPointEdge.java +++ b/photon-core/src/main/java/org/photonvision/vision/target/TargetOffsetPointEdge.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package org.photonvision.vision.target; public enum TargetOffsetPointEdge { diff --git a/photon-core/src/main/java/org/photonvision/vision/target/TargetOrientation.java b/photon-core/src/main/java/org/photonvision/vision/target/TargetOrientation.java index 61b19c7f8..0820f0304 100644 --- a/photon-core/src/main/java/org/photonvision/vision/target/TargetOrientation.java +++ b/photon-core/src/main/java/org/photonvision/vision/target/TargetOrientation.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package org.photonvision.vision.target; public enum TargetOrientation { diff --git a/photon-core/src/main/java/org/photonvision/vision/target/TrackedTarget.java b/photon-core/src/main/java/org/photonvision/vision/target/TrackedTarget.java index 6d55bb09a..ee31696cf 100644 --- a/photon-core/src/main/java/org/photonvision/vision/target/TrackedTarget.java +++ b/photon-core/src/main/java/org/photonvision/vision/target/TrackedTarget.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package org.photonvision.vision.target; import edu.wpi.first.apriltag.AprilTagDetection; @@ -502,7 +503,6 @@ public class TrackedTarget implements Releasable { double verticalFocalLength, double imageArea, CameraCalibrationCoefficients cal) { - this.isLandscape = isLandscape; this.targetOffsetPointEdge = targetOffsetPointEdge; this.robotOffsetPointMode = robotOffsetPointMode; @@ -522,7 +522,6 @@ public class TrackedTarget implements Releasable { Point robotOffsetSinglePoint, DualOffsetValues dualOffsetValues, FrameStaticProperties frameStaticProperties) { - this.isLandscape = isLandscape; this.targetOffsetPointEdge = targetOffsetPointEdge; this.robotOffsetPointMode = robotOffsetPointMode; diff --git a/photon-core/src/test/java/org/photonvision/vision/target/TargetCalculationsTest.java b/photon-core/src/test/java/org/photonvision/vision/target/TargetCalculationsTest.java index b87ee4e14..340b8c993 100644 --- a/photon-core/src/test/java/org/photonvision/vision/target/TargetCalculationsTest.java +++ b/photon-core/src/test/java/org/photonvision/vision/target/TargetCalculationsTest.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package org.photonvision.vision.target; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,7 +42,6 @@ import org.photonvision.vision.frame.FrameStaticProperties; import org.photonvision.vision.opencv.DualOffsetValues; public class TargetCalculationsTest { - private static Size imageSize = new Size(1280, 720); private static Point imageCenterPoint = new Point(imageSize.width / 2.0 - 0.5, imageSize.height / 2.0 - 0.5); diff --git a/photon-core/src/test/java/org/photonvision/vision/target/TrackedTargetTest.java b/photon-core/src/test/java/org/photonvision/vision/target/TrackedTargetTest.java index d0e17215e..0311d309f 100644 --- a/photon-core/src/test/java/org/photonvision/vision/target/TrackedTargetTest.java +++ b/photon-core/src/test/java/org/photonvision/vision/target/TrackedTargetTest.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package org.photonvision.vision.target; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/photon-server/.gitignore b/photon-server/.gitignore deleted file mode 100644 index b55df9197..000000000 --- a/photon-server/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -bin/* -.settings/* -.project -.classpath -*.prefs -.gradle -.gradle/* -build -build/* -photonvision/* -photonvision_config/* -lib/* -photon-sever/lib/* diff --git a/photon-targeting/.gitignore b/photon-targeting/.gitignore deleted file mode 100644 index 4faca75e2..000000000 --- a/photon-targeting/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -bin/* -.settings/* -.project -.classpath -*.prefs -.gradle -.gradle/* -build -build/* -photonvision/* -photonvision_config/*