decl_Region (decl_dbShapeCollection, "db", "Region",
"@brief Converts the region to a string\n"
"This version allows specification of the maximum number of polygons contained in the string."
) +
+ method_ext ("rasterize", &rasterize1, gsi::arg ("origin"), gsi::arg ("pixel_size"), gsi::arg ("nx"), gsi::arg ("ny"),
+ "@brief A grayscale rasterizer delivering the area covered per pixel\n"
+ "@param origin The lower-left corner of the lowest-left pixel\n"
+ "@param pixel_size The dimension of each pixel (the x component gives the width, the y component the height)\n"
+ "@param nx The number of pixels in horizontal direction\n"
+ "@param ny The number of pixels in vertical direction\n"
+ "The method will create a grayscale, high-resolution density map of a rectangular region.\n"
+ "The scan region is defined by the origin, the pixel size and the number of pixels in horizontal (nx) and\n"
+ "vertical (ny) direction. The resulting array will contain the area covered by polygons from the region\n"
+ "in square database units.\n"
+ "\n"
+ "For non-overlapping polygons, the maximum density value is px*py. Overlapping polygons are counted multiple\n"
+ "times, so the actual values may be larger. If you want overlaps removed, you have to\n"
+ "merge the region before. Merge semantics does not apply for the 'rasterize' method.\n"
+ "\n"
+ "The resulting area values are precise within the limits of double-precision floating point arithmetics.\n"
+ "\n"
+ "A second version exists that allows specifying an active pixel size which is smaller than the\n"
+ "pixel distance hence allowing pixels samples that do not cover the full area, but leave gaps between the pixels.\n"
+ "\n"
+ "This method has been added in version 0.29.\n"
+ ) +
+ method_ext ("rasterize", &rasterize2, gsi::arg ("origin"), gsi::arg ("pixel_distance"), gsi::arg ("pixel_size"), gsi::arg ("nx"), gsi::arg ("ny"),
+ "@brief A version of 'rasterize' that allows a pixel step distance which is larger than the pixel size\n"
+ "This version behaves like the first variant of 'rasterize', but the pixel distance (pixel-to-pixel step raster)\n"
+ "can be specified separately from the pixel size. Currently, the pixel size must be equal or smaller than the\n"
+ "pixel distance - i.e. the pixels must not overlap.\n"
+ "\n"
+ "This method has been added in version 0.29.\n"
+ ) +
method ("enable_progress", &db::Region::enable_progress, gsi::arg ("label"),
"@brief Enable progress reporting\n"
"After calling this method, the region will report the progress through a progress bar while "
diff --git a/src/doc/doc/about/drc_ref_global.xml b/src/doc/doc/about/drc_ref_global.xml
index f18b0f0e7..670651628 100644
--- a/src/doc/doc/about/drc_ref_global.xml
+++ b/src/doc/doc/about/drc_ref_global.xml
@@ -828,7 +828,7 @@ The following example selects all shapes which are rectangles and
whose area is larger than 0.5 square micrometers:
-out = in.drc(if_all(area > 0.5, rectangle))
+out = in.drc(if_all(area > 0.5, rectangles))
The condition expressions may be of any type (edges, edge pairs and polygons).
diff --git a/src/drc/drc/built-in-macros/_drc_cop_integration.rb b/src/drc/drc/built-in-macros/_drc_cop_integration.rb
index 40b93cbfe..8bf358bf0 100644
--- a/src/drc/drc/built-in-macros/_drc_cop_integration.rb
+++ b/src/drc/drc/built-in-macros/_drc_cop_integration.rb
@@ -555,7 +555,7 @@ module DRC
# whose area is larger than 0.5 square micrometers:
#
# @code
- # out = in.drc(if_all(area > 0.5, rectangle))
+ # out = in.drc(if_all(area > 0.5, rectangles))
# @/code
#
# The condition expressions may be of any type (edges, edge pairs and polygons).
diff --git a/src/laybasic/laybasic/layMouseTracker.cc b/src/laybasic/laybasic/layMouseTracker.cc
index 4de45d0f3..3c531e29b 100644
--- a/src/laybasic/laybasic/layMouseTracker.cc
+++ b/src/laybasic/laybasic/layMouseTracker.cc
@@ -105,15 +105,22 @@ MouseTracker::mouse_move_event (const db::DPoint &p, unsigned int /*buttons*/, b
double max_coord = 1e30; // big enough I guess
- mp_markers.push_back (new lay::DMarker (mp_view));
- mp_markers.back ()->set_line_style (m_cursor_line_style);
- mp_markers.back ()->set_color (m_cursor_color);
- mp_markers.back ()->set (db::DEdge (db::DPoint (tp.x (), -max_coord), db::DPoint (tp.x (), max_coord)));
+ for (int i = 0; i < 2; ++i) {
- mp_markers.push_back (new lay::DMarker (mp_view));
- mp_markers.back ()->set_line_style (m_cursor_line_style);
- mp_markers.back ()->set_color (m_cursor_color);
- mp_markers.back ()->set (db::DEdge (db::DPoint (-max_coord, tp.y ()), db::DPoint (max_coord, tp.y ())));
+ mp_markers.push_back (new lay::DMarker (mp_view));
+ mp_markers.back ()->set_line_style (m_cursor_line_style);
+ mp_markers.back ()->set_line_width (1);
+ mp_markers.back ()->set_halo (false);
+ mp_markers.back ()->set_dither_pattern (1);
+ mp_markers.back ()->set_color (m_cursor_color.is_valid () ? m_cursor_color : mp_view->canvas ()->foreground_color ());
+
+ if (i == 0) {
+ mp_markers.back ()->set (db::DEdge (db::DPoint (tp.x (), -max_coord), db::DPoint (tp.x (), max_coord)));
+ } else {
+ mp_markers.back ()->set (db::DEdge (db::DPoint (-max_coord, tp.y ()), db::DPoint (max_coord, tp.y ())));
+ }
+
+ }
}
diff --git a/src/laybasic/laybasic/layMove.cc b/src/laybasic/laybasic/layMove.cc
index ab6c4d6d6..4bc22e7d0 100644
--- a/src/laybasic/laybasic/layMove.cc
+++ b/src/laybasic/laybasic/layMove.cc
@@ -305,10 +305,7 @@ MoveService::handle_click (const db::DPoint &p, unsigned int buttons, bool drag_
if (mp_editables->begin_move (p, ac_from_buttons (buttons))) {
- lay::SelectionService *selector = mp_view->selection_service ();
- if (selector) {
- selector->hover_reset ();
- }
+ ui ()->hover_reset ();
mp_view->clear_transient_selection ();
diff --git a/src/laybasic/laybasic/laySelector.h b/src/laybasic/laybasic/laySelector.h
index a47789158..6ad7600a9 100644
--- a/src/laybasic/laybasic/laySelector.h
+++ b/src/laybasic/laybasic/laySelector.h
@@ -69,14 +69,7 @@ public:
virtual bool mouse_click_event (const db::DPoint &p, unsigned int buttons, bool prio);
virtual bool mouse_double_click_event (const db::DPoint &p, unsigned int buttons, bool prio);
virtual bool wheel_event (int delta, bool horizontal, const db::DPoint &p, unsigned int buttons, bool prio);
-
- /**
- * @brief Reset the hover timer for the transient selection
- *
- * This method may be used by other services (in particular Move) to avoid the transient to
- * be triggered from a move operation.
- */
- void hover_reset ();
+ virtual void hover_reset ();
#if defined (HAVE_QT)
public slots:
diff --git a/src/laybasic/laybasic/layViewObject.cc b/src/laybasic/laybasic/layViewObject.cc
index 0927fd261..d794fe87f 100644
--- a/src/laybasic/laybasic/layViewObject.cc
+++ b/src/laybasic/laybasic/layViewObject.cc
@@ -1051,7 +1051,15 @@ ViewObjectUI::drag_cancel ()
}
}
-namespace
+void
+ViewObjectUI::hover_reset ()
+{
+ for (service_iterator svc = begin_services (); svc != end_services (); ++svc) {
+ (*svc)->hover_reset ();
+ }
+}
+
+namespace
{
struct z_order_compare_f
{
diff --git a/src/laybasic/laybasic/layViewObject.h b/src/laybasic/laybasic/layViewObject.h
index 76f9b5175..8ba1bebb9 100644
--- a/src/laybasic/laybasic/layViewObject.h
+++ b/src/laybasic/laybasic/layViewObject.h
@@ -147,6 +147,17 @@ public:
virtual bool drop_event (const db::DPoint & /*p*/, const DragDropDataBase * /*data*/) { return false; }
#endif
+ /**
+ * @brief Hover reset request
+ *
+ * This event is issued for services providing some "hover" mode - i.e. capture
+ * mouse move events and start a timer on them.
+ *
+ * The implementation of this event should cancel this timer and
+ * not raise a hover condition.
+ */
+ virtual void hover_reset () { }
+
/**
* @brief Mouse press event handler
*
@@ -605,6 +616,11 @@ public:
*/
void drag_cancel ();
+ /**
+ * @brief Calls hover_reset on all services
+ */
+ void hover_reset ();
+
/**
* @brief CanvasPlane rendering
*
diff --git a/src/layui/layui/LayoutViewConfigPage2d.ui b/src/layui/layui/LayoutViewConfigPage2d.ui
index ad779f091..f70f43881 100644
--- a/src/layui/layui/LayoutViewConfigPage2d.ui
+++ b/src/layui/layui/LayoutViewConfigPage2d.ui
@@ -55,9 +55,6 @@