Merge pull request #137 from godardma/master

Correction for Raster drawing (vertical flip)

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

@@ -36,6 +36,7 @@
 #include <vector>
 #include <cmath>
 #include <cstdlib>
+#include <filesystem>
 
 // Utility macro to log executed instructions on terminal
 #define VIBES_TEST(instruction) \
@@ -301,11 +302,13 @@ int main()
     }
 
     vibes::drawPoints(x,y,vibesParams("FaceColor","red","EdgeColor","darkRed","Radius",100));
+
 
-    // vibes::newFigure("test Raster");
-    // vibes::drawRaster("./raster_example.png", 10, 5, 0.1, 0.1);
+    vibes::newFigure("test Raster");
+    vibes::drawRaster(std::filesystem::current_path().string()+"/../VIBes.png", 10, 5, 0.1, 0.1);
 
     std::cout << "end drawing" << std::endl;
+
     // Not needed anymore: VIBES_TEST( vibes::endDrawing() );
 
     // Testing Vibes params system

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

@@ -1,7 +1,7 @@
 // This file is part of VIBes' C++ API
 //
 // Copyright (c) 2013-2015 Vincent Drevelle, Jeremy Nicola, Simon Rohou,
-//                         Benoit Desrochers
+//                         Benoit Desrochers, Maël Godard
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /// \file    vibes.h
 /// \brief   Vibes C++ API Header
-/// \author  Vincent Drevelle, Jeremy Nicola, Simon Rohou, Benoit Desrochers
+/// \author  Vincent Drevelle, Jeremy Nicola, Simon Rohou, Benoit Desrochers, Maël Godard
 /// \date    2013-2015
 /// \version 0.2.0beta
 //

viewer/vibesgraphicsitem.cpp

@@ -1913,7 +1913,7 @@ bool VibesGraphicsRaster::computeProjection(int dimX, int dimY)
 
         }
 
-        QTransform transform(xres, 0, 0, yres, xlb, yub);
+        QTransform transform(xres, 0, 0, -yres, xlb, yub);
         QGraphicsPixmapItem *pixmap_item = new QGraphicsPixmapItem(pixmap);
 
         pixmap_item->setShapeMode(QGraphicsPixmapItem::MaskShape);