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

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index ba804f2..a5bbc68 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -287,8 +287,8 @@ void Designer::tick()
 			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<<"%)";
+			if(mode!=CATALOGUE && abs(track.get_slope())>1e-4)
+				ss<<" (slope "<<abs(track.get_slope()/ttype.get_total_length()*100)<<"%)";
 			if(track.get_turnout_id())
 				ss<<" (turnout "<<track.get_turnout_id()<<')';
 			else if(track.get_sensor_id())
@@ -402,7 +402,7 @@ 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();
@@ -419,7 +419,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)
 			{
@@ -597,14 +597,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();