ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimize drawing rectangular grid

Browse source
This commit is contained in:
TT 2016-11-02 22:38:04 +09:00
parent bc6ce2963c
commit 23f2b7f695
2 changed files with 49 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nanovna.h
View file

@ -171,3 +171,6 @@ extern config_t current_config;
#define cal_status active->_cal_status #define cal_status active->_cal_status
#define frequencies active->_frequencies #define frequencies active->_frequencies
#define cal_data active->_cal_data #define cal_data active->_cal_data
#define PULSE do { palClearPad(GPIOC, GPIOC_LED); palSetPad(GPIOC, GPIOC_LED);} while(0)

55
plot.c
View file

@ -70,8 +70,8 @@ int32_t fstart = 0;
int32_t fstop = 300000000; int32_t fstop = 300000000;
int32_t fspan = 300000000; int32_t fspan = 300000000;
int32_t fgrid = 50000000; int32_t fgrid = 50000000;
int grid_offset; int16_t grid_offset;
int grid_width; int16_t grid_width;
void set_sweep(int32_t start, int stop) void set_sweep(int32_t start, int stop)
{ {
@ -153,25 +153,48 @@ smith_grid(int x, int y)
return 0; return 0;
} }
#if 0
int int
rectangular_grid(int x, int y) rectangular_grid(int x, int y)
{ {
#define FREQ(x) (((x) * (fspan / 1000) / (WIDTH-1)) * 1000 + fstart)
int c = grid_color; int c = grid_color;
//#define FREQ(x) (((x) * (fspan / 1000) / (WIDTH-1)) * 1000 + fstart)
//int32_t n = FREQ(x-1) / fgrid; //int32_t n = FREQ(x-1) / fgrid;
//int32_t m = FREQ(x) / fgrid; //int32_t m = FREQ(x) / fgrid;
//if ((m - n) > 0) //if ((m - n) > 0)
//if (((x * 6) % (WIDTH-1)) < 6) //if (((x * 6) % (WIDTH-1)) < 6)
//if (((x - grid_offset) % grid_width) == 0) //if (((x - grid_offset) % grid_width) == 0)
if ((((x + grid_offset) * 10) % grid_width) < 10)
return c;
if (x == 0 || x == (WIDTH-1)) if (x == 0 || x == (WIDTH-1))
return c; return c;
if ((y % 29) == 0)
return c;
if ((((x + grid_offset) * 10) % grid_width) < 10)
return c;
return 0;
}
#endif
int
rectangular_grid_x(int x)
{
int c = grid_color;
if (x == 0 || x == (WIDTH-1))
return c;
if ((((x + grid_offset) * 10) % grid_width) < 10)
return c;
return 0;
}
int
rectangular_grid_y(int y)
{
int c = grid_color;
if ((y % 29) == 0) if ((y % 29) == 0)
return c; return c;
return 0; return 0;
} }
#if 0
int int
set_strut_grid(int x) set_strut_grid(int x)
{ {
@ -205,7 +228,7 @@ draw_on_strut(int v0, int d, int color)
while (d-- > 0) while (d-- > 0)
spi_buffer[v++] |= color; spi_buffer[v++] |= color;
} }
#endif
/* /*
* calculate log10(abs(gamma)) * calculate log10(abs(gamma))
@ -658,14 +681,26 @@ draw_cell(int m, int n)
if (y0 + h > HEIGHT) if (y0 + h > HEIGHT)
h = HEIGHT - y0; h = HEIGHT - y0;
PULSE;
/* draw grid */ /* draw grid */
for (y = 0; y < h; y++) {
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
uint16_t c = rectangular_grid(x+x0, y+y0); uint16_t c = rectangular_grid_x(x+x0);
c |= smith_grid(x+x0, y+y0); for (y = 0; y < h; y++)
spi_buffer[y * w + x] = c; spi_buffer[y * w + x] = c;
} }
for (y = 0; y < h; y++) {
uint16_t c = rectangular_grid_y(y+y0);
for (x = 0; x < w; x++)
spi_buffer[y * w + x] |= c;
} }
for (y = 0; y < h; y++) {
for (x = 0; x < w; x++) {
//uint16_t c = rectangular_grid(x+x0, y+y0);
uint16_t c = smith_grid(x+x0, y+y0);
spi_buffer[y * w + x] |= c;
}
}
PULSE;
#if 1 #if 1
/* draw rectanglar plot */ /* draw rectanglar plot */
@ -730,8 +765,10 @@ draw_cell(int m, int n)
} }
#endif #endif
PULSE;
cell_draw_markers(m, n, w, h); cell_draw_markers(m, n, w, h);
cell_draw_marker_info(m, n, w, h); cell_draw_marker_info(m, n, w, h);
PULSE;
ili9341_bulk(OFFSETX + x0, OFFSETY + y0, w, h); ili9341_bulk(OFFSETX + x0, OFFSETY + y0, w, h);
} }