switched from raw lambda to stepable

couldn't figure out how to handle sortstate, eventually put it into
bsort class. should be split into timeraction and steppable. and there
shouldn't be a random steppedbsort in App

src/sortui.cpp

@@ -9,8 +9,10 @@
 #include <cstdio>
 #include <cstdlib>
 #include <memory>
+#include <sstream>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include <SFML/Window.hpp>
@@ -22,40 +24,43 @@
 using namespace std::chrono;
 using namespace std;
 
-void displaynumbers(SortingData in_arr) {
-	for (size_t i = 0; i < in_arr.data.size(); ++i) {
-		printf("array:%d ", in_arr.data[i]);
+bool displaynumbers(vector<int> input) {
+	for (size_t i = 0; i < input.size(); ++i) {
+		printf("array:%d ", input[i]);
 	}
 	printf("\n");
+	return false;
 }
 
-void stepbubblesort(vector<int> &data, size_t step) {
-	data[step%data.size()]++;
+string arraytostr(SortInput input) {
+	string myoutput;
+	ostringstream stringrep;
+	for (size_t i = 0; i < input.values.size(); ++i) {
+		stringrep << input.values[i] <<" | ";
+	}
+	return stringrep.str();
 }
 
 vector<int> dataprovider(){
-	return vector<int> {9,8,1,2,7,3,6,4,5};	
+	return vector<int> {9,8,1,2,7,3,6,4,5};
 }
 
-void setuptimers(TimerManager &mytimermanager, SortingData &mysd){
-	
+void setupsorttimers(TimerManager &mytimermanager, SteppedBsort &mysession){
 	unique_ptr<Timer> mytimer = make_unique<Timer>(
 																								 "sort1", 0,
-																								 [&mysd](Timer &t) { stepbubblesort(mysd.data, t.triggercounter); },
-																								 milliseconds(1000));
-	unique_ptr<Timer> mydisplaytimer = make_unique<Timer>("display", 0,
-																												[&mysd](Timer &t){displaynumbers(mysd);},
-																												milliseconds(1000));
-	mytimermanager.add_timer(move(mytimer));
-	mytimermanager.add_timer(move(mydisplaytimer));
+																								 [&mysession](){return mysession.step();},
+																								 milliseconds(250));
+	mytimermanager.add_timer(std::move(mytimer));
 }
 
+
 struct App{
 	sf::RenderWindow mywindow;
 	sf::Font myfont;
 	sf::Text text;
 	TimerManager mytimermanager;
-	SortingData mysortdata;
+	SortInput input;
+	SteppedBsort mystb;
 
 	sf::Font load_font(const string &filename) {
 		sf::Font font;
@@ -65,18 +70,20 @@ struct App{
 		}
 		return font;
 	}
-	
-	App():mywindow(sf::VideoMode({800,600}), "mywindow"),
-				myfont(load_font("assets/NS-R.ttf")),
-				text(myfont),
-				mysortdata("arr1", dataprovider()) {
+
+	App(SortInput input):
+		mywindow(sf::VideoMode({800,600}), "mywindow"),
+		myfont(load_font("assets/NS-R.ttf")),
+		text(myfont),
+		input(std::move(input)),
+		mystb(this->input)
+	{
 		text.setFont(myfont);
 		text.setString("Hello world");
 		text.setCharacterSize(24);
 		text.setFillColor(sf::Color::Red);
 
-		setuptimers(mytimermanager, mysortdata);
-
+		setupsorttimers(mytimermanager, mystb);
 	}
 
 	void run(){
@@ -85,17 +92,22 @@ struct App{
 				if (event->is<sf::Event::Closed>())
 					mywindow.close();
 			}
-		
+
 			mywindow.clear(sf::Color::Black);
 			mywindow.draw(text);
+			text.setString(arraytostr(input));
 			mytimermanager.update_timers();
+
+			displaynumbers(input.values);
+
 			mywindow.display();
-			this_thread::sleep_for(milliseconds(1000));
+			this_thread::sleep_for(milliseconds(250));
 		}
 	}
 };
 
 int main() {
-	App myapp;
+	SortInput myinput("arr1", dataprovider());
+	App myapp(myinput);
 	myapp.run();
 }