Make ICairoShim methods const, add Pango support, remove cairoContext

- Made all ICairoShim methods const for better const-correctness
- Added pango() method to ICairoShim for text rendering support
- Removed cairoContext() method as per review feedback
- Updated CairoShimCairo to maintain Pango instance
- Fixed operation.cc and intOp.cc to use cairoShim methods instead of raw cairo
- Updated Item::draw and displayTooltip to use cairoShim.pango()
- Changed all draw method parameters to const ICairoShim&
- Removed unnecessary cairoShimCairo.h include from item.cc
- Added ICairoShim.h include to wire.h

Co-authored-by: highperformancecoder <3075825+highperformancecoder@users.noreply.github.com>

Author: Copilot

engine/cairoShimCairo.cc

@@ -2,6 +2,7 @@
 #define CAIRO_WIN32_STATIC_BUILD
 #include <cairo.h>
 #undef CAIRO_WIN32_STATIC_BUILD
+#include <pango.h>
 
 using namespace std;
 
@@ -12,127 +13,124 @@ namespace minsky
   CairoShimCairo::~CairoShimCairo() = default;
 
   // Drawing operations
-  void CairoShimCairo::moveTo(double x, double y) 
+  void CairoShimCairo::moveTo(double x, double y) const
   {cairo_move_to(cairo,x,y);}
 
-  void CairoShimCairo::lineTo(double x, double y)
+  void CairoShimCairo::lineTo(double x, double y) const
   {cairo_line_to(cairo,x,y);}
 
-  void CairoShimCairo::relMoveTo(double x, double y)
+  void CairoShimCairo::relMoveTo(double x, double y) const
   {cairo_rel_move_to(cairo,x,y);}
 
-  void CairoShimCairo::relLineTo(double x, double y)
+  void CairoShimCairo::relLineTo(double x, double y) const
   {cairo_rel_line_to(cairo,x,y);}
 
-  void CairoShimCairo::arc(double x, double y, double radius, double start, double end)
+  void CairoShimCairo::arc(double x, double y, double radius, double start, double end) const
   {cairo_arc(cairo,x,y,radius,start,end);}
 
-  void CairoShimCairo::curveTo(double x1, double y1, double x2, double y2, double x3, double y3)
+  void CairoShimCairo::curveTo(double x1, double y1, double x2, double y2, double x3, double y3) const
   {cairo_curve_to(cairo,x1,y1,x2,y2,x3,y3);}
 
-  void CairoShimCairo::rectangle(double x, double y, double width, double height)
+  void CairoShimCairo::rectangle(double x, double y, double width, double height) const
   {cairo_rectangle(cairo,x,y,width,height);}
 
   // Path operations
-  void CairoShimCairo::newPath()
+  void CairoShimCairo::newPath() const
   {cairo_new_path(cairo);}
 
-  void CairoShimCairo::newSubPath()
+  void CairoShimCairo::newSubPath() const
   {cairo_new_sub_path(cairo);}
 
-  void CairoShimCairo::closePath()
+  void CairoShimCairo::closePath() const
   {cairo_close_path(cairo);}
 
-  void CairoShimCairo::getCurrentPoint(double& x, double& y)
+  void CairoShimCairo::getCurrentPoint(double& x, double& y) const
   {cairo_get_current_point(cairo, &x, &y);}
 
   // Fill and stroke operations
-  void CairoShimCairo::fill()
+  void CairoShimCairo::fill() const
   {cairo_fill(cairo);}
 
-  void CairoShimCairo::fillPreserve()
+  void CairoShimCairo::fillPreserve() const
   {cairo_fill_preserve(cairo);}
 
-  void CairoShimCairo::clip()
+  void CairoShimCairo::clip() const
   {cairo_clip(cairo);}
 
-  void CairoShimCairo::resetClip()
+  void CairoShimCairo::resetClip() const
   {cairo_reset_clip(cairo);}
 
-  void CairoShimCairo::stroke()
+  void CairoShimCairo::stroke() const
   {cairo_stroke(cairo);}
 
-  void CairoShimCairo::strokePreserve()
+  void CairoShimCairo::strokePreserve() const
   {cairo_stroke_preserve(cairo);}
 
-  void CairoShimCairo::paint()
+  void CairoShimCairo::paint() const
   {cairo_paint(cairo);}
 
   // Line properties
-  void CairoShimCairo::setLineWidth(double w)
+  void CairoShimCairo::setLineWidth(double w) const
   {cairo_set_line_width(cairo, w);}
 
-  double CairoShimCairo::getLineWidth()
+  double CairoShimCairo::getLineWidth() const
   {return cairo_get_line_width(cairo);}
 
-  void CairoShimCairo::setDash(const double* dashes, int num_dashes, double offset)
+  void CairoShimCairo::setDash(const double* dashes, int num_dashes, double offset) const
   {cairo_set_dash(cairo, dashes, num_dashes, offset);}
 
-  void CairoShimCairo::setFillRule(cairo_fill_rule_t fill_rule)
+  void CairoShimCairo::setFillRule(cairo_fill_rule_t fill_rule) const
   {cairo_set_fill_rule(cairo, fill_rule);}
 
   // Color operations
-  void CairoShimCairo::setSourceRGB(double r, double g, double b)
+  void CairoShimCairo::setSourceRGB(double r, double g, double b) const
   {cairo_set_source_rgb(cairo,r,g,b);}
 
-  void CairoShimCairo::setSourceRGBA(double r, double g, double b, double a)
+  void CairoShimCairo::setSourceRGBA(double r, double g, double b, double a) const
   {cairo_set_source_rgba(cairo,r,g,b,a);}
 
   // Text operations
-  void CairoShimCairo::showText(const std::string& text)
+  void CairoShimCairo::showText(const std::string& text) const
   {cairo_show_text(cairo,text.c_str());}
 
-  void CairoShimCairo::setFontSize(double size)
+  void CairoShimCairo::setFontSize(double size) const
   {cairo_set_font_size(cairo, size);}
 
-  void CairoShimCairo::textExtents(const std::string& text, cairo_text_extents_t& extents)
+  void CairoShimCairo::textExtents(const std::string& text, cairo_text_extents_t& extents) const
   {cairo_text_extents(cairo,text.c_str(),&extents);}
 
   // Transformation operations
-  void CairoShimCairo::identityMatrix()
+  void CairoShimCairo::identityMatrix() const
   {cairo_identity_matrix(cairo);}
 
-  void CairoShimCairo::translate(double x, double y)
+  void CairoShimCairo::translate(double x, double y) const
   {cairo_translate(cairo,x,y);}
 
-  void CairoShimCairo::scale(double sx, double sy)
+  void CairoShimCairo::scale(double sx, double sy) const
   {cairo_scale(cairo,sx,sy);}
 
-  void CairoShimCairo::rotate(double angle)
+  void CairoShimCairo::rotate(double angle) const
   {cairo_rotate(cairo,angle);}
 
-  void CairoShimCairo::userToDevice(double& x, double& y)
+  void CairoShimCairo::userToDevice(double& x, double& y) const
   {cairo_user_to_device(cairo, &x, &y);}
 
   // Context state operations
-  void CairoShimCairo::save()
+  void CairoShimCairo::save() const
   {cairo_save(cairo);}
 
-  void CairoShimCairo::restore()
+  void CairoShimCairo::restore() const
   {cairo_restore(cairo);}
 
   // Tolerance
-  void CairoShimCairo::setTolerance(double tolerance)
+  void CairoShimCairo::setTolerance(double tolerance) const
   {cairo_set_tolerance(cairo, tolerance);}
 
-  // Path query
-  cairo_path_t* CairoShimCairo::copyPathFlat()
-  {return cairo_copy_path_flat(cairo);}
-
-  void CairoShimCairo::pathDestroy(cairo_path_t* path)
-  {cairo_path_destroy(path);}
-
-  // Access to underlying cairo_t*
-  cairo_t* CairoShimCairo::cairoContext()
-  {return cairo;}
+  // Pango support
+  ecolab::Pango& CairoShimCairo::pango() const
+  {
+    if (!m_pango)
+      m_pango.reset(new ecolab::Pango(cairo));
+    return *m_pango;
+  }
 }

engine/cairoShimCairo.h

@@ -2,78 +2,79 @@
 #define CAIROSHIMCAIRO_H
 #include "../model/ICairoShim.h"
 #include <cairo.h>
+#include <pango.h>
+#include <memory>
+
+namespace ecolab { class Pango; }
 
 namespace minsky
 {
   /// Concrete implementation of ICairoShim using actual Cairo library
   class CairoShimCairo: public ICairoShim
   {
-    cairo_t* cairo; 
+    cairo_t* cairo;
+    mutable std::unique_ptr<ecolab::Pango> m_pango;
     CairoShimCairo(const CairoShimCairo&)=delete;
     void operator=(const CairoShimCairo&)=delete;
   public:
     CairoShimCairo(cairo_t* c);
     ~CairoShimCairo() override;
 
     // Drawing operations
-    void moveTo(double x, double y) override;
-    void lineTo(double x, double y) override;
-    void relMoveTo(double x, double y) override;
-    void relLineTo(double x, double y) override;
-    void arc(double x, double y, double radius, double start, double end) override;
-    void curveTo(double x1, double y1, double x2, double y2, double x3, double y3) override;
-    void rectangle(double x, double y, double width, double height) override;
+    void moveTo(double x, double y) const override;
+    void lineTo(double x, double y) const override;
+    void relMoveTo(double x, double y) const override;
+    void relLineTo(double x, double y) const override;
+    void arc(double x, double y, double radius, double start, double end) const override;
+    void curveTo(double x1, double y1, double x2, double y2, double x3, double y3) const override;
+    void rectangle(double x, double y, double width, double height) const override;
 
     // Path operations
-    void newPath() override;
-    void newSubPath() override;
-    void closePath() override;
-    void getCurrentPoint(double& x, double& y) override;
+    void newPath() const override;
+    void newSubPath() const override;
+    void closePath() const override;
+    void getCurrentPoint(double& x, double& y) const override;
 
     // Fill and stroke operations
-    void fill() override;
-    void fillPreserve() override;
-    void stroke() override;
-    void strokePreserve() override;
-    void clip() override;
-    void resetClip() override;
-    void paint() override;
+    void fill() const override;
+    void fillPreserve() const override;
+    void stroke() const override;
+    void strokePreserve() const override;
+    void clip() const override;
+    void resetClip() const override;
+    void paint() const override;
 
     // Line properties
-    void setLineWidth(double width) override;
-    double getLineWidth() override;
-    void setDash(const double* dashes, int num_dashes, double offset) override;
-    void setFillRule(cairo_fill_rule_t fill_rule) override;
+    void setLineWidth(double width) const override;
+    double getLineWidth() const override;
+    void setDash(const double* dashes, int num_dashes, double offset) const override;
+    void setFillRule(cairo_fill_rule_t fill_rule) const override;
 
     // Color operations
-    void setSourceRGB(double r, double g, double b) override;
-    void setSourceRGBA(double r, double g, double b, double a) override;
+    void setSourceRGB(double r, double g, double b) const override;
+    void setSourceRGBA(double r, double g, double b, double a) const override;
 
     // Text operations
-    void showText(const std::string& text) override;
-    void setFontSize(double size) override;
-    void textExtents(const std::string& text, cairo_text_extents_t& extents) override;
+    void showText(const std::string& text) const override;
+    void setFontSize(double size) const override;
+    void textExtents(const std::string& text, cairo_text_extents_t& extents) const override;
 
     // Transformation operations
-    void identityMatrix() override;
-    void translate(double x, double y) override;
-    void scale(double sx, double sy) override;
-    void rotate(double angle) override;
-    void userToDevice(double& x, double& y) override;
+    void identityMatrix() const override;
+    void translate(double x, double y) const override;
+    void scale(double sx, double sy) const override;
+    void rotate(double angle) const override;
+    void userToDevice(double& x, double& y) const override;
 
     // Context state operations
-    void save() override;
-    void restore() override;
+    void save() const override;
+    void restore() const override;
 
     // Tolerance
-    void setTolerance(double tolerance) override;
-
-    // Path query
-    cairo_path_t* copyPathFlat() override;
-    void pathDestroy(cairo_path_t* path) override;
+    void setTolerance(double tolerance) const override;
 
-    // Access to underlying cairo_t* for legacy code
-    cairo_t* cairoContext() override;
+    // Pango support
+    ecolab::Pango& pango() const override;
   };
 
 }