[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49719] trunk/blender/source/blender: utility functions for getting/setting rectangles for operators.

Campbell Barton ideasman42 at gmail.com
Wed Aug 8 22:38:56 CEST 2012


Revision: 49719
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49719
Author:   campbellbarton
Date:     2012-08-08 20:38:55 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
utility functions for getting/setting rectangles for operators.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_channels_edit.c
    trunk/blender/source/blender/editors/animation/anim_markers.c
    trunk/blender/source/blender/editors/animation/anim_ops.c
    trunk/blender/source/blender/editors/interface/view2d_ops.c
    trunk/blender/source/blender/editors/mask/mask_select.c
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c
    trunk/blender/source/blender/editors/space_action/action_select.c
    trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
    trunk/blender/source/blender/editors/space_clip/tracking_select.c
    trunk/blender/source/blender/editors/space_file/file_ops.c
    trunk/blender/source/blender/editors/space_graph/graph_select.c
    trunk/blender/source/blender/editors/space_info/info_report.c
    trunk/blender/source/blender/editors/space_nla/nla_select.c
    trunk/blender/source/blender/editors/space_node/node_select.c
    trunk/blender/source/blender/editors/space_outliner/outliner_select.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/editors/space_view3d/view3d_select.c
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
    trunk/blender/source/blender/windowmanager/WM_api.h
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -1930,10 +1930,7 @@
 		return OPERATOR_CANCELLED;
 	
 	/* get settings from operator */
-	rect.xmin = RNA_int_get(op->ptr, "xmin");
-	rect.ymin = RNA_int_get(op->ptr, "ymin");
-	rect.xmax = RNA_int_get(op->ptr, "xmax");
-	rect.ymax = RNA_int_get(op->ptr, "ymax");
+	WM_operator_properties_border_to_rcti(op, &rect);
 	
 	gesture_mode = RNA_int_get(op->ptr, "gesture_mode");
 	extend = RNA_boolean_get(op->ptr, "extend");

Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -1146,14 +1146,13 @@
 	TimeMarker *marker;
 	float xminf, xmaxf, yminf, ymaxf;
 	int gesture_mode = RNA_int_get(op->ptr, "gesture_mode");
-	int xmin = RNA_int_get(op->ptr, "xmin");
-	int xmax = RNA_int_get(op->ptr, "xmax");
-	int ymin = RNA_int_get(op->ptr, "ymin");
-	int ymax = RNA_int_get(op->ptr, "ymax");
 	int extend = RNA_boolean_get(op->ptr, "extend");
+	rcti rect;
 	
-	UI_view2d_region_to_view(v2d, xmin, ymin, &xminf, &yminf);	
-	UI_view2d_region_to_view(v2d, xmax, ymax, &xmaxf, &ymaxf);	
+	WM_operator_properties_border_to_rcti(op, &rect);
+
+	UI_view2d_region_to_view(v2d, rect.xmin, rect.ymin, &xminf, &yminf);
+	UI_view2d_region_to_view(v2d, rect.xmax, rect.ymax, &xmaxf, &ymaxf);
 	
 	if (markers == NULL)
 		return 0;

Modified: trunk/blender/source/blender/editors/animation/anim_ops.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_ops.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/animation/anim_ops.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -185,15 +185,14 @@
 	Scene *scene = CTX_data_scene(C);
 	ARegion *ar = CTX_wm_region(C);
 	float sfra, efra;
-	int xmin, xmax;
+	rcti rect;
 	
 	/* get min/max values from border select rect (already in region coordinates, not screen) */
-	xmin = RNA_int_get(op->ptr, "xmin");
-	xmax = RNA_int_get(op->ptr, "xmax");
+	WM_operator_properties_border_to_rcti(op, &rect);
 	
 	/* convert min/max values to frames (i.e. region to 'tot' rect) */
-	UI_view2d_region_to_view(&ar->v2d, xmin, 0, &sfra, NULL);
-	UI_view2d_region_to_view(&ar->v2d, xmax, 0, &efra, NULL);
+	UI_view2d_region_to_view(&ar->v2d, rect.xmin, 0, &sfra, NULL);
+	UI_view2d_region_to_view(&ar->v2d, rect.xmax, 0, &efra, NULL);
 	
 	/* set start/end frames for preview-range 
 	 *	- must clamp within allowable limits
@@ -232,12 +231,11 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 	
 	/* rna */
-	/* used to define frame range */
-	RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
-	/* these are not used, but are needed by borderselect gesture operator stuff */
-	RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
+	/* used to define frame range.
+	 *
+	 * note: border Y values are not used,
+	 * but are needed by borderselect gesture operator stuff */
+	WM_operator_properties_border(ot);
 }
 
 /* ****************** clear preview range operator ****************************/

Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -1178,11 +1178,7 @@
 	ot->poll = view_zoom_poll;
 	
 	/* rna */
-	RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, "Gesture Mode", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
+	WM_operator_properties_gesture_border(ot, FALSE);
 }
 
 /* ********************************************************* */

Modified: trunk/blender/source/blender/editors/mask/mask_select.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_select.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/mask/mask_select.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -414,10 +414,7 @@
 	int change = FALSE, mode, extend;
 
 	/* get rectangle from operator */
-	rect.xmin = RNA_int_get(op->ptr, "xmin");
-	rect.ymin = RNA_int_get(op->ptr, "ymin");
-	rect.xmax = RNA_int_get(op->ptr, "xmax");
-	rect.ymax = RNA_int_get(op->ptr, "ymax");
+	WM_operator_properties_border_to_rcti(op, &rect);
 
 	ED_mask_point_pos(sa, ar, rect.xmin, rect.ymin, &rectf.xmin, &rectf.ymin);
 	ED_mask_point_pos(sa, ar, rect.xmax, rect.ymax, &rectf.xmax, &rectf.ymax);

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -3262,11 +3262,7 @@
 	
 	/* rna */
 	RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
-	
+	WM_operator_properties_border(ot);
 }
 #endif
 

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -398,8 +398,5 @@
 	RNA_def_enum(ot->srna, "area", area_items, PARTIALVIS_INSIDE,
 	             "Area", "Which vertices to hide or show");
 	
-	RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
+	WM_operator_properties_border(ot);
 }

Modified: trunk/blender/source/blender/editors/space_action/action_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_select.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/space_action/action_select.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -294,10 +294,7 @@
 		deselect_action_keys(&ac, 1, SELECT_SUBTRACT);
 	
 	/* get settings from operator */
-	rect.xmin = RNA_int_get(op->ptr, "xmin");
-	rect.ymin = RNA_int_get(op->ptr, "ymin");
-	rect.xmax = RNA_int_get(op->ptr, "xmax");
-	rect.ymax = RNA_int_get(op->ptr, "ymax");
+	WM_operator_properties_border_to_rcti(op, &rect);
 		
 	gesture_mode = RNA_int_get(op->ptr, "gesture_mode");
 	if (gesture_mode == GESTURE_MODAL_SELECT)

Modified: trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -353,10 +353,7 @@
 	rcti rect;
 
 	/* get rectangle from operator */
-	rect.xmin = RNA_int_get(op->ptr, "xmin");
-	rect.ymin = RNA_int_get(op->ptr, "ymin");
-	rect.xmax = RNA_int_get(op->ptr, "xmax");
-	rect.ymax = RNA_int_get(op->ptr, "ymax");
+	WM_operator_properties_border_to_rcti(op, &rect);
 
 	UI_view2d_region_to_view(&ar->v2d, rect.xmin, rect.ymin, &userdata.rect.xmin, &userdata.rect.ymin);
 	UI_view2d_region_to_view(&ar->v2d, rect.xmax, rect.ymax, &userdata.rect.xmax, &userdata.rect.ymax);

Modified: trunk/blender/source/blender/editors/space_clip/tracking_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_select.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/space_clip/tracking_select.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -348,10 +348,7 @@
 	int framenr = ED_space_clip_get_clip_frame_number(sc);
 
 	/* get rectangle from operator */
-	rect.xmin = RNA_int_get(op->ptr, "xmin");
-	rect.ymin = RNA_int_get(op->ptr, "ymin");
-	rect.xmax = RNA_int_get(op->ptr, "xmax");
-	rect.ymax = RNA_int_get(op->ptr, "ymax");
+	WM_operator_properties_border_to_rcti(op, &rect);
 
 	ED_clip_point_stable_pos(sc, ar, rect.xmin, rect.ymin, &rectf.xmin, &rectf.ymin);
 	ED_clip_point_stable_pos(sc, ar, rect.xmax, rect.ymax, &rectf.xmax, &rectf.ymax);

Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c	2012-08-08 19:54:31 UTC (rev 49718)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c	2012-08-08 20:38:55 UTC (rev 49719)
@@ -243,10 +243,7 @@
 
 	if (result == OPERATOR_RUNNING_MODAL) {
 
-		rect.xmin = RNA_int_get(op->ptr, "xmin");
-		rect.ymin = RNA_int_get(op->ptr, "ymin");
-		rect.xmax = RNA_int_get(op->ptr, "xmax");
-		rect.ymax = RNA_int_get(op->ptr, "ymax");

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list