From 720b18d7f1a5dba6ebc4c4f4ea4a5c2e1a8b74d4 Mon Sep 17 00:00:00 2001
From: Francesco Abbate <francesco.bbt@gmail.com>
Date: 2009年12月17日 11:02:22 +0000
Subject: The new agg-plot architecture is now functional and linked with Lua.
 More debug to be done and more graphical elements should be added.
---
 agg-plot/plot.h &#124; 124 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 99 insertions(+), 25 deletions(-)
(limited to 'agg-plot/plot.h')
diff --git a/agg-plot/plot.h b/agg-plot/plot.h
index 645857f6..3d2f0e58 100644
--- a/agg-plot/plot.h
+++ b/agg-plot/plot.h
@@ -10,6 +10,7 @@
 #include "drawables.h"
 #include "canvas.h"
 #include "units.h"
+#include "resource-manager.h"
 
 #include "agg_conv_transform.h"
 #include "agg_color_rgba.h"
@@ -17,43 +18,45 @@
 #include "agg_ellipse.h"
 #include "agg_array.h"
 
-struct drawable {
- vertex_source* vs;
- agg::rgba8 color;
+template<class VertexSource, class resource_manager = no_management>
+class plot {
 
- drawable(): vs(NULL), color() {};
- drawable(vertex_source* vs, agg::rgba8 c): vs(vs), color(c) {};
+ class container {
+ public:
+ VertexSource* vs;
+ agg::rgba8 color;
 
- ~drawable() {};
+ container(): vs(NULL), color() {};
+ container(VertexSource* vs, agg::rgba8 c): vs(vs), color(c) {};
 
- void bounding_box(double *x1, double *y1, double *x2, double *y2)
- {
- vertex_source& vsi = get_vertex_source();
- vsi.bounding_box(x1, y1, x2, y2);
- };
+ ~container() {};
 
- vertex_source& get_vertex_source() { return *vs; };
+ void bounding_box(double *x1, double *y1, double *x2, double *y2)
+ {
+ VertexSource& vsi = get_vertex_source();
+ vsi.bounding_box(x1, y1, x2, y2);
+ };
 
-/*
- void draw(canvas& canvas, agg::trans_affine& t)
- {
- vs_type& vsi = get_vertex_source();
- agg::conv_transform<vs_type> p(vsi, t);
- canvas.draw(p, color);
+ VertexSource& get_vertex_source() { return *vs; };
 };
-*/
-};
 
-class plot {
 public:
 plot() : m_elements(), m_trans(), m_bbox_updated(true) { };
- virtual ~plot() {};
+ virtual ~plot() 
+ {
+ for (unsigned j; j < m_elements.size(); j++) + { + container& d = m_elements[j]; + resource_manager::dispose(d.vs); + } + }; - void add(vertex_source* vs, agg::rgba8 color) + void add(VertexSource* vs, agg::rgba8 color) { - drawable d(vs, color); + container d(vs, color); m_elements.add(d); m_bbox_updated = false; + resource_manager::acquire(vs); }; virtual void draw(canvas &canvas) @@ -69,11 +72,82 @@ protected: static void viewport_scale(agg::trans_affine& trans); - agg::pod_bvector<drawable> m_elements;
+ agg::pod_bvector<container> m_elements;
 agg::trans_affine m_trans;
 
 // bounding box
 bool m_bbox_updated;
 };
 
+template<class VS, class RM>
+void plot<vs,rm>::draw_elements(canvas &canvas)
+{
+ agg::trans_affine m = m_trans;
+ viewport_scale(m);
+ canvas.scale(m);
+
+ for (unsigned j = 0; j < m_elements.size(); j++) + { + container& d = m_elements[j]; + VS& vs = d.get_vertex_source(); + vs.apply_transform(m, 1.0); + canvas.draw(vs, d.color); + } +} + +template<class VS, class RM>
+void plot<vs,rm>::trans_matrix_update()
+{
+ if (! m_bbox_updated)
+ {
+ double x1, y1, x2, y2;
+ bounding_box(&x1, &y1, &x2, &y2);
+
+ double fx = x2 - x1, fy = y2 - y1;
+ m_trans.reset();
+ m_trans.scale(1/fx, 1/fy);
+ m_trans.translate(-x1/fx, -y1/fy);
+ m_bbox_updated = true;
+ }
+}
+
+template<class VS, class RM>
+void plot<vs,rm>::bounding_box(double *x1, double *y1, double *x2, double *y2)
+{
+ bool is_set = false;
+
+ for (unsigned j = 0; j < m_elements.size(); j++) + { + container& d = m_elements[j]; + + double sx1, sy1, sx2, sy2; + d.vs->bounding_box(&sx1, &sy1, &sx2, &sy2);
+ 
+ if (! is_set)
+ {
+ *x1 = sx1;
+ *x2 = sx2;
+ *y1 = sy1;
+ *y2 = sy2;
+
+ is_set = true;
+ }
+ else if (sx2> *x2 &#124;&#124; sx1 < *x1 &#124;&#124; sy2> *y2 &#124;&#124; sy1 < *y1) + { + *x1 = min(sx1, *x1); + *y1 = min(sy1, *y1); + *x2 = max(sx2, *x2); + *y2 = max(sy2, *y2); + } + } +} + +template<class VS, class RM>
+void plot<vs,rm>::viewport_scale(agg::trans_affine& m)
+{
+ const double xoffs = 0.09375, yoffs = 0.09375;
+ static agg::trans_affine rsz(1-2*xoffs, 0.0, 0.0, 1-2*yoffs, xoffs, yoffs);
+ trans_affine_compose (m, rsz);
+}
+
 #endif
-- 
cgit v1.2.3
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://cgit.git.savannah.gnu.org/cgit/gsl-shell.git/patch/agg-plot/plot.h?id=720b18d7f1a5dba6ebc4c4f4ea4a5c2e1a8b74d4">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://cgit.git.savannah.gnu.org/cgit/gsl-shell.git/patch/agg-plot/plot.h?id=720b18d7f1a5dba6ebc4c4f4ea4a5c2e1a8b74d4" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>