From a7ba620d5b3c25db96e8fac384783a8428208e39 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Fri, 9 Mar 2012 16:13:53 +0000
Subject: [PATCH] LMS-2800 - Screening: Create a Field View
SVN: 24670
---
.../detailviewers/ChannelChooser.java | 1 -
.../detailviewers/LogicalImageViewer.java | 18 +++++++++++-------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooser.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooser.java
index f474060b03f..97c7d504905 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooser.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooser.java
@@ -347,7 +347,6 @@ class ChannelChooser
defaultChannelState.tryGetDefaultResolution());
resolutionChooser.addResolutionChangedListener(new Listener<BaseEvent>()
{
- @Override
public void handleEvent(BaseEvent be)
{
defaultChannelState.setDefaultResolution(resolutionChooser.getResolution());
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LogicalImageViewer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LogicalImageViewer.java
index 2fd2e646165..a2e8888b20e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LogicalImageViewer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LogicalImageViewer.java
@@ -190,10 +190,7 @@ public class LogicalImageViewer
{
public void imagesDownloaded(LazyImageSeriesFrame frame)
{
- if (logicalImageRefreshHandler != null)
- {
- logicalImageRefreshHandler.onRefresh();
- }
+ notifyImageRefresh();
}
};
@@ -244,7 +241,6 @@ public class LogicalImageViewer
new ChannelChooser(logicalImageReference, viewerFactory, channelState);
channelChooser.addViewerTo(container, viewContext, new AsyncCallback<Void>()
{
- @Override
public void onSuccess(Void result)
{
if (showColorAdjustmentButton)
@@ -275,7 +271,6 @@ public class LogicalImageViewer
container.layout();
}
- @Override
public void onFailure(Throwable caught)
{
@@ -339,7 +334,7 @@ public class LogicalImageViewer
{
public void imageLoaded(FitImageLoadEvent event)
{
- logicalImageRefreshHandler.onRefresh();
+ notifyImageRefresh();
}
};
@@ -524,4 +519,13 @@ public class LogicalImageViewer
// if there are more than 4 tiles, make them smaller, if there are less, make them bigger
return 4.0F / dim;
}
+
+ private void notifyImageRefresh()
+ {
+ if (logicalImageRefreshHandler != null)
+ {
+ logicalImageRefreshHandler.onRefresh();
+ }
+ }
+
}
--
GitLab