revise tilesource

should fix a lot of edge cases

works for single images, needs testing and fixing for many other image
types

Author: jcupitt

TODO

@@ -1,4 +1,5 @@
-- nip4 ~/pics/nipguide.pdf, set "toilet roll", does not display correctly
+- nip4 ~/pics/nipguide.pdf, set "toilet roll", then set "multipage", height is
+  wrong
 
 - nip4 ~/pics/S000_t000002_V000_R0000_X000_Y000_C02_I1_D0_P00101.tif, set
   "multipage", does not display correctly

src/displaybar.c

@@ -267,6 +267,18 @@ displaybar_offset_value_changed(Tslider *slider, Displaybar *displaybar)
 			NULL);
 }
 
+// handy for debugging menu actions, see gtk/displaybar.ui
+static void
+displaybar_test_clicked(GtkButton *test, Displaybar *displaybar)
+{
+	Tilesource *tilesource = displaybar->tilesource;
+
+	if (tilesource)
+		g_object_set(tilesource,
+			"mode", TILESOURCE_MODE_TOILET_ROLL,
+			NULL);
+}
+
 static void
 displaybar_init(Displaybar *displaybar)
 {
@@ -319,6 +331,7 @@ displaybar_class_init(DisplaybarClass *class)
 	BIND_CALLBACK(displaybar_page_value_changed);
 	BIND_CALLBACK(displaybar_scale_value_changed);
 	BIND_CALLBACK(displaybar_offset_value_changed);
+	BIND_CALLBACK(displaybar_test_clicked);
 
 	gobject_class->dispose = displaybar_dispose;
 	gobject_class->set_property = displaybar_set_property;

src/gtk/displaybar.ui

@@ -141,6 +141,15 @@
               </object>
             </child>
 
+	    <!-- handy for debugging
+              -->
+            <child>
+              <object class="GtkButton">
+                <property name="label">Test</property>
+		<signal name="clicked" handler="displaybar_test_clicked"/>
+              </object>
+            </child>
+
           </object>
         </child>
 

src/imagedisplay.c

@@ -30,9 +30,9 @@
 #include "nip4.h"
 
 /*
+ */
 #define DEBUG_VERBOSE
 #define DEBUG
- */
 
 // the focus colour we paint
 // FIXME ... we should somehow get this from the theme, I'm not sure how
@@ -353,11 +353,13 @@ imagedisplay_tilecache_changed(Tilecache *tilecache,
 	Imagedisplay *imagedisplay)
 {
 #ifdef DEBUG
-	printf("imagedisplay_tilecache_changed:\n");
+	printf("imagedisplay_tilecache_changed: %d x %d\n",
+		tilecache->tilesource->level_width[0],
+		tilecache->tilesource->level_height[0]);
 #endif /*DEBUG*/
 
-	imagedisplay->image_rect.width = tilecache->tilesource->display_width;
-	imagedisplay->image_rect.height = tilecache->tilesource->display_height;
+	imagedisplay->image_rect.width = tilecache->tilesource->level_width[0];
+	imagedisplay->image_rect.height = tilecache->tilesource->level_height[0];
 	imagedisplay_layout(imagedisplay);
 
 	gtk_widget_queue_draw(GTK_WIDGET(imagedisplay));

src/imageui.c

@@ -813,9 +813,9 @@ imageui_bestfit(Imageui *imageui)
 	int widget_height = gtk_widget_get_height(imageui->scrolled_window);
 
 	double hzoom = (double) widget_width /
-		imageui->tilesource->display_width;
+		imageui->tilesource->level_width[0];
 	double vzoom = (double) widget_height /
-		imageui->tilesource->display_height;
+		imageui->tilesource->level_height[0];
 	double zoom = VIPS_MIN(hzoom, vzoom);
 
 	imageui_zoom_to_eased(imageui, zoom * imageui->tilesource->zoom);
@@ -1196,21 +1196,19 @@ imageui_drag_update(GtkEventControllerMotion *self,
 
 	case IMAGEUI_SELECT:
 		regionview_resize(imageui->grabbed, imagewindow_get_modifiers(win),
-			imageui->tilesource->display_width,
-			imageui->tilesource->display_height,
-			offset_x / zoom,
-			offset_y / zoom);
+			imageui->tilesource->level_width[0],
+			imageui->tilesource->level_height[0],
+			offset_x / zoom, offset_y / zoom);
 
 		regionview_model_update(imageui->grabbed);
 
 		break;
 
 	case IMAGEUI_CREATE:
 		regionview_resize(imageui->floating, imagewindow_get_modifiers(win),
-			imageui->tilesource->display_width,
-			imageui->tilesource->display_height,
-			offset_x / zoom,
-			offset_y / zoom);
+			imageui->tilesource->level_width[0],
+			imageui->tilesource->level_height[0],
+			offset_x / zoom, offset_y / zoom);
 
 		// fine to do an immediate redraw, since we don't rely on calc for
 		// position

src/regionview.c

@@ -577,14 +577,14 @@ regionview_draw_guide(Regionview *regionview, GtkSnapshot *snapshot)
 	if (regionview->draw_type == REGIONVIEW_HGUIDE) {
 		regionview->frame.left = 0;
 		regionview->frame.top = VIPS_RECT_BOTTOM(&regionview->draw_area);
-		regionview->frame.width = tilesource->display_width;
+		regionview->frame.width = tilesource->level_width[0];
 		regionview->frame.height = 0;
 	}
 	else {
 		regionview->frame.left = VIPS_RECT_RIGHT(&regionview->draw_area);
 		regionview->frame.top = 0;
 		regionview->frame.width = 0;
-		regionview->frame.height = tilesource->display_height;
+		regionview->frame.height = tilesource->level_height[0];
 	}
 	imageui_image_to_gtk_rect(imageui, &regionview->frame, &regionview->frame);
 

src/tilecache.c

@@ -30,10 +30,10 @@
 #include "nip4.h"
 
 /*
+ */
 #define DEBUG_RENDER_TIME
 #define DEBUG_VERBOSE
 #define DEBUG
- */
 
 enum {
 	/* Properties.
@@ -107,22 +107,19 @@ tilecache_dispose(GObject *object)
 static void
 tilecache_changed(Tilecache *tilecache)
 {
-	g_signal_emit(tilecache,
-		tilecache_signals[SIG_CHANGED], 0);
+	g_signal_emit(tilecache, tilecache_signals[SIG_CHANGED], 0);
 }
 
 static void
 tilecache_tiles_changed(Tilecache *tilecache)
 {
-	g_signal_emit(tilecache,
-		tilecache_signals[SIG_TILES_CHANGED], 0);
+	g_signal_emit(tilecache, tilecache_signals[SIG_TILES_CHANGED], 0);
 }
 
 static void
 tilecache_area_changed(Tilecache *tilecache, VipsRect *dirty, int z)
 {
-	g_signal_emit(tilecache,
-		tilecache_signals[SIG_AREA_CHANGED], 0, dirty, z);
+	g_signal_emit(tilecache, tilecache_signals[SIG_AREA_CHANGED], 0, dirty, z);
 }
 
 static void
@@ -190,7 +187,6 @@ tilecache_build_pyramid(Tilecache *tilecache)
 	int n_levels;
 	int level_width;
 	int level_height;
-	int i;
 
 #ifdef DEBUG
 	printf("tilecache_build_pyramid:\n");
@@ -206,8 +202,8 @@ tilecache_build_pyramid(Tilecache *tilecache)
 	 */
 	if (tilecache->levels &&
 		tilecache->levels[0] &&
-		tilesource->display_width == tilecache->levels[0]->Xsize &&
-		tilesource->display_height == tilecache->levels[0]->Ysize) {
+		tilesource->level_width[0] == tilecache->levels[0]->Xsize &&
+		tilesource->level_height[0] == tilecache->levels[0]->Ysize) {
 #ifdef DEBUG
 		printf("\tno geometry change, skipping pyr rebuild\n");
 #endif /*DEBUG*/
@@ -216,12 +212,12 @@ tilecache_build_pyramid(Tilecache *tilecache)
 
 	tilecache_free_pyramid(tilecache);
 
-	/* How many levels? Keep shrinking until we get both axies in one tile. We
+	/* How many levels? Keep shrinking until we get both axes in one tile. We
 	 * need to handle very lopsided images, like LUTs and multi-page images,
 	 * do we must shrink both dimensions.
 	 */
-	level_width = tilesource->display_width;
-	level_height = tilesource->display_height;
+	level_width = tilesource->level_width[0];
+	level_height = tilesource->level_height[0];
 	n_levels = 1;
 	for (;;) {
 		if (level_width <= TILE_SIZE &&
@@ -236,9 +232,9 @@ tilecache_build_pyramid(Tilecache *tilecache)
 	tilecache->n_levels = n_levels;
 
 	tilecache->levels = VIPS_ARRAY(NULL, n_levels, VipsImage *);
-	level_width = tilesource->display_width;
-	level_height = tilesource->display_height;
-	for (i = 0; i < n_levels; i++) {
+	level_width = tilesource->level_width[0];
+	level_height = tilesource->level_height[0];
+	for (int i = 0; i < n_levels; i++) {
 		tilecache->levels[i] = vips_image_new();
 
 		vips_image_init_fields(tilecache->levels[i],
@@ -261,7 +257,7 @@ tilecache_build_pyramid(Tilecache *tilecache)
 
 #ifdef DEBUG
 	printf("	 %d pyr levels\n", n_levels);
-	for (i = 0; i < n_levels; i++)
+	for (int i = 0; i < n_levels; i++)
 		printf("	 %d) %d x %d\n",
 			i,
 			tilecache->levels[i]->Xsize,