SSDM-274 : Javascript-based Microscopy Data Viewer - synchronizing parameters...

SSDM-274 : Javascript-based Microscopy Data Viewer - synchronizing parameters for different data sets done

SVN: 31490

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/resources/components/imageviewer/AbstractWidget.js

@@ -46,6 +46,30 @@ define([ "jquery", "components/common/ListenerManager" ], function($, ListenerMa
 			}
 		},
 
+		getState : function() {
+			if (!this.state) {
+				this.state = {};
+			}
+			this.doGetState(this.state);
+			return this.state;
+		},
+
+		setState : function(state) {
+			if (state) {
+				if (!this.state) {
+					this.state = {};
+				}
+				$.extend(this.state, state);
+				this.doSetState(this.state);
+			}
+		},
+
+		doGetState : function(state) {
+		},
+
+		doSetState : function(state) {
+		},
+
 		getView : function() {
 			return this.view;
 		},

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/resources/components/imageviewer/ChannelChooserWidget.js

@@ -16,18 +16,14 @@ define([ "jquery", "components/imageviewer/AbstractWidget", "components/imagevie
 			this.setChannels(channels);
 		},
 
-		getState : function() {
-			var state = {};
+		doGetState : function(state) {
 			state.selectedChannel = this.getSelectedChannel();
 			state.selectedMergedChannels = this.getSelectedMergedChannels();
-			return state;
 		},
 
-		setState : function(state) {
-			if (state) {
-				this.setSelectedChannel(state.selectedChannel);
-				this.setSelectedMergedChannels(state.selectedMergedChannels);
-			}
+		doSetState : function(state) {
+			this.setSelectedChannel(state.selectedChannel);
+			this.setSelectedMergedChannels(state.selectedMergedChannels);
 		},
 
 		getSelectedChannel : function() {

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/resources/components/imageviewer/ChannelStackMatrixChooserWidget.js

@@ -21,20 +21,16 @@ define([ "jquery", "components/imageviewer/AbstractWidget", "components/imagevie
 			}
 		},
 
-		getState : function() {
-			var state = {};
+		doGetState : function(state) {
 			state.timePointButtonsState = this.getTimePointButtonsWidget().getState();
 			state.selectedTimePoint = this.getSelectedTimePoint();
 			state.selectedDepth = this.getSelectedDepth();
-			return state;
 		},
 
-		setState : function(state) {
-			if (state) {
-				this.getTimePointButtonsWidget().setState(state.timePointButtonsState);
-				this.setSelectedTimePoint(state.selectedTimePoint);
-				this.setSelectedDepth(state.selectedDepth);
-			}
+		doSetState : function(state) {
+			this.getTimePointButtonsWidget().setState(state.timePointButtonsState);
+			this.setSelectedTimePoint(state.selectedTimePoint);
+			this.setSelectedDepth(state.selectedDepth);
 		},
 
 		getTimePoints : function() {

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/resources/components/imageviewer/ChannelStackSeriesChooserView.js

@@ -19,7 +19,7 @@ define([ "jquery", "bootstrap", "bootstrap-slider", "components/imageviewer/Abst
 			var thisView = this;
 
 			this.panel.append(this.createSliderWidget());
-			this.panel.append(this.controller.getButtonsWidget().render());
+			this.panel.append(this.controller.getChannelStackButtonsWidget().render());
 
 			this.refresh();
 

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/resources/components/imageviewer/ChannelStackSeriesChooserWidget.js

@@ -21,18 +21,14 @@ define([ "jquery", "components/imageviewer/AbstractWidget", "components/imagevie
 			}
 		},
 
-		getState : function() {
-			var state = {};
-			state.buttonsWidget = this.getButtonsWidget().getState();
+		doGetState : function(state) {
+			state.channelStackButtonsWidget = this.getChannelStackButtonsWidget().getState();
 			state.selectedChannelStackIndex = this.getSelectedChannelStackIndex();
-			return state;
 		},
 
-		setState : function(state) {
-			if (state) {
-				this.getButtonsWidget().setState(state.buttonsWidget);
-				this.setSelectedChannelStackIndex(state.selectedChannelStackIndex);
-			}
+		doSetState : function(state) {
+			this.getChannelStackButtonsWidget().setState(state.getChannelStackButtonsWidget);
+			this.setSelectedChannelStackIndex(state.selectedChannelStackIndex);
 		},
 
 		getChannelStacks : function() {
@@ -95,13 +91,13 @@ define([ "jquery", "components/imageviewer/AbstractWidget", "components/imagevie
 
 			if (this.getSelectedChannelStackId() != channelStackId) {
 				this.selectedChannelStackId = channelStackId;
-				this.getButtonsWidget().setSelectedFrame(this.getSelectedChannelStackIndex());
+				this.getChannelStackButtonsWidget().setSelectedFrame(this.getSelectedChannelStackIndex());
 				this.refresh();
 				this.notifyChangeListeners();
 			}
 		},
 
-		getButtonsWidget : function() {
+		getChannelStackButtonsWidget : function() {
 			if (this.buttonsWidget == null) {
 				var thisWidget = this;
 

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/resources/components/imageviewer/ImageParametersWidget.js

@@ -18,20 +18,16 @@ define([ "jquery", "components/imageviewer/AbstractWidget", "components/imagevie
 			this.imageResolutions = imageResolutions;
 		},
 
-		getState : function() {
-			var state = {};
+		doGetState : function(state) {
 			state.channelChooserState = this.getChannelChooserWidget().getState();
 			state.resolutionChooserState = this.getResolutionChooserWidget().getState();
 			state.channelStackChooserState = this.getChannelStackChooserWidget().getState();
-			return state;
 		},
 
-		setState : function(state) {
-			if (state) {
-				this.getChannelChooserWidget().setState(state.channelChooserState);
-				this.getResolutionChooserWidget().setState(state.resolutionChooserState);
-				this.getChannelStackChooserWidget().setState(state.channelStackChooserState);
-			}
+		doSetState : function(state) {
+			this.getChannelChooserWidget().setState(state.channelChooserState);
+			this.getResolutionChooserWidget().setState(state.resolutionChooserState);
+			this.getChannelStackChooserWidget().setState(state.channelStackChooserState);
 		},
 
 		getChannelChooserWidget : function() {

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/resources/components/imageviewer/MovieButtonsWidget.js

@@ -116,18 +116,14 @@ define([ "jquery", "components/imageviewer/AbstractView", "components/imageviewe
 			this.selectedFrame = 0;
 		},
 
-		getState : function() {
-			var state = {};
+		doGetState : function(state) {
 			state.selectedFrame = this.getSelectedFrame();
 			state.selectedDelay = this.getSelectedDelay();
-			return state;
 		},
 
-		setState : function(state) {
-			if (state) {
-				this.setSelectedFrame(state.selectedFrame);
-				this.setSelectedDelay(state.selectedDelay);
-			}
+		doSetState : function(state) {
+			this.setSelectedFrame(state.selectedFrame);
+			this.setSelectedDelay(state.selectedDelay);
 		},
 
 		play : function() {

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/resources/components/imageviewer/ResolutionChooserWidget.js

@@ -16,16 +16,12 @@ define([ "jquery", "components/imageviewer/AbstractWidget", "components/imagevie
 			this.setResolutions(resolutions);
 		},
 
-		getState : function() {
-			var state = {};
+		doGetState : function(state) {
 			state.selectedResolution = this.getSelectedResolution();
-			return state;
 		},
 
-		setState : function(state) {
-			if (state) {
-				this.setSelectedResolution(state.selectedResolution);
-			}
+		doSetState : function(state) {
+			this.setSelectedResolution(state.selectedResolution);
 		},
 
 		getSelectedResolution : function() {