Fix error in DrawBinOp::drawPort in text flip handling. For #1744.

Expose DrawBin class for using in IntOp
Use DrawBin::drawPort to correct port flipping in IntOps. For #1745

Author: highperformancecoder

model/intOp.cc

@@ -41,8 +41,7 @@ namespace minsky
   { 	  
       // if rotation is in 1st or 3rd quadrant, rotate as
       // normal, otherwise flip the text so it reads L->R
-      const double angle=rotation() * M_PI / 180.0;
-      const bool textFlipped=flipped(rotation());
+    auto [angle,textFlipped]=rotationAsRadians();
       double coupledIntTranslation=0;
       const float z=zoomFactor();
 
@@ -55,34 +54,33 @@ namespace minsky
 
       if (coupled())
         {
+          cairo::CairoSave cs(cairo);
           auto& iv=*intVar;
           const RenderVariable rv(iv,cairo);
           // we need to add some translation if the variable is bound
-          cairo_rotate(cairo,rotation()*M_PI/180.0);
+          cairo_rotate(cairo,angle);
           coupledIntTranslation=-0.5*(intVarOffset+2*rv.width()+2+r)*z;
           if (rv.width()<iv.iWidth()) coupledIntTranslation=-0.5*(intVarOffset+2*iv.iWidth()+2+r)*z;
-          cairo_rotate(cairo,-rotation()*M_PI/180.0);
         }
 
-      cairo_save(cairo);
-      cairo_rotate(cairo, angle); 
 
+      {
+        cairo::CairoSave cs(cairo);
+        cairo_rotate(cairo, angle); 
+        cairo_scale(cairo,z,z);
+        if (textFlipped) cairo_rotate(cairo, M_PI);
+        const double sf = scaleFactor();  
+        cairo_scale(cairo,sf,sf);		  
+        cairo_move_to(cairo,-7,3.5);
+        cairo_show_text(cairo,"∫dt");
+      }
+      DrawBinOp d(cairo, zoomFactor());
+      d.drawPort([&](){d.drawSymbol("0");}, l,h,rotation()); 
+      d.drawPort([&](){d.drawSymbol("f");}, l,-h,rotation()); 
+      
       cairo_save(cairo); 
-      cairo_scale(cairo,z,z);
-      if (textFlipped) cairo_rotate(cairo, M_PI);
-      const double sf = scaleFactor();  
-      cairo_scale(cairo,sf,sf);		  
-      cairo_move_to(cairo,-7,3.5);
-      cairo_show_text(cairo,"\xE2\x88\xAB");
-      cairo_show_text(cairo,"dt");
-      // label the initial condition port
-      cairo_scale(cairo,0.5,0.5);
-      cairo_move_to(cairo,-19,19);
-      cairo_show_text(cairo,"0");
-      cairo_move_to(cairo,-19,-15);
-      cairo_show_text(cairo,"f");
-      cairo_restore(cairo);
-        
+      cairo_rotate(cairo, angle); 
+       
       int intVarWidth=0;
 
 

model/operation.cc

@@ -39,79 +39,6 @@
 using namespace ecolab;
 using ecolab::cairo::CairoSave;
 
-namespace
-{
-  struct DrawBinOp
-  {
-    cairo_t *cairo;
-    double zoomFactor;
-    DrawBinOp(cairo_t *cairo, double z=1): cairo(cairo), zoomFactor(z) {}
-
-    void drawPlus() const
-    {
-      cairo_move_to(cairo,0,-5);
-      cairo_line_to(cairo,0,5);
-      cairo_move_to(cairo,-5,0);
-      cairo_line_to(cairo,5,0);
-      cairo_stroke(cairo);
-    }
-
-    void drawMinus() const
-    {
-      cairo_move_to(cairo,-5,0);
-      cairo_line_to(cairo,5,0);
-      cairo_stroke(cairo);
-    }
-
-    void drawMultiply() const
-    {
-      cairo_move_to(cairo,-5,-5);
-      cairo_line_to(cairo,5,5);
-      cairo_move_to(cairo,-5,5);
-      cairo_line_to(cairo,5,-5);
-      cairo_stroke(cairo);
-    }
-
-    void drawDivide() const
-    {
-      cairo_move_to(cairo,-5,0);
-      cairo_line_to(cairo,5,0);
-      cairo_new_sub_path(cairo);
-      cairo_arc(cairo,0,3,1,0,2*M_PI);
-      cairo_new_sub_path(cairo);
-      cairo_arc(cairo,0,-3,1,0,2*M_PI);
-      cairo_stroke(cairo);
-    }
-
-    void drawSymbol(const char* s) const
-    {
-      cairo_scale(cairo,zoomFactor,zoomFactor);
-      cairo_move_to(cairo,-5,0);
-      cairo_show_text(cairo,s);
-    }
-
-    // puts a small symbol to identify port
-    // x, y = position of symbol
-    template <class F>
-    void drawPort(F f, float x, float y, float rotation)  const
-    {
-      const CairoSave cs(cairo);
-      
-      const double angle=rotation * M_PI / 180.0;
-      if (rotation)
-        y=-y;
-      cairo_rotate(cairo, angle);
-      
-      cairo_translate(cairo,0.7*x,0.6*y);
-      cairo_scale(cairo,0.5,0.5);
-      
-      // and counter-rotate
-      cairo_rotate(cairo, -angle);
-      f();
-    }
-  };
-}
-
 namespace minsky
 {
   namespace

model/operation.h

@@ -115,6 +115,77 @@ namespace minsky
     /// @}
 
   };
+
+  /// helper class to draw port label symbols
+  struct DrawBinOp
+  {
+    cairo_t *cairo;
+    double zoomFactor;
+    DrawBinOp(cairo_t *cairo, double z=1): cairo(cairo), zoomFactor(z) {}
+
+    void drawPlus() const
+    {
+      cairo_move_to(cairo,0,-5);
+      cairo_line_to(cairo,0,5);
+      cairo_move_to(cairo,-5,0);
+      cairo_line_to(cairo,5,0);
+      cairo_stroke(cairo);
+    }
+
+    void drawMinus() const
+    {
+      cairo_move_to(cairo,-5,0);
+      cairo_line_to(cairo,5,0);
+      cairo_stroke(cairo);
+    }
+
+    void drawMultiply() const
+    {
+      cairo_move_to(cairo,-5,-5);
+      cairo_line_to(cairo,5,5);
+      cairo_move_to(cairo,-5,5);
+      cairo_line_to(cairo,5,-5);
+      cairo_stroke(cairo);
+    }
+
+    void drawDivide() const
+    {
+      cairo_move_to(cairo,-5,0);
+      cairo_line_to(cairo,5,0);
+      cairo_new_sub_path(cairo);
+      cairo_arc(cairo,0,3,1,0,2*M_PI);
+      cairo_new_sub_path(cairo);
+      cairo_arc(cairo,0,-3,1,0,2*M_PI);
+      cairo_stroke(cairo);
+    }
+
+    void drawSymbol(const char* s) const
+    {
+      cairo_scale(cairo,zoomFactor,zoomFactor);
+      cairo_move_to(cairo,-5,0);
+      cairo_show_text(cairo,s);
+    }
+  
+    // puts a small symbol to identify port
+    // x, y = position of symbol
+    template <class F>
+    void drawPort(F f, float x, float y, float rotation)  const
+    {
+      const ecolab::cairo::CairoSave cs(cairo);
+      
+      const double angle=rotation * M_PI / 180.0;
+      if (minsky::flipped(rotation))
+        y=-y;
+      cairo_rotate(cairo, angle);
+      
+      cairo_translate(cairo,0.7*x,0.6*y);
+      cairo_scale(cairo,0.5,0.5);
+      
+      // and counter-rotate
+      cairo_rotate(cairo, -angle);
+      f();
+    }
+  };
 }
 
 #include "operation.cd"