From 41f520d6062e30a8de72bb85c60b4acb973a46d4 Mon Sep 17 00:00:00 2001 From: Alexander Iljin Date: Fri, 20 Jan 2017 15:43:38 +0300 Subject: [PATCH] charts: scale the chart to the gadget size --- charts.factor | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/charts.factor b/charts.factor index 306f8ab855..b6486f1816 100644 --- a/charts.factor +++ b/charts.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2016-2017 Alexander Ilin. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel ui.gadgets ; +USING: accessors kernel ui.gadgets ; IN: charts TUPLE: chart < gadget ; @@ -11,13 +11,12 @@ M: chart pref-dim* drop { 300 300 } ; : chart-axes ( chart -- seq ) drop { { 0 300 } { 0 300 } } ; -! Return the width and height of the visible area, in pixels. -: chart-dim ( chart -- seq ) - drop { 300 300 } ; +! Return the { width height } of the visible area, in pixels. +: chart-dim ( chart -- seq ) dim>> ; ! There are several things to do to present data on the screen. ! Map the data coordinates to the screen coordinates. ! Cut off data outside the presentation window. When cutting off vertically, split the line into segments and add new points if necessary. Return an array of line segments. ! Remove redundant points from the drawing pass. -! chart new line new COLOR: blue >>color { { 0 100 } { 100 0 } { 100 50 } { 150 50 } { 200 100 } } >>data add-gadget gadget. +! chart new line new COLOR: blue >>color { { 0 100 } { 100 0 } { 100 50 } { 150 50 } { 200 100 } } >>data add-gadget "Chart" open-window