Merge pull request #2327 from KLayout/feature/issue-2322

klayoutmatthias · web-flow · commit 09ee4aefff4e · 2026-04-14T08:57:52.000+02:00
Feature/issue 2322
diff --git a/src/edt/edt/edtPartialService.cc b/src/edt/edt/edtPartialService.cc
@@ -2288,7 +2288,7 @@ bool
 PartialService::key_event (unsigned int key, unsigned int buttons)
 {
   if (m_moving && buttons == 0 && (key == lay::KeyEnter || key == lay::KeyReturn)) {
-    mp_view->move_service ()->end_move ();
+    mp_view->move_service ()->finish_move ();
     return true;
   } else {
     return false;
diff --git a/src/laybasic/laybasic/layBitmapRenderer.cc b/src/laybasic/laybasic/layBitmapRenderer.cc
@@ -389,9 +389,13 @@ BitmapRenderer::draw (const db::Shape &shape, const db::CplxTrans &trans,
       db::DCoord h = trans.mag () * m_default_text_size;
       db::Font font = shape.text_font () == db::NoFont ? m_font : shape.text_font ();
 
-      if (m_apply_text_trans && font != db::NoFont && font != db::DefaultFont) {
-        fp = db::DFTrans (trans.fp_trans () * shape.text_trans ());
-        h = trans.mag () * (shape.text_size () > 0 ? shape.text_size () : m_default_text_size);
+      if (font != db::NoFont && font != db::DefaultFont) {
+        if ((m_apply_text_trans_mode & 2) != 0) {
+          fp = db::DFTrans (trans.fp_trans () * shape.text_trans ());
+        }
+        if ((m_apply_text_trans_mode & 1) != 0) {
+          h = trans.mag () * (shape.text_size () > 0 ? shape.text_size () : m_default_text_size);
+        }
       }
 
       db::HAlign halign = shape.text_halign ();
@@ -1090,9 +1094,13 @@ BitmapRenderer::draw (const db::Text &txt, const db::CplxTrans &trans,
     db::DCoord h = trans.mag () * m_default_text_size;
     db::Font font = txt.font () == db::NoFont ? m_font : txt.font ();
 
-    if (m_apply_text_trans && font != db::NoFont && font != db::DefaultFont) {
-      fp = db::DFTrans (trans.fp_trans () * txt.trans ());
-      h = trans.mag () * (txt.size () > 0 ? txt.size () : m_default_text_size);
+    if (font != db::NoFont && font != db::DefaultFont) {
+      if ((m_apply_text_trans_mode & 2) != 0) {
+        fp = db::DFTrans (trans.fp_trans () * txt.trans ());
+      }
+      if ((m_apply_text_trans_mode & 1) != 0) {
+        h = trans.mag () * (txt.size () > 0 ? txt.size () : m_default_text_size);
+      }
     }
 
     double fy = 0.0;
@@ -1161,9 +1169,13 @@ BitmapRenderer::draw (const db::DText &txt, const db::DCplxTrans &trans,
     db::DCoord h = trans.ctrans (m_default_text_size_dbl);
     db::Font font = txt.font () == db::NoFont ? m_font : txt.font ();
 
-    if (m_apply_text_trans && font != db::NoFont && font != db::DefaultFont) {
-      fp = trans.fp_trans () * db::DFTrans (txt.trans ());
-      h = trans.ctrans (txt.size () > 0 ? txt.size () : m_default_text_size_dbl);
+    if (font != db::NoFont && font != db::DefaultFont) {
+      if ((m_apply_text_trans_mode & 2) != 0) {
+        fp = trans.fp_trans () * db::DFTrans (txt.trans ());
+      }
+      if ((m_apply_text_trans_mode & 1) != 0) {
+        h = trans.ctrans (txt.size () > 0 ? txt.size () : m_default_text_size_dbl);
+      }
     }
 
     double fy = 0.0;
diff --git a/src/laybasic/laybasic/layLayoutViewBase.cc b/src/laybasic/laybasic/layLayoutViewBase.cc
@@ -351,6 +351,7 @@ LayoutViewBase::init (db::Manager *mgr)
   m_bitmap_caching = true;
   m_show_properties = false;
   m_apply_text_trans = true;
+  m_apply_text_trans_mode = 3;
   m_default_text_size = 0.1;
   m_text_point_mode = false;
   m_text_font = 0;
@@ -1029,6 +1030,13 @@ LayoutViewBase::configure (const std::string &name, const std::string &value)
     apply_text_trans (flag);
     return true;
 
+  } else if (name == cfg_apply_text_trans_mode) {
+
+    unsigned int mode;
+    tl::from_string (value, mode);
+    apply_text_trans_mode (mode);
+    return true;
+
   } else if (name == cfg_markers_visible) {
 
     bool flag;
@@ -5541,7 +5549,16 @@ LayoutViewBase::apply_text_trans (bool f)
   }
 }
   
-void 
+void
+LayoutViewBase::apply_text_trans_mode (unsigned int m)
+{
+  if (m_apply_text_trans_mode != m) {
+    m_apply_text_trans_mode = m;
+    redraw ();
+  }
+}
+
+void
 LayoutViewBase::offset_stipples (bool f)
 {
   if (m_stipple_offset != f) {
diff --git a/src/laybasic/laybasic/layLayoutViewBase.h b/src/laybasic/laybasic/layLayoutViewBase.h
@@ -1400,6 +1400,26 @@ class LAYBASIC_PUBLIC LayoutViewBase :
     return m_apply_text_trans;
   }
   
+  /**
+   *  @brief Sets the mode how to apply the text transformation
+   *
+   *  The mode value has two bits:
+   *  - bit 0: apply scaling
+   *  - bit 1: apply rotation
+   *
+   *  The default is mode "3" (scaling and rotation).
+   *  The mode is effective only if "apply_text_trans" is true.
+   */
+  void apply_text_trans_mode (unsigned int m);
+
+  /**
+   *  @brief Gets the mode how to apply the text transformation
+   */
+  unsigned int apply_text_trans_mode () const
+  {
+    return m_apply_text_trans ? m_apply_text_trans_mode : 0;
+  }
+
   /**
    *  @brief Text object color
    */
@@ -3074,6 +3094,7 @@ class LAYBASIC_PUBLIC LayoutViewBase :
   bool m_show_properties;
   tl::Color m_text_color;
   bool m_apply_text_trans;
+  unsigned int m_apply_text_trans_mode;
   double m_default_text_size;
   bool m_text_point_mode;
   unsigned int m_text_font;
diff --git a/src/laybasic/laybasic/layLayoutViewConfig.cc b/src/laybasic/laybasic/layLayoutViewConfig.cc
@@ -67,6 +67,7 @@ class LayoutViewBasicConfigDeclaration
     options.push_back (std::pair<std::string, std::string> (cfg_bitmap_caching, "true"));
     options.push_back (std::pair<std::string, std::string> (cfg_show_properties, "false"));
     options.push_back (std::pair<std::string, std::string> (cfg_apply_text_trans, "true"));
+    options.push_back (std::pair<std::string, std::string> (cfg_apply_text_trans_mode, "3"));
     options.push_back (std::pair<std::string, std::string> (cfg_global_trans, "r0"));
     options.push_back (std::pair<std::string, std::string> (cfg_default_text_size, "0.1"));
     options.push_back (std::pair<std::string, std::string> (cfg_text_point_mode, "false"));
diff --git a/src/laybasic/laybasic/layMarker.cc b/src/laybasic/laybasic/layMarker.cc
@@ -640,7 +640,7 @@ ShapeMarker::render (const Viewport &vp, ViewObjectCanvas &canvas)
   lay::Renderer &r = canvas.renderer ();
 
   r.set_font (db::Font (view ()->text_font ()));
-  r.apply_text_trans (view ()->apply_text_trans ());
+  r.apply_text_trans_mode (view ()->apply_text_trans_mode ());
   r.default_text_size (view ()->default_text_size () / ly->dbu ());
   r.set_precise (true);
 
@@ -1171,7 +1171,7 @@ Marker::render (const Viewport &vp, ViewObjectCanvas &canvas)
   lay::Renderer &r = canvas.renderer ();
 
   r.set_font (db::Font (view ()->text_font ()));
-  r.apply_text_trans (view ()->apply_text_trans ());
+  r.apply_text_trans_mode (view ()->apply_text_trans_mode ());
   r.default_text_size (view ()->default_text_size () / dbu ());
   r.set_precise (true);
 
@@ -1319,7 +1319,7 @@ DMarker::render (const Viewport &vp, ViewObjectCanvas &canvas)
   lay::Renderer &r = canvas.renderer ();
 
   r.set_font (db::Font (view ()->text_font ()));
-  r.apply_text_trans (view ()->apply_text_trans ());
+  r.apply_text_trans_mode (view ()->apply_text_trans_mode ());
   r.default_text_size_dbl (view ()->default_text_size ());
   r.set_precise (true);
 
diff --git a/src/laybasic/laybasic/layMove.cc b/src/laybasic/laybasic/layMove.cc
@@ -118,7 +118,7 @@ MoveService::key_event (unsigned int key, unsigned int buttons)
   }
 
   if (buttons == 0 && (key == lay::KeyEnter || key == lay::KeyReturn)) {
-    end_move ();
+    finish_move ();
     return true;
   }
 
@@ -378,7 +378,7 @@ MoveService::start_move (db::Transaction *transaction, bool transient_selection)
 }
 
 void
-MoveService::end_move ()
+MoveService::finish_move ()
 {
   if (m_dragging) {
     handle_click (m_mouse_pos, 0, false, 0);
diff --git a/src/laybasic/laybasic/layMove.h b/src/laybasic/laybasic/layMove.h
@@ -45,7 +45,7 @@ class LAYBASIC_PUBLIC MoveService :
   ~MoveService ();
 
   bool start_move (db::Transaction *transaction = 0, bool transient_selection = false);
-  void end_move ();
+  void finish_move ();
 
   bool configure (const std::string &name, const std::string &value);
   void function (const std::string &name, const std::string &value);
diff --git a/src/laybasic/laybasic/layRedrawThreadWorker.cc b/src/laybasic/laybasic/layRedrawThreadWorker.cc
@@ -151,7 +151,7 @@ RedrawThreadWorker::RedrawThreadWorker (RedrawThread *redraw_thread)
   m_text_lazy_rendering = false;
   m_bitmap_caching = false;
   m_show_properties = false;
-  m_apply_text_trans = false;
+  m_apply_text_trans_mode = 0;
   m_default_text_size = 0.0;
   m_drop_small_cells = false;
   m_drop_small_cells_value = 0;
@@ -291,7 +291,7 @@ RedrawThreadWorker::perform_task (tl::Task *task)
           mp_renderer->draw_description_property (false);
           mp_renderer->default_text_size (m_default_text_size / mp_layout->dbu ());
           mp_renderer->set_font (db::Font (m_text_font));
-          mp_renderer->apply_text_trans (m_apply_text_trans);
+          mp_renderer->apply_text_trans_mode (m_apply_text_trans_mode);
 
           for (std::vector<db::DCplxTrans>::const_iterator t = li.trans.begin (); t != li.trans.end (); ++t) {
             db::CplxTrans trans = m_vp_trans * *t * db::CplxTrans (mp_layout->dbu ());
@@ -533,7 +533,7 @@ RedrawThreadWorker::perform_task (tl::Task *task)
         mp_renderer->draw_description_property (true);
         mp_renderer->default_text_size (db::Coord (m_default_text_size / mp_layout->dbu ()));
         mp_renderer->set_font (db::Font (m_text_font));
-        mp_renderer->apply_text_trans (m_apply_text_trans);
+        mp_renderer->apply_text_trans_mode (m_apply_text_trans_mode);
 
         bool f = m_text_lazy_rendering;
 
@@ -693,7 +693,7 @@ RedrawThreadWorker::setup (LayoutViewBase *view, RedrawThreadCanvas *canvas, con
   m_text_lazy_rendering = view->text_lazy_rendering ();
   m_bitmap_caching = view->bitmap_caching ();
   m_show_properties = view->show_properties_as_text ();
-  m_apply_text_trans = view->apply_text_trans ();
+  m_apply_text_trans_mode = view->apply_text_trans_mode ();
   m_default_text_size = view->default_text_size ();
   m_drop_small_cells = view->drop_small_cells ();
   m_drop_small_cells_value = view->drop_small_cells_value ();
diff --git a/src/laybasic/laybasic/layRedrawThreadWorker.h b/src/laybasic/laybasic/layRedrawThreadWorker.h
@@ -224,7 +224,7 @@ class RedrawThreadWorker
   bool m_text_lazy_rendering;
   bool m_bitmap_caching;
   bool m_show_properties;
-  bool m_apply_text_trans;
+  unsigned int m_apply_text_trans_mode;
   double m_default_text_size;
   bool m_drop_small_cells;
   unsigned int m_drop_small_cells_value;
diff --git a/src/laybasic/laybasic/layRenderer.cc b/src/laybasic/laybasic/layRenderer.cc
@@ -42,7 +42,7 @@ Renderer::Renderer (unsigned int width, unsigned int height, double resolution,
     m_draw_description_property (false),
     m_default_text_size (1000),
     m_default_text_size_dbl (1.0),
-    m_apply_text_trans (true),
+    m_apply_text_trans_mode (3),
     m_precise (false),
     m_xfill (false),
     m_font (db::DefaultFont),
diff --git a/src/laybasic/laybasic/layRenderer.h b/src/laybasic/laybasic/layRenderer.h
@@ -164,19 +164,23 @@ class LAYBASIC_PUBLIC Renderer
   }
 
   /**
-   *  @brief Apply text transformations to text or not for draw(db::Text..).
+   *  @brief How to apply text transformations for draw(db::Text..).
+   *
+   *  This is a bit field:
+   *  - bit 0: apply scaling
+   *  - bit 1: apply rotation
    */
-  void apply_text_trans (bool f)
+  void apply_text_trans_mode (unsigned int m)
   {
-    m_apply_text_trans = f;
+    m_apply_text_trans_mode = m;
   }
 
   /**
-   *  @brief Get the flag which determines to apply text transformations for draw(db::Text..)
+   *  @brief Get the value indicating how to apply text transformation for draw(db::Text..).
    */
-  bool apply_text_trans () const
+  unsigned int apply_text_trans_mode () const
   {
-    return m_apply_text_trans;
+    return m_apply_text_trans_mode;
   }
 
   /**
@@ -415,7 +419,7 @@ class LAYBASIC_PUBLIC Renderer
   bool m_draw_description_property;
   db::DCoord m_default_text_size;
   double m_default_text_size_dbl;
-  bool m_apply_text_trans;
+  unsigned int m_apply_text_trans_mode;
   bool m_precise;
   bool m_xfill;
   db::Font m_font;
diff --git a/src/laybasic/laybasic/layTextInfo.cc b/src/laybasic/laybasic/layTextInfo.cc
@@ -32,7 +32,7 @@ namespace lay
 TextInfo::TextInfo (const LayoutViewBase *view)
   : m_default_text_size (view->default_text_size ()),
     m_default_font (db::Font (view->text_font ())),
-    m_apply_text_trans (view->apply_text_trans ()),
+    m_apply_text_trans_mode (view->apply_text_trans_mode ()),
     m_resolution (view->canvas ()->font_resolution ()),
     m_point_mode (view->text_point_mode ())
 {
@@ -49,14 +49,18 @@ TextInfo::bbox (const db::DText &text, const db::DCplxTrans &vp_trans) const
   //  offset in pixels (space between origin and text)
   const double offset = 2.0 / vp_trans.mag ();
 
-  db::DTrans tt = text.trans ();
+  db::DTrans tt;
   db::DCoord h;
   db::Font font = text.font () == db::NoFont ? m_default_font : text.font ();
 
-  if (m_apply_text_trans && font != db::NoFont && font != db::DefaultFont) {
+  if ((m_apply_text_trans_mode & 2) != 0 && font != db::NoFont && font != db::DefaultFont) {
+    tt = text.trans ();
+  } else {
+    tt = db::DTrans (vp_trans.fp_trans ().inverted ().angle (), text.trans ().disp ());
+  }
+  if (((m_apply_text_trans_mode & 1) != 0) && font != db::NoFont && font != db::DefaultFont) {
     h = text.size () > 0 ? text.size () : m_default_text_size;
   } else {
-    tt = db::DTrans (vp_trans.fp_trans ().inverted ().angle (), tt.disp ());
     h = m_default_text_size;
   }
 
diff --git a/src/laybasic/laybasic/layTextInfo.h b/src/laybasic/laybasic/layTextInfo.h
@@ -74,7 +74,7 @@ class LAYBASIC_PUBLIC TextInfo
 private:
   double m_default_text_size;
   db::Font m_default_font;
-  bool m_apply_text_trans;
+  unsigned int m_apply_text_trans_mode;
   double m_resolution;
   bool m_point_mode;
 };
diff --git a/src/laybasic/laybasic/laybasicConfig.h b/src/laybasic/laybasic/laybasicConfig.h
@@ -103,6 +103,7 @@ static const std::string cfg_text_lazy_rendering ("text-lazy-rendering");
 static const std::string cfg_bitmap_caching ("bitmap-caching");
 static const std::string cfg_show_properties ("show-properties");
 static const std::string cfg_apply_text_trans ("apply-text-trans");
+static const std::string cfg_apply_text_trans_mode ("apply-text-trans-mode");
 static const std::string cfg_global_trans ("global-trans");
 static const std::string cfg_no_stipple ("no-stipple");
 static const std::string cfg_stipple_offset ("stipple-offset");
diff --git a/src/laybasic/unit_tests/layTextInfoTests.cc b/src/laybasic/unit_tests/layTextInfoTests.cc
@@ -123,4 +123,25 @@ TEST(1)
   EXPECT_EQ (ti.bbox (text, db::DCplxTrans ()).to_string (), "(12,20.6;24,27)");
   EXPECT_EQ (ti.bbox (text, db::DCplxTrans (2.0)).to_string (), "(11,19.6;23,26)");
   EXPECT_EQ (ti.bbox (text, db::DCplxTrans (db::DFTrans (1))).to_string (), "(10.6,6;17,18)");
+
+  //  apply_text_trans = true, scale only
+  lv.apply_text_trans (true);
+  lv.apply_text_trans_mode (1);
+  ti = lay::TextInfo (&lv);
+  EXPECT_EQ (ti.bbox (text3, db::DCplxTrans ()).to_string (), "(12,15;134,83)");
+  //  with apply_text_trans_mode not including rotation, the global transformation does change the text
+  //  bounding box.
+  EXPECT_EQ (ti.bbox (text, db::DCplxTrans ()).to_string (), "(12,20.6;24,27)");
+  EXPECT_EQ (ti.bbox (text, db::DCplxTrans (2.0)).to_string (), "(11,19.6;23,26)");
+  EXPECT_EQ (ti.bbox (text, db::DCplxTrans (db::DFTrans (1))).to_string (), "(10.6,6;17,18)");
+
+  //  apply_text_trans = true, rotation only
+  lv.apply_text_trans (true);
+  lv.apply_text_trans_mode (2);
+  ti = lay::TextInfo (&lv);
+  EXPECT_EQ (ti.bbox (text3, db::DCplxTrans ()).to_string (), "(-4.2,22;9.4,46.4)");
+  //  with apply_text_trans including rotation, the global transformation changes the text bounding box
+  EXPECT_EQ (ti.bbox (text, db::DCplxTrans ()).to_string (), "(12,20.6;24,27)");
+  EXPECT_EQ (ti.bbox (text, db::DCplxTrans (2.0)).to_string (), "(11,19.6;23,26)");
+  EXPECT_EQ (ti.bbox (text, db::DCplxTrans (db::DFTrans (1))).to_string (), "(12,20.6;24,27)");
 }
diff --git a/src/layui/layui/LayoutViewConfigPage2b.ui b/src/layui/layui/LayoutViewConfigPage2b.ui
diff --git a/src/layui/layui/layLayoutViewConfigPages.cc b/src/layui/layui/layLayoutViewConfigPages.cc

Original file line number	Diff line number	Diff line change
`@@ -2288,7 +2288,7 @@ bool`
`2288`	`2288`	`PartialService::key_event (unsigned int key, unsigned int buttons)`
`2289`	`2289`	`{`
`2290`	`2290`	`if (m_moving && buttons == 0 && (key == lay::KeyEnter \|\| key == lay::KeyReturn)) {`
`2291`		`- mp_view->move_service ()->end_move ();`
	`2291`	`+ mp_view->move_service ()->finish_move ();`
`2292`	`2292`	`return true;`
`2293`	`2293`	`} else {`
`2294`	`2294`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ MoveService::key_event (unsigned int key, unsigned int buttons)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`if (buttons == 0 && (key == lay::KeyEnter \|\| key == lay::KeyReturn)) {`
`121`		`- end_move ();`
	`121`	`+ finish_move ();`
`122`	`122`	`return true;`
`123`	`123`	`}`
`124`	`124`
`@@ -378,7 +378,7 @@ MoveService::start_move (db::Transaction *transaction, bool transient_selection)`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`void`
`381`		`-MoveService::end_move ()`
	`381`	`+MoveService::finish_move ()`
`382`	`382`	`{`
`383`	`383`	`if (m_dragging) {`
`384`	`384`	`handle_click (m_mouse_pos, 0, false, 0);`