From 2ddddd2955d8d10c7e90e803d538d61c8e15ba66 Mon Sep 17 00:00:00 2001 From: Banks Troutman Date: Sat, 21 Sep 2019 19:50:18 -0400 Subject: [PATCH 1/5] Update pom.xml to build uberjar --- .gitignore | 2 ++ Main/pom.xml | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/.gitignore b/.gitignore index b8c043901..e1a08cb49 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,5 @@ Main/.gradle Main/target New client/chameleon-client/node_modules/ +Main/dependency-reduced-pom.xml +Main/src/main/java/META-INF diff --git a/Main/pom.xml b/Main/pom.xml index 28ce24dd4..ddd5d8379 100644 --- a/Main/pom.xml +++ b/Main/pom.xml @@ -17,6 +17,19 @@ 12 + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + package + + shade + + + + From e1dcff91aa79822e5d91cb516bdf3be3b624d1af Mon Sep 17 00:00:00 2001 From: Omer Date: Sun, 22 Sep 2019 03:37:25 +0300 Subject: [PATCH 2/5] Fixed typos --- chameleon-client/src/components/Vision.vue | 2 +- chameleon-client/src/components/contourTab.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chameleon-client/src/components/Vision.vue b/chameleon-client/src/components/Vision.vue index b61e10c7a..e156e2967 100644 --- a/chameleon-client/src/components/Vision.vue +++ b/chameleon-client/src/components/Vision.vue @@ -6,7 +6,7 @@ - + diff --git a/chameleon-client/src/components/contourTab.vue b/chameleon-client/src/components/contourTab.vue index d9c63b1ae..737736c2d 100644 --- a/chameleon-client/src/components/contourTab.vue +++ b/chameleon-client/src/components/contourTab.vue @@ -5,7 +5,7 @@ - From 1110634b29349568c04000a3adea09bc64ea6a1c Mon Sep 17 00:00:00 2001 From: Omer Date: Sun, 22 Sep 2019 03:40:55 +0300 Subject: [PATCH 3/5] bug hunting --- .../vision/process/CVProcess.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java index dca8e94a0..953a6ab3f 100644 --- a/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java @@ -54,23 +54,28 @@ public class CVProcess { List FilterContours(List InputContours, List area, List ratio, List extent) { for (MatOfPoint Contour : InputContours){ try{ - var contourArea = Imgproc.contourArea(Contour); - double targetArea = FastMath.round((contourArea / CamVals.ImageArea) * 100); - if (targetArea <= area.get(0) || targetArea >= area.get(1)){ + var contourArea = Imgproc.contourArea(Contour);//TODO change scaling + int targetArea = (int) ((((float) contourArea) / CamVals.ImageArea) * 100); + if (targetArea < area.get(0) || targetArea > area.get(1)){ continue; } var rect = Imgproc.minAreaRect(new MatOfPoint2f(Contour.toArray())); var targetFullness = (contourArea / rect.size.area()) * 100; - if (targetFullness <= extent.get(0) || targetArea >= extent.get(1)){ + if (targetFullness < extent.get(0) || targetArea > extent.get(1)){ continue; } - var aspectRatio = rect.size.width / rect.size.height; - if (aspectRatio <= ratio.get(0) || aspectRatio >= ratio.get(1)){ + double aspectRatio = rect.size.width / rect.size.height;//TODO i think aspectRatio is inverted + System.out.println(aspectRatio); + if (aspectRatio < ratio.get(0) || aspectRatio > ratio.get(1)){ continue; } FilteredContours.add(Contour); } - catch (Exception ignored) { } + catch (Exception e) + { + System.err.println("Error while filtering contours"); + e.printStackTrace(); + } } return FilteredContours; } From 6d4c48e74f0d89bdfd422be78994e7b0e7bd4562 Mon Sep 17 00:00:00 2001 From: Omer Date: Sun, 22 Sep 2019 03:43:00 +0300 Subject: [PATCH 4/5] removed debugging print --- .../main/java/com/chameleonvision/vision/process/CVProcess.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java index 953a6ab3f..b86826d4b 100644 --- a/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java @@ -65,7 +65,6 @@ public class CVProcess { continue; } double aspectRatio = rect.size.width / rect.size.height;//TODO i think aspectRatio is inverted - System.out.println(aspectRatio); if (aspectRatio < ratio.get(0) || aspectRatio > ratio.get(1)){ continue; } From 012c4f44de7e68e54fd5ff45428f475bf56b08d0 Mon Sep 17 00:00:00 2001 From: Omer Date: Sun, 22 Sep 2019 04:01:01 +0300 Subject: [PATCH 5/5] added some windows commands --- .../settings/NetworkSettings.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java b/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java index b13761b7f..1aa3f1c44 100644 --- a/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java +++ b/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java @@ -24,13 +24,17 @@ public class NetworkSettings { } executeCommand("hostnamectl set-hostname " + this.hostname); } - //TODO add windows networking commands - -// else -// if (SystemUtils.IS_OS_WINDOWS) -// { -// executeCommand("cmd /c COMMAND HERE"); -// } + //TODO check windows commands + else if (SystemUtils.IS_OS_WINDOWS) { + if (!adapter.equals("")) { + if (connectionType.equals("DHCP")) + executeCommand("cmd /c interface ip set address \"" + adapter + "\" dhcp"); + else if (connectionType.equals("Static")) { + executeCommand("cmd /c netsh interface ip set address \"" + adapter + "\" static " + this.ip + " " + this.netmask + " " + this.gateway + "1"); + } + } + //TODO find a way to change hostname in windows + } } private void executeCommand(String command) { @@ -51,7 +55,7 @@ public class NetworkSettings { Enumeration ee = netint.getInetAddresses(); for (InetAddress addr : Collections.list(ee)) if (addr instanceof Inet4Address) - if ((addr.getAddress()[0] & 0xFF) == 10 && (addr.getAddress()[1] & 0xFF) == SettingsManager.GeneralSettings.team_number) { + if ((addr.getAddress()[0] & 0xFF) == 10 && (addr.getAddress()[1] & 0xFF) == SettingsManager.GeneralSettings.team_number) { System.out.println("found robot network interface at " + netint.getName() + " ip: " + addr.getHostAddress()); return netint.getName(); }