separate tilesources

stops them crashing into each other

Author: jcupitt

CHANGELOG.md

@@ -1,9 +1,12 @@
 ## master
 
+- revise image repaint
+
 ## 9.0.3 2025/03/13
 
 - fix save-as
 - revise image repaint (again)
+- fix a crash in graph export
 
 ## 9.0.2 2025/03/10
 

TODO

@@ -1,9 +1,14 @@
-valgrind!
+- we seem to be making a lot of iimageview during demo load?
 
-==1537060== Conditional jump or move depends on uninitialised value(s)
-==1537060==    at 0x1978B5: drawstate_free (plotdisplay.c:183)
-==1537060==    by 0x198C01: plotdisplay_to_image (plotdisplay.c:573)
-==1537060==    by 0x14038D: apply_graph_export_image_call (builtin.c:521)
+- we are not always refreshing thumbnails after load completes
+
+- shrink as well as expand tiles in tilecache_snapshot
+
+- iimage_update_from_tilesource() needs to make all iimageview refresh
+
+- long formula should truncate with an ellipsis
+
+- are we autosizing the sinkscreen threadpool? we shouldn't
 
 # menu redesign
 

src/iimage.c

@@ -53,8 +53,6 @@ iimage_dispose(GObject *gobject)
 		(SListMapFn) classmodel_iimage_unlink, iimage);
 	g_assert(!iimage->classmodels);
 
-	WEAKREF_SET(iimage->tilesource, NULL);
-
 	G_OBJECT_CLASS(iimage_parent_class)->dispose(gobject);
 }
 
@@ -416,44 +414,10 @@ iimage_init(iImage *iimage)
 	iobject_set(IOBJECT(iimage), CLASS_IMAGE, NULL);
 }
 
-static void
-iimage_tilesource_tiles_changed(Tilesource *tilesource, iImage *iimage)
+void
+iimage_update_from_tilesource(iImage *iimage, Tilesource *tilesource)
 {
 	iimage->scale = tilesource->scale;
 	iimage->offset = tilesource->offset;
 	iimage->falsecolour = tilesource->falsecolour;
 }
-
-/* Return a new reference to the tilesource for this iimage. Make a new
- * tilesource if there's none.
- */
-Tilesource *
-iimage_get_tilesource_ref(iImage *iimage)
-{
-	Imageinfo *ii = iimage->value.ii;
-
-	if (iimage->tilesource &&
-		tilesource_has_imageinfo(iimage->tilesource, ii))
-		// there's a tilesource, and it's for the image we hold
-		return g_object_ref(iimage->tilesource);
-	else if (ii) {
-		// no tilesource, or it's out of date ... make a new one
-		Tilesource *tilesource = tilesource_new_from_imageinfo(ii);
-
-		g_object_set(tilesource,
-			"active", TRUE,
-			"scale", iimage->scale,
-			"offset", iimage->offset,
-			"falsecolour", iimage->falsecolour,
-			NULL);
-
-		WEAKREF_SET(iimage->tilesource, tilesource);
-
-		g_signal_connect_object(tilesource, "tiles-changed",
-			G_CALLBACK(iimage_tilesource_tiles_changed), iimage, 0);
-
-		return tilesource;
-	}
-	else
-		return NULL;
-}

src/iimage.h

@@ -75,11 +75,6 @@ struct _iImage {
 	/* Private ... build iobject caption here.
 	 */
 	VipsBuf caption_buffer;
-
-	// the tilesource for the ImageValue ... a weakref which gets dupped and
-	// given out to any viewers (iimageview, imageui) by
-	// iimage_get_tilesource_ref()
-	Tilesource *tilesource;
 };
 
 typedef struct _iImageClass {
@@ -92,4 +87,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);
-Tilesource *iimage_get_tilesource_ref(iImage *iimage);
+void iimage_update_from_tilesource(iImage *iimage, Tilesource *tilesource);

src/iimageview.c

@@ -145,24 +145,34 @@ iimageview_refresh(vObject *vobject)
 	iimageview_compute_visibility(iimageview);
 
 	if (iimageview->enable) {
-		Tilesource *current_tilesource;
-		g_object_get(iimageview->imagedisplay,
-			"tilesource", &current_tilesource,
-			NULL);
-		Tilesource *new_tilesource = iimage_get_tilesource_ref(iimage);
-
-		if (current_tilesource != new_tilesource) {
+		if (!iimage->value.ii)
 			g_object_set(iimageview->imagedisplay,
-				"bestfit", TRUE,
-				"tilesource", new_tilesource,
+				"tilesource", NULL,
+				NULL);
+		else {
+			Tilesource *current_tilesource;
+			g_object_get(iimageview->imagedisplay,
+				"tilesource", &current_tilesource,
 				NULL);
 
-			// set the image loading, if necessary
-			tilesource_background_load(new_tilesource);
-		}
+			if (current_tilesource &&
+				current_tilesource->image != iimage->value.ii->image) {
+				Tilesource *new_tilesource =
+					tilesource_new_from_iimage(iimage, -1000);
+
+				g_object_set(iimageview->imagedisplay,
+					"bestfit", TRUE,
+					"tilesource", new_tilesource,
+					NULL);
 
-		VIPS_UNREF(current_tilesource);
-		VIPS_UNREF(new_tilesource);
+				// set the image loading, if necessary
+				tilesource_background_load(new_tilesource);
+
+				VIPS_UNREF(new_tilesource);
+			}
+
+			VIPS_UNREF(current_tilesource);
+		}
 	}
 
 	if (iimageview->label)

src/iimageview.h

@@ -42,6 +42,9 @@
 typedef struct _iImageview {
 	Graphicview parent_object;
 
+	// we build this for the imagedisplay from the model
+	Tilesource *tilesource;
+
 	GtkWidget *top;
 	Imagedisplay *imagedisplay;
 	GtkWidget *label;

src/imageui.c

@@ -189,6 +189,10 @@ 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

@@ -1462,7 +1462,7 @@ imagewindow_iimage_changed(iImage *iimage, Imagewindow *win)
 	printf("imagewindow_iimage_changed:\n");
 #endif /*DEBUG*/
 
-	Tilesource *tilesource = iimage_get_tilesource_ref(iimage);
+	Tilesource *tilesource = tilesource_new_from_iimage(iimage, 0);
 	imagewindow_set_tilesource(win, tilesource);
 	tilesource_background_load(tilesource);
 	VIPS_UNREF(tilesource);

src/tilesource.c

@@ -54,6 +54,7 @@ enum {
 	PROP_ACTIVE,
 	PROP_LOADED,
 	PROP_VISIBLE,
+	PROP_PRIORITY,
 
 	/* Signals.
 	 */
@@ -452,7 +453,7 @@ tilesource_display_image(Tilesource *tilesource, VipsImage **mask_out)
 		x = vips_image_new();
 		mask = vips_image_new();
 		if (vips_sink_screen(image, x, mask,
-				TILE_SIZE, TILE_SIZE, MAX_TILES, 0,
+				TILE_SIZE, TILE_SIZE, MAX_TILES, tilesource->priority,
 				tilesource_render_notify, update)) {
 			VIPS_UNREF(x);
 			VIPS_UNREF(mask);
@@ -779,6 +780,10 @@ tilesource_property_name(guint prop_id)
 		return "VISIBLE";
 		break;
 
+	case PROP_PRIORITY:
+		return "PRIORITY";
+		break;
+
 	default:
 		return "<unknown>";
 	}
@@ -970,6 +975,12 @@ tilesource_set_property(GObject *object,
 			tilesource->visible = b;
 		break;
 
+	case PROP_PRIORITY:
+		i = g_value_get_int(value);
+		if (tilesource->priority != i)
+			tilesource->priority = i;
+		break;
+
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 		break;
@@ -1023,6 +1034,10 @@ tilesource_get_property(GObject *object,
 		g_value_set_boolean(value, tilesource->visible);
 		break;
 
+	case PROP_PRIORITY:
+		g_value_set_int(value, tilesource->priority);
+		break;
+
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 		break;
@@ -1201,6 +1216,13 @@ tilesource_class_init(TilesourceClass *class)
 			FALSE,
 			G_PARAM_READWRITE));
 
+	g_object_class_install_property(gobject_class, PROP_PRIORITY,
+		g_param_spec_int("priority",
+			_("priority"),
+			_("Render priority"),
+			-1000, 1000, 0,
+			G_PARAM_READWRITE));
+
 	tilesource_signals[SIG_PREEVAL] = g_signal_new("preeval",
 		G_TYPE_FROM_CLASS(class),
 		G_SIGNAL_RUN_LAST,
@@ -1416,6 +1438,22 @@ tilesource_new_from_imageinfo(Imageinfo *ii)
 		return tilesource_new_from_image(ii->image);
 }
 
+Tilesource *
+tilesource_new_from_iimage(iImage *iimage, int priority)
+{
+	Tilesource *tilesource = tilesource_new_from_imageinfo(iimage->value.ii);
+
+	g_object_set(tilesource,
+		"active", TRUE,
+		"scale", iimage->scale,
+		"offset", iimage->offset,
+		"falsecolour", iimage->falsecolour,
+		"priority", priority,
+		NULL);
+
+	return tilesource;
+}
+
 gboolean
 tilesource_has_imageinfo(Tilesource *tilesource, Imageinfo *ii)
 {

src/tilesource.h

@@ -237,6 +237,10 @@ typedef struct _Tilesource {
 	int load_error;
 	char *load_message;
 
+	/* Render priority ... lower for thumbnails.
+	 */
+	int priority;
+
 } Tilesource;
 
 typedef struct _TilesourceClass {
@@ -282,6 +286,7 @@ GType tilesource_get_type(void);
 Tilesource *tilesource_new_from_file(const char *filename);
 Tilesource *tilesource_new_from_image(VipsImage *image);
 Tilesource *tilesource_new_from_imageinfo(Imageinfo *ii);
+Tilesource *tilesource_new_from_iimage(iImage *iimage, int priority);
 gboolean tilesource_has_imageinfo(Tilesource *tilesource, Imageinfo *ii);
 
 void tilesource_background_load(Tilesource *tilesource);