From a09bec26425d8f44c9a5298f1eb4799ad4cee4cf Mon Sep 17 00:00:00 2001
From: Rene Hopf <renehopf@mac.com>
Date: Fri, 21 Nov 2014 21:34:07 +0100
Subject: [PATCH] =?UTF-8?q?aufr=C3=A4umen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 term/basicdrawpane.cpp | 23 +++++++++++++----------
 term/basicdrawpane.hpp |  1 -
 term/mainframe.cpp     |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/term/basicdrawpane.cpp b/term/basicdrawpane.cpp
index 8d30fa91..3055c88c 100644
--- a/term/basicdrawpane.cpp
+++ b/term/basicdrawpane.cpp
@@ -4,7 +4,6 @@ const wxPen BasicDrawPane::pen[] = {*wxBLACK_PEN, *wxRED_PEN, *wxBLUE_PEN, *wxGR
 
 BasicDrawPane::BasicDrawPane(wxFrame* parent, int ch) : wxPanel(parent){
     time = 0;
-    diff = 0;
     Bind(wxEVT_PAINT, &BasicDrawPane::paintEvent, this);
     xpos = 0;
     channels = ch;
@@ -59,28 +58,32 @@ void BasicDrawPane::paintNow()
 
 void BasicDrawPane::plotvalue(float values[])
 {
-    diff = wxGetUTCTimeMillis()-time;
-    time = wxGetUTCTimeMillis();
+    time += wxGetUTCTimeMillis();
     //std::cout << "data:" << value << std::endl;
     //data.at(xpos) += 0.1;
     for (int i = 0; i<channels; i++) {
         data[i].at(xpos) = (float)values[i];
     }
     xpos = (xpos+1)%data[0].size();
-    Refresh();
+    if(time > 50){
+        Refresh();
+        time = 0;
+    }
     //oder
     //Update();
 }
 
 void BasicDrawPane::plotvalue(float value)
 {
-    diff = wxGetUTCTimeMillis()-time;
-    time = wxGetUTCTimeMillis();
+    time += wxGetUTCTimeMillis();
     //std::cout << "data:" << value << std::endl;
     //data.at(xpos) += 0.1;
     data[0].at(xpos) = (float)value;
     xpos = (xpos+1)%data[0].size();
-    Refresh();
+    if(time > 50){
+        Refresh();
+        time = 0;
+    }
     //oder
     //Update();
 }
@@ -100,9 +103,9 @@ void BasicDrawPane::render(wxDC&  dc)
     
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     
-    dc.SetPen(*wxBLACK_PEN);
-    dc.DrawText(wxString::Format(wxT("%i"),diff*50), 40, 60);
-    dc.DrawLine( 40, 60, 40+50, 60 );
+//    dc.SetPen(*wxBLACK_PEN);
+//    dc.DrawText(wxString::Format(wxT("%i"),diff*50), 40, 60);
+//    dc.DrawLine( 40, 60, 40+50, 60 );
     
     
 
diff --git a/term/basicdrawpane.hpp b/term/basicdrawpane.hpp
index 60276c87..0adc6d13 100644
--- a/term/basicdrawpane.hpp
+++ b/term/basicdrawpane.hpp
@@ -28,7 +28,6 @@ public:
     static const wxPen pen[];
 private:
     wxLongLong time;
-    wxLongLong diff;
     std::vector<std::vector<float>> data;
     int x,y,xold,yold,xpos,xstep;
 };
diff --git a/term/mainframe.cpp b/term/mainframe.cpp
index 867dd956..a0637af2 100644
--- a/term/mainframe.cpp
+++ b/term/mainframe.cpp
@@ -213,7 +213,7 @@ void MainFrame::OnIdle(wxIdleEvent& evt){
             }
 			//std::cout << buf;
 		}
-		wxMilliSleep(3);//örks
+		wxMilliSleep(10);//örks
 	}
 	//wxWakeUpIdle();
 	evt.RequestMore();