Merge pull request #144 from le-sigwal/master

Axis Equal correction

Author: godardma

client-api/C++/examples/all_commands.cpp

@@ -276,6 +276,7 @@ int main()
 
     VIBES_TEST( vibes::axisAuto() );
     //  VIBES_TEST( vibes::axisLimits(-1,1, -3,2) );
+    VIBES_TEST( vibes::axisEqual() );
 
     VIBES_TEST( vibes::saveImage("vibes_test.png") );
     VIBES_TEST( vibes::saveImage("vibes_test.jpg") );

client-api/C++/src/vibes.cpp

@@ -218,6 +218,14 @@ namespace vibes
     setFigureProperty(figureName.empty()?current_fig:figureName, "viewbox", "auto");
   }
 
+  //>[#144]
+  void axisEqual(const std::string &figureName)
+  {
+    beginDrawingIfNeeded();
+    setFigureProperty(figureName.empty()?current_fig:figureName, "viewbox", "equal");
+  }
+  //<[#144]
+
   void axisLimits(const double &x_lb, const double &x_ub, const double &y_lb, const double &y_ub, const std::string &figureName)
   {
     beginDrawingIfNeeded();

client-api/C++/src/vibes.h

@@ -265,6 +265,9 @@ namespace vibes {
   /// Set axes limits to the bounding box of the drawing
   void axisAuto(const std::string &figureName = std::string());
 
+  /// Set axis equal aspect ratio to the bounding box of the drawing [#144]
+  void axisEqual(const std::string &figureName = std::string());
+
   /// Specify the rectangle to be displayed: Lower-left corner (\a x_lb, \a y_lb) and a upper-right corner (\a x_ub, \a y_ub).
   void axisLimits(const double &x_lb, const double &x_ub, const double &y_lb, const double &y_ub, const std::string &figureName = std::string());
 

viewer/vibesgraphicsitem.cpp

@@ -280,7 +280,7 @@ bool VibesGraphicsItem::parseJson(QJsonObject &json)
         json.remove("format");
     }
 
-    //>[VBS_VR_000002]
+    //>[#142]
     // Hexadecimal/Short color name -> Qt Predefined color name
     //   for group color names
     if (this->_qGraphicsItem->type() == VibesGraphicsGroupType){
@@ -297,7 +297,7 @@ bool VibesGraphicsItem::parseJson(QJsonObject &json)
             }
         }
     }
-    //<[VBS_VR_000002]
+    //<[#142]
 
     // Process object name
     if (json.contains("name") && json["name"].isString())

viewer/vibesgraphicsitem.h

@@ -46,7 +46,7 @@ class VibesDefaults {
         return std::max(0.,width.toDouble());
     }
 
-    //>[VBS_VR_000002]
+    //>[#142]
     // Hexadecimal/Short color name -> Qt Predefined color name
     bool toPredefinedColorName(QString &color){
 
@@ -83,7 +83,7 @@ class VibesDefaults {
 
         return true;
     }
-    //<[VBS_VR_000002]
+    //<[#142]
 
     const QBrush brush(const QString & name = QString()) {
         if( !_brushes.contains(name)){

viewer/vibeswindow.cpp

@@ -338,10 +338,18 @@ VibesWindow::processMessage(const QByteArray &msg_data)
                         QRectF sceneSize=fig->sceneRect();
                         qreal x, y, w, h;
                         sceneSize.getRect(&x,&y,&w,&h);
-                        qreal a = std::max(h,w);
-                        x += (w-a)/2;
-                        y += (h-a)/2;
-                        fig->setSceneRect(x,y,a,a);
+
+                        //>[#144]
+                        qreal u=x+w/2.0, v=y+h/2.0;
+                        qreal m=static_cast<qreal>(fig->width());
+                        qreal n=static_cast<qreal>(fig->height());
+                        qreal cw = h/n*m;
+                        qreal ch = w/m*n;
+                        if(cw>w){ w=cw; x=u-w/2.0; }
+                        else    { h=ch; y=v-h/2.0; }
+                        fig->setSceneRect(x,y,w,h);
+                        //<[#144]
+
                         fig->fitInView(fig->sceneRect());
                     }