From 3ce856c1c6b6d9b48acc15853e0fe2553e5c2c5f Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Wed, 1 Jul 2015 22:00:09 +0200
Subject: [PATCH] [DEV] better viewer

---
 sample/ioViewer/appl/Windows.cpp             |  6 +--
 sample/ioViewer/appl/main.cpp                |  3 +-
 sample/ioViewer/lutin_ioViewer.py            |  3 +-
 widget/audio/river/widget/TemporalViewer.cpp | 49 ++++++++++++++++----
 widget/audio/river/widget/TemporalViewer.h   |  1 +
 5 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/sample/ioViewer/appl/Windows.cpp b/sample/ioViewer/appl/Windows.cpp
index ae16a64..7491504 100644
--- a/sample/ioViewer/appl/Windows.cpp
+++ b/sample/ioViewer/appl/Windows.cpp
@@ -30,13 +30,13 @@ void appl::Windows::init() {
 	setTitle("example 001_HelloWord");
 	std::string composition = std::string("");
 	composition += "<sizer mode='vert'>\n";
-	composition += "	<sizer mode='hori'>\n";
-	composition += "		<button name='bt-record'>\n";
+	composition += "	<sizer mode='hori' lock='true' min-size='10,10%'>\n";
+	composition += "		<button name='bt-record' expend='true' fill='true'>\n";
 	composition += "			<label>\n";
 	composition += "				Start/Stop record\n";
 	composition += "			</label>\n";
 	composition += "		</button>\n";
-	composition += "		<button name='bt-generate'>\n";
+	composition += "		<button name='bt-generate' expend='true' fill='true'>\n";
 	composition += "			<label>\n";
 	composition += "				Start/Stop Generate\n";
 	composition += "			</label>\n";
diff --git a/sample/ioViewer/appl/main.cpp b/sample/ioViewer/appl/main.cpp
index 52bd366..f70e18a 100644
--- a/sample/ioViewer/appl/main.cpp
+++ b/sample/ioViewer/appl/main.cpp
@@ -41,12 +41,11 @@ class MainApplication : public ewol::context::Application {
 			
 			audio::river::initString(configurationRiver);
 			
-			// TODO : Remove this : Move if in the windows properties
 			_context.setSize(vec2(800, 600));
 			
 			// select internal data for font ...
 			_context.getFontDefault().setUseExternal(true);
-			_context.getFontDefault().set("FreeSerif;DejaVuSansMono", 19);
+			_context.getFontDefault().setSize(19);
 			
 			audio::river::widget::TemporalViewer::createManagerWidget(_context.getWidgetManager());
 			
diff --git a/sample/ioViewer/lutin_ioViewer.py b/sample/ioViewer/lutin_ioViewer.py
index 85fa61f..be59012 100644
--- a/sample/ioViewer/lutin_ioViewer.py
+++ b/sample/ioViewer/lutin_ioViewer.py
@@ -24,7 +24,8 @@ def create(target):
 	myModule.pkg_set("SECTION", ["Development"])
 	myModule.pkg_set("PRIORITY", "optional")
 	myModule.pkg_set("DESCRIPTION", "Simple wiewer")
-	myModule.pkg_set("NAME", "audio-io-viewer")
+	myModule.pkg_set("NAME", "ioViewer")
 	
+	myModule.pkg_add("RIGHT", "RECORD_AUDIO")
 	return myModule
 
diff --git a/widget/audio/river/widget/TemporalViewer.cpp b/widget/audio/river/widget/TemporalViewer.cpp
index 02f106f..331d6df 100644
--- a/widget/audio/river/widget/TemporalViewer.cpp
+++ b/widget/audio/river/widget/TemporalViewer.cpp
@@ -11,19 +11,21 @@
 #undef __class__
 #define __class__ "TemporalViewer"
 
+static const int32_t nbSecond = 3;
 
 
 
 audio::river::widget::TemporalViewer::TemporalViewer() :
   m_minVal(-1.0f),
-  m_maxVal(1.0f) {
+  m_maxVal(1.0f),
+  m_sampleRate(48000) {
 	addObjectType("audio::river::widget::TemporalViewer");
 }
 
 void audio::river::widget::TemporalViewer::init() {
 	ewol::Widget::init();
 	m_manager = audio::river::Manager::create("audio::river::widget::TemporalViewer");
-	markToRedraw();
+	m_data.resize(m_sampleRate*3, 0.0);
 }
 
 
@@ -48,10 +50,11 @@ void audio::river::widget::TemporalViewer::onDataReceived(const void* _data,
 	for (size_t iii=0; iii<_nbChunk*_map.size(); ++iii) {
 		m_data.push_back(data[iii]);
 	}
-	const int32_t nbSecond = 3;
-	if (m_data.size()>_frequency*nbSecond) {
-		m_data.erase(m_data.begin(), m_data.begin()+(m_data.size()-_frequency*nbSecond));
+	/*
+	if (m_data.size()>m_sampleRate*nbSecond*10) {
+		m_data.erase(m_data.begin(), m_data.begin()+(m_data.size()-m_sampleRate*nbSecond));
 	}
+	*/
 	//markToRedraw();
 }
 
@@ -61,7 +64,7 @@ void audio::river::widget::TemporalViewer::recordToggle() {
 		//Get the generic input:
 		std::vector<audio::channel> channel;
 		channel.push_back(audio::channel_frontLeft);
-		m_interface = m_manager->createInput(48000,
+		m_interface = m_manager->createInput(m_sampleRate,
 		                                     channel,
 		                                     audio::format_float,
 		                                     "microphone");
@@ -108,17 +111,34 @@ void audio::river::widget::TemporalViewer::onRegenerateDisplay() {
 	if (m_data.size() == 0) {
 		return;
 	}
+	// create n section for display:
+	int32_t nbSlot = m_size.x();
+	int32_t sizeSlot = m_size.x()/nbSlot;
+	std::vector<float> list;
+	//ARW_INFO("nbSlot : " << nbSlot << " sizeSlot=" << sizeSlot << " m_size=" << m_size);
+	list.resize(nbSlot,0.0f);
+	int32_t step = m_sampleRate*nbSecond/nbSlot;
+	for (size_t kkk=0; kkk<m_sampleRate*nbSecond; ++kkk) {
+		int32_t id = kkk/step;
+		if (id < list.size()) {
+			if (kkk < m_data.size()) {
+				list[id] = std::max(list[id],m_data[kkk]);
+			}
+		}
+	}
 	// set all the line:
 	m_draw.setColor(etk::color::white);
 	m_draw.setThickness(1);
 	float origin = m_size.y()*0.5f;
 	
 	float ratioY = m_size.y() / (m_maxVal - m_minVal);
-	float stepX = m_size.x() / float(m_data.size());
-	m_draw.setPos(vec2(0, origin + ratioY*m_data[0]));
 	float baseX = 0;
-	for (size_t iii=1; iii<m_data.size(); ++iii) {
-		m_draw.lineTo(vec2(float(iii)*stepX, origin + ratioY*m_data[iii]));
+	for (size_t iii=1; iii<list.size(); ++iii) {
+		m_draw.setPos(vec2(iii*sizeSlot, origin - ratioY*list[iii]));
+		m_draw.rectangle(vec2((iii+1)*sizeSlot, origin + ratioY*list[iii]));
+		if ((iii+1)*sizeSlot > m_size.x()) {
+			ARW_ERROR("wrong display position");
+		}
 	}
 }
 
@@ -126,5 +146,14 @@ void audio::river::widget::TemporalViewer::onRegenerateDisplay() {
 
 
 void audio::river::widget::TemporalViewer::periodicCall(const ewol::event::Time& _event) {
+	std11::unique_lock<std11::mutex> lock(m_mutex);
+	int32_t nbSampleDelta = _event.getDeltaCall() * float(m_sampleRate);
+	if (m_data.size()>m_sampleRate*nbSecond) {
+		if (nbSampleDelta < m_data.size()) {
+			m_data.erase(m_data.begin(), m_data.begin()+nbSampleDelta);
+		} else {
+			m_data.erase(m_data.begin(), m_data.begin()+(m_data.size()-m_sampleRate*nbSecond));
+		}
+	}
 	markToRedraw();
 }
diff --git a/widget/audio/river/widget/TemporalViewer.h b/widget/audio/river/widget/TemporalViewer.h
index 3ba0bab..119577e 100644
--- a/widget/audio/river/widget/TemporalViewer.h
+++ b/widget/audio/river/widget/TemporalViewer.h
@@ -54,6 +54,7 @@ namespace audio {
 					                    enum audio::format _format,
 					                    uint32_t _frequency,
 					                    const std::vector<audio::channel>& _map);
+					int32_t m_sampleRate;
 			};
 		}
 	}