restore view settings on imagewindow reopen

Author: jcupitt

TODO

@@ -1,3 +1,8 @@
+- background is not being applied to thumbnail on imagewindow close
+
+	not applied to imagerwindow on reopoen
+
+
 - seeing unfixable dirty rows sometimes
 
 	happened in a row containing a region as a subobject

src/displaybar.c

@@ -34,20 +34,6 @@
 #define DEBUG
  */
 
-typedef struct _ViewSettings {
-	gboolean valid;
-
-	TilesourceMode mode;
-	double scale;
-	double offset;
-	int page;
-	gboolean falsecolour;
-	gboolean log;
-	gboolean icc;
-	gboolean active;
-	TilecacheBackground background;
-} ViewSettings;
-
 struct _Displaybar {
 	GtkWidget parent_instance;
 
@@ -314,6 +300,10 @@ displaybar_imagewindow_changed(Imagewindow *win, Displaybar *displaybar)
 static void
 displaybar_set_imagewindow(Displaybar *displaybar, Imagewindow *win)
 {
+#ifdef DEBUG
+	printf("displaybar_set_imagewindow:\n");
+#endif /*DEBUG*/
+
 	/* No need to ref ... win holds a ref to us.
 	 */
 	displaybar->win = win;
@@ -387,8 +377,7 @@ displaybar_dispose(GObject *object)
 	printf("displaybar_dispose:\n");
 #endif /*DEBUG*/
 
-	displaybar_disconnect(displaybar);
-
+	VIPS_UNREF(displaybar->tilesource);
 	VIPS_FREEF(gtk_widget_unparent, displaybar->action_bar);
 
 	G_OBJECT_CLASS(displaybar_parent_class)->dispose(object);
@@ -541,3 +530,19 @@ displaybar_new(Imagewindow *win)
 
 	return displaybar;
 }
+
+ViewSettings *
+displaybar_get_view_settings(Displaybar *displaybar)
+{
+	return &displaybar->view_settings;
+}
+
+void
+displaybar_set_view_settings(Displaybar *displaybar,
+	ViewSettings *view_settings)
+{
+	displaybar->view_settings = *view_settings;
+	displaybar_apply_view_settings(displaybar);
+}
+
+

src/displaybar.h

@@ -30,6 +30,22 @@
 #ifndef __DISPLAYBAR_H
 #define __DISPLAYBAR_H
 
+/* All the view settings we save and restore.
+ */
+typedef struct _ViewSettings {
+	gboolean valid;
+
+	TilesourceMode mode;
+	double scale;
+	double offset;
+	int page;
+	gboolean falsecolour;
+	gboolean log;
+	gboolean icc;
+	gboolean active;
+	TilecacheBackground background;
+} ViewSettings;
+
 #define DISPLAYBAR_TYPE (displaybar_get_type())
 
 G_DECLARE_FINAL_TYPE(Displaybar, displaybar, NIP4, DISPLAYBAR, GtkWidget)
@@ -38,5 +54,8 @@ G_DECLARE_FINAL_TYPE(Displaybar, displaybar, NIP4, DISPLAYBAR, GtkWidget)
 	(G_TYPE_CHECK_INSTANCE_CAST((obj), DISPLAYBAR_TYPE, Displaybar))
 
 Displaybar *displaybar_new(Imagewindow *win);
+ViewSettings *displaybar_get_view_settings(Displaybar *displaybar);
+void displaybar_set_view_settings(Displaybar *displaybar,
+	ViewSettings *view_settings);
 
 #endif /* __DISPLAYBAR_H */

src/iimage.c

@@ -151,16 +151,17 @@ iimage_save(Model *model, xmlNode *xnode)
 		!set_iprop(xthis, "image_top", iimage->image_top) ||
 		!set_iprop(xthis, "image_mag", iimage->image_mag) ||
 		!set_sprop(xthis, "show_status", bool_to_char(iimage->show_status)) ||
-		!set_sprop(xthis, "show_convert", bool_to_char(iimage->show_convert)) ||
-		!set_dprop(xthis, "scale", iimage->scale) ||
-		!set_dprop(xthis, "offset", iimage->offset) ||
-		!set_iprop(xthis, "page", iimage->page) ||
-		!set_sprop(xthis, "falsecolour", bool_to_char(iimage->falsecolour)))
+		!set_sprop(xthis, "show_convert", bool_to_char(iimage->show_convert)))
 		return NULL;
 
-	if (iimage->mode != TILESOURCE_MODE_UNSET &&
-		!set_sprop(xthis, "mode",
-			vips_enum_nick(TILESOURCE_MODE_TYPE, iimage->mode)))
+	if (iimage->view_settings.valid &&
+		 (!set_dprop(xthis, "scale", iimage->view_settings.scale) ||
+		  !set_dprop(xthis, "offset", iimage->view_settings.offset) ||
+		  !set_iprop(xthis, "page", iimage->view_settings.page) ||
+		  !set_sprop(xthis, "falsecolour",
+			bool_to_char(iimage->view_settings.falsecolour)) ||
+		  !set_sprop(xthis, "mode",
+			vips_enum_nick(TILESOURCE_MODE_TYPE, iimage->view_settings.mode))))
 		return NULL;
 
 	return xthis;
@@ -180,14 +181,17 @@ iimage_load(Model *model,
 	(void) get_bprop(xnode, "show_status", &iimage->show_status);
 	(void) get_bprop(xnode, "show_paintbox", &iimage->show_paintbox);
 	(void) get_bprop(xnode, "show_convert", &iimage->show_convert);
-	(void) get_dprop(xnode, "scale", &iimage->scale);
-	(void) get_dprop(xnode, "offset", &iimage->offset);
-	(void) get_iprop(xnode, "page", &iimage->page);
-	(void) get_bprop(xnode, "falsecolour", &iimage->falsecolour);
 
 	char mode[64];
-	if (get_sprop(xnode, "mode", mode, sizeof(mode)))
-		iimage->mode = vips_enum_from_nick("nip4", TILESOURCE_MODE_TYPE, mode);
+	if (get_dprop(xnode, "scale", &iimage->view_settings.scale) &&
+		get_dprop(xnode, "offset", &iimage->view_settings.offset) &&
+		get_iprop(xnode, "page", &iimage->view_settings.page) &&
+		get_bprop(xnode, "falsecolour", &iimage->view_settings.falsecolour) &&
+		get_sprop(xnode, "mode", mode, sizeof(mode))) {
+		iimage->view_settings.mode =
+			vips_enum_from_nick("nip4", TILESOURCE_MODE_TYPE, mode);
+		iimage->view_settings.valid = TRUE;
+	}
 
 	return MODEL_CLASS(iimage_parent_class)->load(model, state, parent, xnode);
 }
@@ -411,27 +415,14 @@ iimage_init(iImage *iimage)
 	iimage->show_paintbox = FALSE;
 	iimage->show_convert = FALSE;
 
-	iimage->mode = TILESOURCE_MODE_UNSET;
-	iimage->scale = 0.0;
-	iimage->offset = 0.0;
-	iimage->falsecolour = FALSE;
-	iimage->log = FALSE;
-	iimage->icc = FALSE;
-	iimage->page = 0;
-
 	vips_buf_init_dynamic(&iimage->caption_buffer, MAX_LINELENGTH);
 
 	iobject_set(IOBJECT(iimage), CLASS_IMAGE, NULL);
 }
 
 void
-iimage_update_from_tilesource(iImage *iimage, Tilesource *tilesource)
+iimage_update_view_settings(iImage *iimage, ViewSettings *view_settings)
 {
-	iimage->scale = tilesource->scale;
-	iimage->offset = tilesource->offset;
-	iimage->falsecolour = tilesource->falsecolour;
-	iimage->page = tilesource->page;
-	iimage->mode = tilesource->mode;
-
+	iimage->view_settings = *view_settings;
 	iobject_changed(IOBJECT(iimage));
 }

src/iimage.h

@@ -66,15 +66,9 @@ struct _iImage {
 	gboolean show_paintbox;
 	gboolean show_convert;
 
-	/* Bar settings we remember.
+	/* Bar settings we apply.
 	 */
-	TilesourceMode mode;
-	double scale;
-	double offset;
-	gboolean falsecolour;
-	gboolean log;
-	gboolean icc;
-	int page;
+	ViewSettings view_settings;
 
 	/* Private ... build iobject caption here.
 	 */
@@ -91,4 +85,4 @@ typedef struct _iImageClass {
 GType iimage_get_type(void);
 gboolean iimage_replace(iImage *iimage, const char *filename);
 gboolean iimage_replace_imageinfo(iImage *iimage, Imageinfo *ii);
-void iimage_update_from_tilesource(iImage *iimage, Tilesource *tilesource);
+void iimage_update_view_settings(iImage *iimage, ViewSettings *view_settings);

src/iimageview.c

@@ -57,6 +57,33 @@ iimageview_dispose(GObject *object)
 	G_OBJECT_CLASS(iimageview_parent_class)->dispose(object);
 }
 
+static void
+iimageview_apply_view_settings(iImageview *iimageview)
+{
+	iImage *iimage = IIMAGE(VOBJECT(iimageview)->iobject);
+	ViewSettings *view_settings = &iimage->view_settings;
+
+	if (view_settings->valid) {
+		Tilesource *tilesource;
+		g_object_get(iimageview->imagedisplay,
+			"tilesource", &tilesource,
+			NULL);
+
+		if (tilesource)
+			g_object_set(tilesource,
+				"mode", view_settings->mode,
+				"scale", view_settings->scale,
+				"offset", view_settings->offset,
+				"falsecolour", view_settings->falsecolour,
+				"page", view_settings->page,
+				"log", view_settings->log,
+				"icc", view_settings->icc,
+				NULL);
+
+		VIPS_UNREF(tilesource);
+	}
+}
+
 void
 iimageview_compute_visibility(iImageview *iimageview)
 {
@@ -175,26 +202,8 @@ iimageview_refresh(vObject *vobject)
 		VIPS_UNREF(tilesource);
 	}
 
-	g_object_get(iimageview->imagedisplay,
-		"tilesource", &tilesource,
-		NULL);
-	if (tilesource) {
-		// we can have an unset mode
-		if (iimage->mode != TILESOURCE_MODE_UNSET)
-			g_object_set(tilesource,
-				"mode", iimage->mode,
-				NULL);
-
-		g_object_set(tilesource,
-			"scale", iimage->scale,
-			"offset", iimage->offset,
-			"falsecolour", iimage->falsecolour,
-			"page", iimage->page,
-			"log", iimage->log,
-			"icc", iimage->icc,
-			NULL);
-		VIPS_UNREF(tilesource);
-	}
+	// apply view settings from iimage
+	iimageview_apply_view_settings(iimageview);
 
 	if (iimageview->label)
 		set_glabel(iimageview->label, "%s", IOBJECT(iimage)->caption);

src/imageui.c

@@ -194,10 +194,6 @@ static void
 imageui_set_iimage(Imageui *imageui, iImage *iimage)
 {
 	if (imageui->iimage) {
-		// update thumbnail from our sliders
-		if (imageui->tilesource)
-			iimage_update_from_tilesource(imageui->iimage, imageui->tilesource);
-
 		imageui->iimage->views =
 			g_slist_remove(imageui->iimage->views, imageui);
 		imageui->iimage = NULL;

src/imagewindow.c

@@ -642,12 +642,8 @@ imagewindow_dispose(GObject *object)
 	FREESID(win->iimage_destroy_sid, win->iimage);
 	VIPS_FREEF(gtk_widget_unparent, win->right_click_menu);
 
-	/* Sendn our settings back to the iimage we came from.
-	 */
-	if (win->imageui) {
-		Tilesource *tilesource = imageui_get_tilesource(win->imageui);
-		iimage_update_from_tilesource(win->iimage, tilesource);
-	}
+	iimage_update_view_settings(win->iimage,
+		displaybar_get_view_settings(DISPLAYBAR(win->displaybar)));
 
 	while (win->active) {
 		Active *active = (Active *) win->active->data;
@@ -1582,4 +1578,7 @@ imagewindow_set_iimage(Imagewindow *win, iImage *iimage)
 		G_CALLBACK(imagewindow_iimage_destroy), win);
 
 	iobject_changed(IOBJECT(iimage));
+
+	displaybar_set_view_settings(DISPLAYBAR(win->displaybar),
+		&iimage->view_settings);
 }

src/tilesource.c

@@ -1543,18 +1543,18 @@ tilesource_new_from_iimage(iImage *iimage, int priority)
 
 	g_object_set(tilesource,
 		"active", TRUE,
-		"scale", iimage->scale,
-		"offset", iimage->offset,
-		"falsecolour", iimage->falsecolour,
-		"log", iimage->log,
-		"icc", iimage->icc,
-		"page", iimage->page,
+		"scale", iimage->view_settings.scale,
+		"offset", iimage->view_settings.offset,
+		"falsecolour", iimage->view_settings.falsecolour,
+		"log", iimage->view_settings.log,
+		"icc", iimage->view_settings.icc,
+		"page", iimage->view_settings.page,
 		"priority", priority,
 		NULL);
 
-	if (iimage->mode != TILESOURCE_MODE_UNSET)
+	if (iimage->view_settings.mode != TILESOURCE_MODE_UNSET)
 		g_object_set(tilesource,
-			"mode", iimage->mode,
+			"mode", iimage->view_settings.mode,
 			NULL);
 
 	return tilesource;