From 5137731dbbfc7b8e0ec479819a764dc9f250d791 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 28 May 2020 13:32:18 +0200 Subject: [PATCH] Fixed minor bug --- .../client/viewannualbinder/SpeedometerAnnualPanelResult.java | 2 +- .../viewannualbinder/SynopticTableAnnualPanelResult.java | 2 +- .../client/viewbinder/CorrelationPanelResult.java | 3 ++- .../client/viewbinder/SpeedometerPanelResult.java | 2 +- .../client/viewbinder/SynopticTablePanelResult.java | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SpeedometerAnnualPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SpeedometerAnnualPanelResult.java index 575835e..9e2bb60 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SpeedometerAnnualPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SpeedometerAnnualPanelResult.java @@ -548,7 +548,7 @@ public class SpeedometerAnnualPanelResult { } - if (i == outputNumber) { + if (i == outputIteration) { } else { if (pdfHeightInMM - yPos < pdfHeightInMM / 4) { diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SynopticTableAnnualPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SynopticTableAnnualPanelResult.java index 75c1b37..f8a6737 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SynopticTableAnnualPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/SynopticTableAnnualPanelResult.java @@ -534,7 +534,7 @@ public class SynopticTableAnnualPanelResult { if (i == outputNumber) { } else { - if (pdfHeightInMM - yPos < pdfHeightInMM / 7) { + if (pdfHeightInMM - yPos < pdfHeightInMM / 6) { pdoc.addPage(); yPos = tMargin; // Restart position } diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/CorrelationPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/CorrelationPanelResult.java index 7593274..af0380d 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/CorrelationPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/CorrelationPanelResult.java @@ -301,11 +301,12 @@ public class CorrelationPanelResult extends Composite { private String getOutputId() { outputNumber++; - String outputId = "OutputId_" + outputNumber; + String outputId = "OutputId_" + requestId + "_" + outputNumber; GWT.log("Generated OutputId: " + outputId); return outputId; } + /** * Adds the results. * diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SpeedometerPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SpeedometerPanelResult.java index 7e500f9..5a64b2b 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SpeedometerPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SpeedometerPanelResult.java @@ -469,7 +469,7 @@ public class SpeedometerPanelResult { } - if (i == outputNumber) { + if (i == outputIteration) { } else { if (pdfHeightInMM - yPos < pdfHeightInMM / 4) { diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SynopticTablePanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SynopticTablePanelResult.java index 45a6ace..e3d34c6 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SynopticTablePanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/SynopticTablePanelResult.java @@ -207,7 +207,7 @@ public class SynopticTablePanelResult { return; } - savePDFButton.setVisible(false); + savePDFButton.setVisible(true); final String toTitle = title; @@ -529,7 +529,7 @@ public class SynopticTablePanelResult { if (i == outputNumber) { } else { - if (pdfHeightInMM - yPos < pdfHeightInMM / 7) { + if (pdfHeightInMM - yPos < pdfHeightInMM / 6) { pdoc.addPage(); yPos = tMargin; // Restart position }