Mercurial > octave-nkf

changeset 13471:4baf5e6bba13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modifications to plotting.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Wed, 20 Apr 2011 10:18:02 +0200
parents f7356554594c
children 5dcf3331f2a6
files gui/src/Plot2dWidget.cpp
diffstat 1 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/gui/src/Plot2dWidget.cpp	Wed Apr 20 09:59:04 2011 +0200
+++ b/gui/src/Plot2dWidget.cpp	Wed Apr 20 10:18:02 2011 +0200
@@ -39,24 +39,28 @@
     glClear(GL_COLOR_BUFFER_BIT);
     glBegin(GL_LINES);
         glColor3d(1.0, 1.0, 1.0);
-        glVertex2d(0.1, 0.1);
-        glVertex2d(0.9, 0.1);
-        glVertex2d(0.1, 0.1);
-        glVertex2d(0.1, 0.9);
+        glVertex2d(0.0, 0.0);
+        glVertex2d(1.0, 0.0);
+        glVertex2d(0.0, 0.0);
+        glVertex2d(0.0, 1.0);
     glEnd();
 
-    glBegin(GL_POLYGON);
-        glVertex2d(0.092, 0.9);
-        glVertex2d(0.108, 0.9);
-        glVertex2d(0.1, 0.92);
-    glEnd();
-    glBegin(GL_POLYGON);
-        glVertex2d(0.9, 0.092);
-        glVertex2d(0.9, 0.108);
-        glVertex2d(0.92, 0.1);
-    glEnd();
+    for(double phi = 0.0; phi < 2*3.141; phi += 2*3.141 / 3) {
+        glBegin(GL_LINES);
+            glColor3d(phi / (2 * 3.141), 1.0, 1.0 - phi / (2 * 3.141));
+            for(double d = 0.0; d < 1.0; d +=0.01)
+                glVertex2d(d, sin(d*2*3.141 + phi) / 2 + 0.5);
+        glEnd();
+    }
 
-    renderText(0.8, 0.05, 0.0, "axis");
+    glMatrixMode(GL_MODELVIEW_MATRIX);
+    glLoadIdentity();
+
+    glColor3d(1.0, 1.0, 1.0);
+    renderText(-0.9, -0.9, 0.0, QString("Scaling: %1, Translation: (%2/%3)")
+                                .arg(m_zoom)
+                                .arg(m_scrollX)
+                                .arg(m_scrollY));
 }
 
 void Plot2dView::resizeGL(int w, int h) {