Fixing chat's scatter added

eakurnikov · Sep 11, 2017 · 0a93c40 · 0a93c40
1 parent 632bc60
commit 0a93c40
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 17 deletions.
diff --git a/.idea/modules/CapStruct.iml b/.idea/modules/CapStruct.iml
diff --git a/.idea/modules/CapStruct_main.iml b/.idea/modules/CapStruct_main.iml
diff --git a/.idea/modules/CapStruct_test.iml b/.idea/modules/CapStruct_test.iml
diff --git a/src/main/java/com/private_void/app/MainController.java b/src/main/java/com/private_void/app/MainController.java
@@ -205,26 +205,23 @@ private void showResult(Flux flux, Surface capillar) {
 
         //TODO как-то разукрашивать точки в зависимости от их интенсивности. Тогда детектор как счетчик интенсивности со своими ячейками ваще не нужен, нужна будет тупо его плоскость
         chart.getData().addAll(series);
-
-        chart.getXAxis().autosize();
-        chart.getYAxis().autosize();
-
-//        if (xAxis.getUpperBound() > yAxis.getUpperBound()) {
-//            yAxis.setUpperBound(xAxis.getUpperBound());
-//        } else {
-//            xAxis.setUpperBound(yAxis.getUpperBound());
-//        }
-//
-//        if (xAxis.getLowerBound() < yAxis.getLowerBound()) {
-//            yAxis.setLowerBound(xAxis.getLowerBound());
-//        } else {
-//            xAxis.setLowerBound(yAxis.getLowerBound());
-//        }
+        setChartScale(flux.getUpperBound(), flux.getLowerBound());
 
         intensityOn.setText(String.valueOf(capillar.getDetectedParticlesAmount()));
         intensityAbsorbed.setText(String.valueOf(capillar.getNotDetectedParticlesAmount()));
         intensityOut.setText(String.valueOf(capillar.getOutOfCapillarParticlesAmount()));
 
         successLabel.setVisible(true);
     }
+
+    private void setChartScale(double upperBound, double lowerBound) {
+        xAxis.setAutoRanging(false);
+        yAxis.setAutoRanging(false);
+
+        xAxis.setUpperBound(upperBound);
+        yAxis.setUpperBound(upperBound);
+
+        xAxis.setLowerBound(lowerBound);
+        yAxis.setLowerBound(lowerBound);
+    }
 }
diff --git a/src/main/java/com/private_void/core/Detector.java b/src/main/java/com/private_void/core/Detector.java
@@ -67,6 +67,7 @@ public Flux detect(Flux flux) {
         }
 
         flux.setParticles(detectedParticles);
+        flux.computeScatter(width);
         return flux;
     }
 

diff --git a/src/main/java/com/private_void/core/Flux.java b/src/main/java/com/private_void/core/Flux.java
@@ -7,6 +7,8 @@ public abstract class Flux {
     protected Vector3D fluxAxis;
     protected int particlesAmount;
     protected float minIntensity;
+    protected double upperBound;
+    protected double lowerBound;
     protected ArrayList<Particle> particles;
 
     protected Flux(final Point3D fluxCoordinate, final Vector3D fluxAxis, int particlesAmount, float minIntensity) {
@@ -37,6 +39,14 @@ public void setMinIntensity(float minIntensity) {
         this.minIntensity = minIntensity;
     }
 
+    public double getUpperBound() {
+        return upperBound;
+    }
+
+    public double getLowerBound() {
+        return lowerBound;
+    }
+
     protected void checkParameters() {
         if (fluxAxis.getX() == 0.0f) {
             fluxAxis.setX(0.000001f);
@@ -48,4 +58,27 @@ protected void checkParameters() {
             fluxAxis.setZ(0.000001f);
         }
     }
+
+    public void computeScatter(float maxWidth) {
+        for (Particle particle : particles) {
+            if (particle.getCoordinate().getX() > upperBound) {
+                upperBound = particle.getCoordinate().getX();
+            }
+            if (particle.getCoordinate().getY() > upperBound) {
+                upperBound = particle.getCoordinate().getY();
+            }
+            if (particle.getCoordinate().getX() < lowerBound) {
+                lowerBound = particle.getCoordinate().getX();
+            }
+            if (particle.getCoordinate().getY() < lowerBound) {
+                lowerBound = particle.getCoordinate().getY();
+            }
+        }
+        if (upperBound > maxWidth) {
+            upperBound = maxWidth;
+        }
+        if (lowerBound < -maxWidth) {
+            lowerBound = -maxWidth;
+        }
+    }
 }
diff --git a/src/main/java/com/private_void/core/RotatedDetector.java b/src/main/java/com/private_void/core/RotatedDetector.java
@@ -46,6 +46,7 @@ public Flux detect(Flux flux) {
             ex.printStackTrace();
         }
         flux.setParticles(detectedParticles);
+        flux.computeScatter(width);
         return flux;
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,6 +67,7 @@ public Flux detect(Flux flux) { @@
             }
             flux.setParticles(detectedParticles);
+            flux.computeScatter(width);
             return flux;
         }
@@ Expand Down @@