save and restore more view settings

Author: jcupitt

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+- refactor of tilesource improves OME_TIFF modes
+- fix menu state init
+- save and restore more view settings
+
 ## 9.0.9 2025/05/28
 
 - fix select modifier handling

TODO

@@ -1,12 +1,3 @@
-- try:
-
-	nip4 ~/pics/S000_t000002_V000_R0000_X000_Y000_C02_I1_D0_P00101.tif
-
-	switch to multipage, go to page 72, enable falsecolour, set scale 6,
-	close window
-
-  thumbnail gets falsecolour and scale, but not multipage or page number
-
 - load ws with locked tab, rightclick menu on locked tab does not
   have tick selected
 

meson.build

@@ -1,6 +1,6 @@
 project('nip4', 'c',
   # ie. a major after nip2 8.9 for workspace save file versioning
-  version: '9.0.9-2',
+  version: '9.0.10',
   license: 'GPL',
   meson_version: '>=0.64',
   default_options: [

src/iimage.c

@@ -150,16 +150,17 @@ iimage_save(Model *model, xmlNode *xnode)
 	if (!set_iprop(xthis, "image_left", iimage->image_left) ||
 		!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_paintbox",
-			bool_to_char(iimage->show_paintbox)) ||
-		!set_sprop(xthis, "show_convert",
-			bool_to_char(iimage->show_convert)) ||
+		!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_sprop(xthis, "falsecolour",
-			bool_to_char(iimage->falsecolour)))
+		!set_iprop(xthis, "page", iimage->page) ||
+		!set_sprop(xthis, "falsecolour", bool_to_char(iimage->falsecolour)))
+		return NULL;
+
+	if (iimage->mode != TILESOURCE_MODE_UNSET &&
+		!set_sprop(xthis, "mode",
+			vips_enum_nick(TILESOURCE_MODE_TYPE, iimage->mode)))
 		return NULL;
 
 	return xthis;
@@ -181,8 +182,13 @@ iimage_load(Model *model,
 	(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);
+
 	return MODEL_CLASS(iimage_parent_class)->load(model, state, parent, xnode);
 }
 
@@ -403,11 +409,13 @@ 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);
 
@@ -420,6 +428,8 @@ iimage_update_from_tilesource(iImage *iimage, Tilesource *tilesource)
 	iimage->scale = tilesource->scale;
 	iimage->offset = tilesource->offset;
 	iimage->falsecolour = tilesource->falsecolour;
+	iimage->page = tilesource->page;
+	iimage->mode = tilesource->mode;
 
 	iobject_changed(IOBJECT(iimage));
 }

src/iimage.h

@@ -68,11 +68,13 @@ struct _iImage {
 
 	/* Bar settings we remember.
 	 */
+	TilesourceMode mode;
 	double scale;
 	double offset;
 	gboolean falsecolour;
 	gboolean log;
 	gboolean icc;
+	int page;
 
 	/* Private ... build iobject caption here.
 	 */

src/iimageview.c

@@ -179,10 +179,17 @@ iimageview_refresh(vObject *vobject)
 		"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);

src/imagewindow.c

@@ -57,7 +57,7 @@ typedef struct _Active {
 typedef struct _ViewSettings {
 	gboolean valid;
 
-	// we don't save "mode", that's an image property, not a view property
+	TilesourceMode mode;
 	double scale;
 	double offset;
 	int page;
@@ -471,6 +471,7 @@ imagewindow_save_view_settings(Imagewindow *win, ViewSettings *view_settings)
 	}
 
 	g_object_get(tilesource,
+		"mode", &view_settings->mode,
 		"scale", &view_settings->scale,
 		"offset", &view_settings->offset,
 		"page", &view_settings->page,
@@ -502,6 +503,7 @@ imagewindow_restore_view_settings(Imagewindow *win,
 
 	if (tilesource)
 		g_object_set(tilesource,
+			"mode", view_settings->mode,
 			"scale", view_settings->scale,
 			"offset", view_settings->offset,
 			"page", view_settings->page,

src/tilesource.c

@@ -30,8 +30,8 @@
 /*
 #define DEBUG_VERBOSE
 #define DEBUG_MAKE
- */
 #define DEBUG
+ */
 
 #include "nip4.h"
 
@@ -1540,9 +1540,15 @@ tilesource_new_from_iimage(iImage *iimage, int priority)
 		"falsecolour", iimage->falsecolour,
 		"log", iimage->log,
 		"icc", iimage->icc,
+		"page", iimage->page,
 		"priority", priority,
 		NULL);
 
+	if (iimage->mode != TILESOURCE_MODE_UNSET)
+		g_object_set(tilesource,
+			"mode", iimage->mode,
+			NULL);
+
 	return tilesource;
 }
 

src/tilesource.h

@@ -75,6 +75,10 @@ typedef enum _TilesourceType {
 } TilesourceType;
 
 /* The modes of image display we support.
+ *
+ * UNSET
+ *
+ *  No saved value (should be set by sniffing the image).
  *
  * TOILET_ROLL
  *
@@ -109,6 +113,7 @@ typedef enum _TilesourceType {
  *	in each page.
  */
 typedef enum _TilesourceMode {
+	TILESOURCE_MODE_UNSET,
 	TILESOURCE_MODE_TOILET_ROLL,
 	TILESOURCE_MODE_MULTIPAGE,
 	TILESOURCE_MODE_ANIMATED,