UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[python/matplotlib] Add Text, simplify Dots

Browse Source
This commit is contained in:
Romain Goyet
2020-03-11 16:01:02 -04:00
committed by Émilie Feral
parent 5ada80d03b
commit a6773ad73b
6 changed files with 118 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
python/port/mod/matplotlib/modpyplot.cpp
View File

@@ -2,11 +2,13 @@ extern "C" {
#include "modpyplot.h"
}
#include <assert.h>
#include <escher/palette.h>
#include "port.h"
#include "plot_controller.h"
Matplotlib::PlotStore * sPlotStore = nullptr;
Matplotlib::PlotController * sPlotController = nullptr;
static int paletteIndex = 0; // FIXME: Needs to be reset at some point
// Internal functions
@@ -67,10 +69,24 @@ mp_obj_t modpyplot_plot(mp_obj_t x, mp_obj_t y) {
mp_obj_get_array(x, &xLength, &xItems);
mp_obj_get_array(y, &yLength, &yItems);
if (xLength != yLength) {
mp_raise_msg(&mp_type_ValueError, "x and y must have same dimension");
mp_raise_ValueError("x and y must have same dimension");
}
sPlotStore->addDots(x, y);
KDColor color = Palette::DataColor[paletteIndex++]; // FIXME: Share overflow routine
for (size_t i=0; i<xLength; i++) {
sPlotStore->addDot(xItems[i], yItems[i], color);
}
return mp_const_none;
}
mp_obj_t modpyplot_text(mp_obj_t x, mp_obj_t y, mp_obj_t s) {
// Input parameter validation
mp_obj_get_float(x);
mp_obj_get_float(y);
mp_obj_str_get_str(s);
sPlotStore->addText(x, y, s);
return mp_const_none;
}