save and restore vis settings in thumbnails

Author: jcupitt

TODO

@@ -1,14 +1,24 @@
-- we seem to be making a lot of iimageview during demo load?
+- we save and restore scale/offset/falsecolour on imagewindow popup and
+  popdown
+
+	add log, etc.
+
+- "reset" in display bar resets the position of scale/offset widgets, but does
+  not reset the menu items (eg. tick on falsecolour)
+
+- can we make tilesource on demand in iimageview_refresh?
+
+	might speed up workspace load
 
 - 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
+- are we autosizing the sinkscreen threadpool?
+
+	maybe we shouldn't? or maybe it's a good thing?
 
 # menu redesign
 

src/iimage.c

@@ -420,4 +420,6 @@ iimage_update_from_tilesource(iImage *iimage, Tilesource *tilesource)
 	iimage->scale = tilesource->scale;
 	iimage->offset = tilesource->offset;
 	iimage->falsecolour = tilesource->falsecolour;
+
+	iobject_changed(IOBJECT(iimage));
 }

src/iimageview.c

@@ -130,9 +130,11 @@ iimageview_refresh(vObject *vobject)
 	iImageview *iimageview = IIMAGEVIEW(vobject);
 	iImage *iimage = IIMAGE(vobject->iobject);
 
+	Tilesource *tilesource;
+
 #ifdef DEBUG
-	printf("iimageview_refresh:\n");
 #endif /*DEBUG*/
+	printf("iimageview_refresh:\n");
 
 	// on the first refresh, register with the enclosing workspaceview
 	if (iimageview->first) {
@@ -150,13 +152,12 @@ iimageview_refresh(vObject *vobject)
 				"tilesource", NULL,
 				NULL);
 		else {
-			Tilesource *current_tilesource;
 			g_object_get(iimageview->imagedisplay,
-				"tilesource", &current_tilesource,
+				"tilesource", &tilesource,
 				NULL);
 
-			if (current_tilesource &&
-				current_tilesource->image != iimage->value.ii->image) {
+			if (!tilesource ||
+				(tilesource->image != iimage->value.ii->image)) {
 				Tilesource *new_tilesource =
 					tilesource_new_from_iimage(iimage, -1000);
 
@@ -171,10 +172,20 @@ iimageview_refresh(vObject *vobject)
 				VIPS_UNREF(new_tilesource);
 			}
 
-			VIPS_UNREF(current_tilesource);
+			VIPS_UNREF(tilesource);
 		}
 	}
 
+	g_object_get(iimageview->imagedisplay,
+		"tilesource", &tilesource,
+		NULL);
+	if (tilesource)
+		g_object_set(tilesource,
+			"scale", iimage->scale,
+			"offset", iimage->offset,
+			"falsecolour", iimage->falsecolour,
+			NULL);
+
 	if (iimageview->label)
 		set_glabel(iimageview->label, "%s", IOBJECT(iimage)->caption);
 

src/imagewindow.c

@@ -736,12 +736,12 @@ imagewindow_dispose(GObject *object)
 	printf("imagewindow_dispose:\n");
 #endif /*DEBUG*/
 
-	imagewindow_files_free(win);
-
 	FREESID(win->iimage_changed_sid, win->iimage);
 	FREESID(win->iimage_destroy_sid, win->iimage);
 	VIPS_FREEF(gtk_widget_unparent, win->right_click_menu);
 
+	imagewindow_files_free(win);
+
 	G_OBJECT_CLASS(imagewindow_parent_class)->dispose(object);
 }