X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=4763b8fda6294f3d12ff420c1245bb1e6b975dc5;hb=4d84248a4990e913a56f013e67a608ad9698233e;hp=ba804f27980c30e6e368cabc7e95979b0e5229be;hpb=444c7efb2fadb10e98197a62b791829d821370c0;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index ba804f2..4763b8f 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -7,7 +7,6 @@ Distributed under the GPL
 
 #include <signal.h>
 #include <cmath>
-#include <iostream>
 #include <GL/gl.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/misc.h>
@@ -284,17 +283,15 @@ void Designer::tick()
 		{
 			const Track &track = t3d->get_track();
 			const TrackType &ttype = track.get_type();
-			ostringstream ss;
-			ss.precision(2);
-			ss<<ttype.get_article_number()<<' '<<ttype.get_description();
-			if(mode!=CATALOGUE)
-				ss<<" (slope "<<track.get_slope()/ttype.get_total_length()*100<<"%)";
+			string info = format("%d %s", ttype.get_article_number(), ttype.get_description());
+			if(mode!=CATALOGUE && abs(track.get_slope())>1e-4)
+				info += format(" (slope %.1f%%)", abs(track.get_slope()/ttype.get_total_length()*100));
 			if(track.get_turnout_id())
-				ss<<" (turnout "<<track.get_turnout_id()<<')';
+				info += format(" (turnout %d)", track.get_turnout_id());
 			else if(track.get_sensor_id())
-				ss<<" (sensor "<<track.get_sensor_id()<<')';
+				info += format(" (sensor %d)", track.get_sensor_id());
 
-			set_tooltip(pointer_x, pointer_y, ss.str());
+			set_tooltip(pointer_x, pointer_y, info);
 		}
 		else
 			clear_tooltip();
@@ -345,7 +342,7 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t)
 		float len = 0;
 		for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 			len += (*i)->get_type().get_total_length();
-		cout<<"Total length: "<<len<<"m\n";
+		IO::print("Total length: %.1fm\n", len);
 	}
 	else if(key==Msp::Input::KEY_L)
 		selection->select_linked();
@@ -402,11 +399,9 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t)
 	else if(key==Msp::Input::KEY_T)
 	{
 		Track *track = selection->get_track();
-		if(selection->size()==1 && track->get_type().get_n_routes()>1)
+		if(selection->size()==1 && track->get_type().get_n_paths()>1)
 		{
-			ostringstream ss;
-			ss<<track->get_turnout_id();
-			input = new ::Input(*this, "Turnout ID", ss.str());
+			input = new ::Input(*this, "Turnout ID", lexical_cast(track->get_turnout_id()));
 			input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
 			input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept));
 			mode = INPUT;
@@ -419,7 +414,7 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t)
 		int id = -1;
 		for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		{
-			if((*i)->get_type().get_n_routes()==1)
+			if((*i)->get_type().get_n_paths()==1)
 				ok = true;
 			if(static_cast<int>((*i)->get_sensor_id())!=id)
 			{
@@ -431,10 +426,7 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t)
 		}
 		if(ok)
 		{
-			ostringstream ss;
-			if(id>=0)
-				ss<<id;
-			input = new ::Input(*this, "Sensor ID", ss.str());
+			input = new ::Input(*this, "Sensor ID", (id>=0 ? lexical_cast(id) : string()));
 			input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
 			input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept));
 			mode = INPUT;
@@ -597,14 +589,14 @@ void Designer::render()
 			const map<unsigned, int> &turnouts = cur_route->get_turnouts();
 			for(set<const Track *>::const_iterator i=rtracks.begin(); i!=rtracks.end(); ++i)
 			{
-				unsigned route = 0;
+				unsigned path = 0;
 				if(unsigned tid=(*i)->get_turnout_id())
 				{
 					map<unsigned, int>::const_iterator j = turnouts.find(tid);
 					if(j!=turnouts.end())
-						route = j->second;
+						path = j->second;
 				}
-				layout_3d->get_track(**i).render_route(route);
+				layout_3d->get_track(**i).render_path(path);
 			}
 		}
 		manipulator->render();
@@ -672,10 +664,8 @@ void Designer::measure_changed()
 	float perpd = measure->get_perpendicular_distance()*1000;
 	float d = sqrt(pard*pard+perpd*perpd);
 	float adiff = measure->get_angle_difference()*180/M_PI;
-	ostringstream ss;
-	ss.precision(3);
-	ss<<"Par "<<pard<<"mm - Perp "<<perpd<<"mm - Total "<<d<<"mm - Angle "<<adiff<<"°";
-	set_tooltip(pointer_x, pointer_y, ss.str());
+	string info = format("Par %.1fmm - Perp %.1fmm - Total %.1fmm - Angle %.1f°", pard, perpd, d, adiff);
+	set_tooltip(pointer_x, pointer_y, info);
 }
 
 void Designer::measure_done()