update from nip4

Author: jcupitt

CHANGELOG.md

@@ -5,7 +5,7 @@ master
 - much better performance for images which are very tall and thin or very wide 
   and narrow
 - better antialiasing [Linden6]
-- copy over improvements from nip4 development
+- copy over improvements from nip4 development, including OME handling
 
 ## 3.1.0 28/10/24
 

src/gtk/imagewindow.ui

@@ -222,18 +222,28 @@
         </child>
 
         <child>
-          <object class="GtkInfoBar" id="error_bar">
-            <property name="message-type">error</property>
-            <property name="show-close-button">true</property>
+          <object class="GtkActionBar" id="error_bar">
             <property name="revealed">false</property>
-            <child>
+
+            <child type="center">
               <object class="GtkLabel" id="error_label">
+                <property name="hexpand">true</property>
                 <property name="ellipsize">middle</property>
+                <property name="xalign">0.0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
+
               </object>
             </child>
+
+            <child type="end">
+              <object class="GtkButton">
+                <property name="label">OK</property>
+                <signal name="clicked" handler="imagewindow_error_clicked"/>
+              </object>
+            </child>
+
           </object>
         </child>
 

src/imagedisplay.c

@@ -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->image_width,
+		tilecache->tilesource->image_height);
 #endif /*DEBUG*/
 
-	imagedisplay->image_rect.width = tilecache->tilesource->display_width;
-	imagedisplay->image_rect.height = tilecache->tilesource->display_height;
+	imagedisplay->image_rect.width = tilecache->tilesource->image_width;
+	imagedisplay->image_rect.height = tilecache->tilesource->image_height;
 	imagedisplay_layout(imagedisplay);
 
 	gtk_widget_queue_draw(GTK_WIDGET(imagedisplay));
@@ -647,6 +649,8 @@ imagedisplay_snapshot(GtkWidget *widget, GtkSnapshot *snapshot)
 	printf("imagedisplay_snapshot:\n");
 #endif /*DEBUG*/
 
+	GTK_WIDGET_CLASS(imagedisplay_parent_class)->snapshot(widget, snapshot);
+
 	/* Clip to the widget area, or we may paint over the display control
 	 * bar.
 	 */
@@ -668,7 +672,6 @@ imagedisplay_snapshot(GtkWidget *widget, GtkSnapshot *snapshot)
 
 	/* It's unclear how to do this :( maybe we're supposed to get the base
 	 * widget class to do it? Draw it ourselves for now.
-	 */
 	if (gtk_widget_has_focus(widget)) {
 		GskRoundedRect outline;
 
@@ -685,6 +688,7 @@ imagedisplay_snapshot(GtkWidget *widget, GtkSnapshot *snapshot)
 			(float[4]){ 2, 2, 2, 2 },
 			(GdkRGBA[4]){ BORDER, BORDER, BORDER, BORDER });
 	}
+	 */
 }
 
 static void

src/imageui.c

@@ -46,6 +46,19 @@
  */
 #define ZOOM_DURATION (0.5)
 
+/* Snap if closer than this.
+ */
+const int imageui_snap_threshold = 10;
+
+/* Drag state machine.
+ */
+typedef enum {
+	IMAGEUI_WAIT,	/* Waiting for left down */
+	IMAGEUI_SELECT, /* Manipulating a selected region */
+	IMAGEUI_SCROLL, /* Drag-scrolling the iamge */
+	IMAGEUI_CREATE, /* Dragging out a new region */
+} ImageuiState;
+
 struct _Imageui {
 	GtkWidget parent_instance;
 
@@ -81,16 +94,18 @@ struct _Imageui {
 	double zoom_x;
 	double zoom_y;
 
+	/* Interaction state.
+	 */
+	ImageuiState state;
+
 	/* TRUE for an eased zoom (eg. magin), FALSE for a continuous zoom (eg.
 	 * 'i').
 	 */
 	gboolean eased;
 
-	/* Drag scroll.
-	 */
-	int window_left;	 	/* Window position at start of scroll */
+	int window_left;		/* Window position at start of scroll */
 	int window_top;
-	int start_x; 			/* Mouse position at start of scroll */
+	int start_x;			/* Mouse position at start of scroll */
 	int start_y;
 
 	GtkWidget *scrolled_window;
@@ -514,10 +529,8 @@ imageui_bestfit(Imageui *imageui)
 	int widget_width = gtk_widget_get_width(imageui->scrolled_window);
 	int widget_height = gtk_widget_get_height(imageui->scrolled_window);
 
-	double hzoom = (double) widget_width /
-		imageui->tilesource->display_width;
-	double vzoom = (double) widget_height /
-		imageui->tilesource->display_height;
+	double hzoom = (double) widget_width / imageui->tilesource->image_width;
+	double vzoom = (double) widget_height / imageui->tilesource->image_height;
 	double zoom = VIPS_MIN(hzoom, vzoom);
 
 	imageui_zoom_to_eased(imageui, zoom * imageui->tilesource->zoom);
@@ -592,21 +605,30 @@ imageui_scale(Imageui *imageui)
 	VipsImage *image;
 
 	if ((image = tilesource_get_image(imageui->tilesource))) {
-		double image_zoom;
+		/* Get the view rect in level0 coordinates.
+		 */
+		double image_zoom = imageui_get_zoom(imageui);
 		int left, top, width, height;
-		double scale, offset;
-
-		image_zoom = imageui_get_zoom(imageui);
 		imageui_get_position(imageui, &left, &top, &width, &height);
+
 		left /= image_zoom;
 		top /= image_zoom;
 		width /= image_zoom;
 		height /= image_zoom;
 
+		/* image is scaled down by current_z, so we must scale the rect by
+		 * that.
+		 */
+		left /= 1 << imageui->tilesource->current_z;
+		top /= 1 << imageui->tilesource->current_z;
+		width /= 1 << imageui->tilesource->current_z;
+		height /= 1 << imageui->tilesource->current_z;
+
 		/* FIXME ... this will be incredibly slow, esp. for large
 		 * images. Instead, it would be better to just search the
 		 * cached tiles we have.
 		 */
+		double scale, offset;
 		if (imageui_find_scale(image,
 				left, top, width, height, &scale, &offset))
 			return FALSE;
@@ -834,8 +856,35 @@ imageui_drag_update(GtkEventControllerMotion *self,
 		offset_x, offset_y);
 #endif /*DEBUG_VERBOSE*/
 
-	imageui_set_position(imageui,
-		imageui->window_left - offset_x, imageui->window_top - offset_y);
+	switch (imageui->state) {
+	case IMAGEUI_WAIT:
+		if (fabs(offset_x) > 5 ||
+			fabs(offset_y) > 5)
+			imageui->state = IMAGEUI_SCROLL;
+		break;
+
+	case IMAGEUI_SCROLL:
+		imageui_set_position(imageui,
+			imageui->window_left - offset_x, imageui->window_top - offset_y);
+		break;
+
+	default:
+		break;
+	}
+}
+
+static void
+imageui_drag_end(GtkEventControllerMotion *self,
+	gdouble offset_x, gdouble offset_y, gpointer user_data)
+{
+	Imageui *imageui = IMAGEUI(user_data);
+
+#ifdef DEBUG_VERBOSE
+	printf("imageui_drag_end: offset_x = %g, offset_y = %g\n",
+		offset_x, offset_y);
+#endif /*DEBUG_VERBOSE*/
+
+	imageui->state = IMAGEUI_WAIT;
 }
 
 static void
@@ -916,6 +965,7 @@ imageui_class_init(ImageuiClass *class)
 
 	BIND_CALLBACK(imageui_drag_begin);
 	BIND_CALLBACK(imageui_drag_update);
+	BIND_CALLBACK(imageui_drag_end);
 	BIND_CALLBACK(imageui_key_pressed);
 	BIND_CALLBACK(imageui_key_released);
 	BIND_CALLBACK(imageui_motion);
@@ -968,6 +1018,7 @@ imageui_class_init(ImageuiClass *class)
 		NULL, NULL,
 		g_cclosure_marshal_VOID__VOID,
 		G_TYPE_NONE, 0);
+
 }
 
 Imageui *

src/imageui.h

@@ -51,9 +51,6 @@ double imageui_get_scale(Imageui *imageui);
 void imageui_get_mouse_position(Imageui *imageui,
 	double *image_x, double *image_y);
 
-gboolean imageui_snap_point(Imageui *imageui, int x, int y, int *sx, int *sy);
-gboolean imageui_snap_rect(Imageui *imageui, VipsRect *in, VipsRect *out);
-
 double imageui_get_zoom(Imageui *imageui);
 void imageui_bestfit(Imageui *imageui);
 void imageui_magin(Imageui *imageui);

src/imagewindow.c

@@ -136,7 +136,7 @@ imagewindow_set_error(Imagewindow *win, const char *message)
 		err[i - 1] = '\0';
 	gtk_label_set_text(GTK_LABEL(win->error_label), err);
 
-	gtk_info_bar_set_revealed(GTK_INFO_BAR(win->error_bar), TRUE);
+	gtk_action_bar_set_revealed(GTK_ACTION_BAR(win->error_bar), TRUE);
 }
 
 static void
@@ -162,7 +162,7 @@ imagewindow_error_hide(Imagewindow *win)
 	printf("imagewindow_error_hide:\n");
 #endif /*DEBUG*/
 
-	gtk_info_bar_set_revealed(GTK_INFO_BAR(win->error_bar), FALSE);
+	gtk_action_bar_set_revealed(GTK_ACTION_BAR(win->error_bar), FALSE);
 }
 
 /* Manage the set of active views.
@@ -841,12 +841,6 @@ imagewindow_cancel_clicked(GtkWidget *button, Imagewindow *win)
 		vips_image_set_kill(image, TRUE);
 }
 
-static void
-imagewindow_error_response(GtkWidget *button, int response, Imagewindow *win)
-{
-	imagewindow_error_hide(win);
-}
-
 static GdkTexture *
 texture_new_from_image(VipsImage *image)
 {
@@ -1549,8 +1543,6 @@ imagewindow_init(Imagewindow *win)
 
 	g_signal_connect_object(win->progress_cancel, "clicked",
 		G_CALLBACK(imagewindow_cancel_clicked), win, 0);
-	g_signal_connect_object(win->error_bar, "response",
-		G_CALLBACK(imagewindow_error_response), win, 0);
 
 	g_action_map_add_action_entries(G_ACTION_MAP(win),
 		imagewindow_entries, G_N_ELEMENTS(imagewindow_entries),
@@ -1620,6 +1612,12 @@ imagewindow_pressed_cb(GtkGestureClick *gesture,
 	gtk_popover_popup(GTK_POPOVER(win->right_click_menu));
 }
 
+static void
+imagewindow_error_clicked(GtkWidget *button, Imagewindow *win)
+{
+    imagewindow_error_hide(win);
+}
+
 #define BIND(field) \
 	gtk_widget_class_bind_template_child(GTK_WIDGET_CLASS(class), \
 		Imagewindow, field);
@@ -1647,8 +1645,8 @@ imagewindow_class_init(ImagewindowClass *class)
 	BIND(display_bar);
 	BIND(info_bar);
 
-	gtk_widget_class_bind_template_callback(GTK_WIDGET_CLASS(class),
-		imagewindow_pressed_cb);
+	BIND_CALLBACK(imagewindow_pressed_cb);
+	BIND_CALLBACK(imagewindow_error_clicked);
 
 	gobject_class->dispose = imagewindow_dispose;