[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59703] trunk/blender: Patch #36622, by Henrik Aarnio: Fit backdrop image to the area dimensions.

Lukas Toenne lukas.toenne at googlemail.com
Sun Sep 1 11:50:56 CEST 2013


Revision: 59703
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59703
Author:   lukastoenne
Date:     2013-09-01 09:50:56 +0000 (Sun, 01 Sep 2013)
Log Message:
-----------
Patch #36622, by Henrik Aarnio: Fit backdrop image to the area dimensions.
A new operator to alter the backdrop zoom level so that it fits fully within the node editor area, and centers the image.
Shortcut alt-home, as home is used for fitting stuff into the view everywhere.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_node.py
    trunk/blender/source/blender/editors/space_node/node_intern.h
    trunk/blender/source/blender/editors/space_node/node_ops.c
    trunk/blender/source/blender/editors/space_node/node_view.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_node.py	2013-09-01 08:58:46 UTC (rev 59702)
+++ trunk/blender/release/scripts/startup/bl_ui/space_node.py	2013-09-01 09:50:56 UTC (rev 59703)
@@ -152,6 +152,7 @@
             layout.operator("node.backimage_move", text="Backdrop move")
             layout.operator("node.backimage_zoom", text="Backdrop zoom in").factor = 1.2
             layout.operator("node.backimage_zoom", text="Backdrop zoom out").factor = 0.833
+            layout.operator("node.backimage_fit", text="Fit backdrop to available space")
 
         layout.separator()
 
@@ -361,6 +362,8 @@
         col.prop(snode, "backdrop_x", text="X")
         col.prop(snode, "backdrop_y", text="Y")
         col.operator("node.backimage_move", text="Move")
+        
+        layout.operator("node.backimage_fit", text="Fit")
 
 
 class NODE_PT_quality(bpy.types.Panel):

Modified: trunk/blender/source/blender/editors/space_node/node_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_intern.h	2013-09-01 08:58:46 UTC (rev 59702)
+++ trunk/blender/source/blender/editors/space_node/node_intern.h	2013-09-01 09:50:56 UTC (rev 59703)
@@ -129,6 +129,7 @@
 
 void NODE_OT_backimage_move(struct wmOperatorType *ot);
 void NODE_OT_backimage_zoom(struct wmOperatorType *ot);
+void NODE_OT_backimage_fit(struct wmOperatorType *ot);
 void NODE_OT_backimage_sample(struct wmOperatorType *ot);
 
 /* drawnode.c */

Modified: trunk/blender/source/blender/editors/space_node/node_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_ops.c	2013-09-01 08:58:46 UTC (rev 59702)
+++ trunk/blender/source/blender/editors/space_node/node_ops.c	2013-09-01 09:50:56 UTC (rev 59703)
@@ -98,6 +98,7 @@
 	
 	WM_operatortype_append(NODE_OT_backimage_move);
 	WM_operatortype_append(NODE_OT_backimage_zoom);
+	WM_operatortype_append(NODE_OT_backimage_fit);
 	WM_operatortype_append(NODE_OT_backimage_sample);
 	
 	WM_operatortype_append(NODE_OT_add_file);
@@ -249,6 +250,7 @@
 	RNA_float_set(kmi->ptr, "factor", 0.83333f);
 	kmi = WM_keymap_add_item(keymap, "NODE_OT_backimage_zoom", VKEY, KM_PRESS, KM_ALT, 0);
 	RNA_float_set(kmi->ptr, "factor", 1.2f);
+	WM_keymap_add_item(keymap, "NODE_OT_backimage_fit", HOMEKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "NODE_OT_backimage_sample", ACTIONMOUSE, KM_PRESS, KM_ALT, 0);
 
 	kmi = WM_keymap_add_item(keymap, "NODE_OT_link_make", FKEY, KM_PRESS, 0, 0);

Modified: trunk/blender/source/blender/editors/space_node/node_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_view.c	2013-09-01 08:58:46 UTC (rev 59702)
+++ trunk/blender/source/blender/editors/space_node/node_view.c	2013-09-01 09:50:56 UTC (rev 59703)
@@ -327,6 +327,60 @@
 	RNA_def_float(ot->srna, "factor", 1.2f, 0.0f, 10.0f, "Factor", "", 0.0f, 10.0f);
 }
 
+static int backimage_fit_exec(bContext *C, wmOperator *op)
+{
+	SpaceNode *snode = CTX_wm_space_node(C);
+	ARegion *ar = CTX_wm_region(C);
+
+	Image *ima;
+	ImBuf *ibuf;
+
+	const float pad = 32.0f;
+
+	void *lock;
+
+	float facx, facy;
+
+	ima = BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
+	ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
+
+	if (ibuf == NULL) {
+		BKE_image_release_ibuf(ima, ibuf, lock);
+		return OPERATOR_CANCELLED;
+	}
+
+	facx = 1.0f * (ar->sizex - pad) / (ibuf->x * snode->zoom);
+	facy = 1.0f * (ar->sizey - pad) / (ibuf->y * snode->zoom);
+
+	BKE_image_release_ibuf(ima, ibuf, lock);
+
+	snode->zoom *= min_ff(facx, facy);
+
+	snode->xof = 0;
+	snode->yof = 0;
+
+	ED_region_tag_redraw(ar);
+
+	return OPERATOR_FINISHED;
+}
+
+void NODE_OT_backimage_fit(wmOperatorType *ot)
+{
+
+	/* identifiers */
+	ot->name = "Background Image Fit";
+	ot->idname = "NODE_OT_backimage_fit";
+	ot->description = "Zoom in/out the background image";
+
+	/* api callbacks */
+	ot->exec = backimage_fit_exec;
+	ot->poll = composite_node_active;
+
+	/* flags */
+	ot->flag = OPTYPE_BLOCKING;
+
+}
+
 /******************** sample backdrop operator ********************/
 
 typedef struct ImageSampleInfo {




More information about the Bf-blender-cvs mailing list