[sis] 01/03: When the slider position is updated, the original resource should not be set to null. This is necessary for continuing to receive log events.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 75897ab4258268c5a923df0cdb14141cb5c105e0
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Sep 17 11:10:02 2022 +0200

    When the slider position is updated, the original resource should not be 
set to null.
    This is necessary for continuing to receive log events.
---
 .../src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java   | 4 ++--
 .../src/main/java/org/apache/sis/gui/coverage/ImageRequest.java       | 4 ++--
 .../src/main/java/org/apache/sis/gui/coverage/ViewAndControls.java    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java
 
b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java
index 9823132672..3c3e3e9f6f 100644
--- 
a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java
+++ 
b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageExplorer.java
@@ -600,7 +600,7 @@ public class CoverageExplorer extends Widget {
                 isCoverageAdjusting = false;
             }
             // Indirectly start a background thread which will invoke 
`notifyDataChanged(…)` later.
-            setCoverage((resource != null || coverage != null) ? new 
ImageRequest(resource, coverage) : null);
+            setCoverage((resource != null || coverage != null) ? new 
ImageRequest(resource, coverage, null) : null);
         }
     }
 
@@ -659,7 +659,7 @@ public class CoverageExplorer extends Widget {
         final GridCoverageResource resource = getResource();
         final GridCoverage coverage = getCoverage();
         if (resource != null || coverage != null) {
-            final ImageRequest request = new ImageRequest(resource, coverage);
+            final ImageRequest request = new ImageRequest(resource, coverage, 
null);
             final CoverageControls c = (CoverageControls) 
views.get(View.IMAGE);
             if (c != null) try {
                 request.zoom = c.view.getGridGeometry();
diff --git 
a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageRequest.java
 
b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageRequest.java
index b0b620e6a4..608d9f7c05 100644
--- 
a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageRequest.java
+++ 
b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageRequest.java
@@ -94,12 +94,12 @@ public class ImageRequest {
      * <p>This constructor is not in public API because users should supply 
only a resource or a coverage,
      * not both.</p>
      */
-    ImageRequest(final GridCoverageResource source, final GridCoverage data) {
+    ImageRequest(final GridCoverageResource source, final GridCoverage data, 
final GridExtent aoi) {
         resource = source;
         coverage = data;
         domain   = null;
         range    = null;
-        slice    = null;
+        slice    = aoi;
     }
 
     /**
diff --git 
a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ViewAndControls.java
 
b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ViewAndControls.java
index 6f8084555f..f5be92403c 100644
--- 
a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ViewAndControls.java
+++ 
b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ViewAndControls.java
@@ -181,7 +181,7 @@ abstract class ViewAndControls {
         final GridCoverage coverage = owner.getCoverage();
         if (coverage != null) try {
             isAdjustingSlice = true;
-            load(new ImageRequest(coverage, slice));        // Show a new 
slice of data.
+            load(new ImageRequest(owner.getResource(), coverage, slice));      
 // Show a new slice of data.
         } finally {
             isAdjustingSlice = false;
         }