Mercurial > hg > octave-lyh
comparison gui/src/Plot2dWidget.cpp @ 13471:4baf5e6bba13
Modifications to plotting.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Wed, 20 Apr 2011 10:18:02 +0200 |
parents | f7356554594c |
children | 5dcf3331f2a6 |
comparison
equal
deleted
inserted
replaced
13470:f7356554594c | 13471:4baf5e6bba13 |
---|---|
37 glTranslated(-0.5 - m_scrollX, -0.5 - m_scrollY, 0.0); | 37 glTranslated(-0.5 - m_scrollX, -0.5 - m_scrollY, 0.0); |
38 | 38 |
39 glClear(GL_COLOR_BUFFER_BIT); | 39 glClear(GL_COLOR_BUFFER_BIT); |
40 glBegin(GL_LINES); | 40 glBegin(GL_LINES); |
41 glColor3d(1.0, 1.0, 1.0); | 41 glColor3d(1.0, 1.0, 1.0); |
42 glVertex2d(0.1, 0.1); | 42 glVertex2d(0.0, 0.0); |
43 glVertex2d(0.9, 0.1); | 43 glVertex2d(1.0, 0.0); |
44 glVertex2d(0.1, 0.1); | 44 glVertex2d(0.0, 0.0); |
45 glVertex2d(0.1, 0.9); | 45 glVertex2d(0.0, 1.0); |
46 glEnd(); | 46 glEnd(); |
47 | 47 |
48 glBegin(GL_POLYGON); | 48 for(double phi = 0.0; phi < 2*3.141; phi += 2*3.141 / 3) { |
49 glVertex2d(0.092, 0.9); | 49 glBegin(GL_LINES); |
50 glVertex2d(0.108, 0.9); | 50 glColor3d(phi / (2 * 3.141), 1.0, 1.0 - phi / (2 * 3.141)); |
51 glVertex2d(0.1, 0.92); | 51 for(double d = 0.0; d < 1.0; d +=0.01) |
52 glEnd(); | 52 glVertex2d(d, sin(d*2*3.141 + phi) / 2 + 0.5); |
53 glBegin(GL_POLYGON); | 53 glEnd(); |
54 glVertex2d(0.9, 0.092); | 54 } |
55 glVertex2d(0.9, 0.108); | |
56 glVertex2d(0.92, 0.1); | |
57 glEnd(); | |
58 | 55 |
59 renderText(0.8, 0.05, 0.0, "axis"); | 56 glMatrixMode(GL_MODELVIEW_MATRIX); |
57 glLoadIdentity(); | |
58 | |
59 glColor3d(1.0, 1.0, 1.0); | |
60 renderText(-0.9, -0.9, 0.0, QString("Scaling: %1, Translation: (%2/%3)") | |
61 .arg(m_zoom) | |
62 .arg(m_scrollX) | |
63 .arg(m_scrollY)); | |
60 } | 64 } |
61 | 65 |
62 void Plot2dView::resizeGL(int w, int h) { | 66 void Plot2dView::resizeGL(int w, int h) { |
63 glViewport(0, 0, w, h); | 67 glViewport(0, 0, w, h); |
64 glMatrixMode(GL_MODELVIEW_MATRIX); | 68 glMatrixMode(GL_MODELVIEW_MATRIX); |