X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=32fe42391d13691d7d1d45a14d614bcd1251fa07;hb=a7e320b46a7d4070613b3210c28e65f579750f37;hp=88bdf8b75253f958e4493489f978cb3c5eda67b7;hpb=fbab529c533b8a758fb9ce505eb8970cd037510c;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 88bdf8b..32fe423 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -17,6 +17,7 @@
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "libr2c2/route.h"
+#include "libr2c2/terrain.h"
 #include "libr2c2/tracktype.h"
 #include "libr2c2/zone.h"
 #include "3d/path.h"
@@ -28,14 +29,15 @@
 #include "manipulator.h"
 #include "measure.h"
 #include "movetool.h"
+#include "objectproperties.h"
 #include "objectselecttool.h"
 #include "rotatetool.h"
 #include "routebar.h"
 #include "selection.h"
 #include "slopetool.h"
 #include "svgexporter.h"
+#include "terraintool.h"
 #include "trackbar.h"
-#include "trackproperties.h"
 #include "zonebar.h"
 #include "zoneproperties.h"
 
@@ -61,6 +63,7 @@ Designer::Designer(int argc, char **argv):
 
 	// Setup catalogue and layout
 	DataFile::load(catalogue, "tracks.dat");
+	DataFile::load(catalogue, "terrain.dat");
 
 	cat_layout_3d = new Layout3D(catalogue.get_layout());
 
@@ -148,9 +151,9 @@ Designer::Designer(int argc, char **argv):
 	cat_view->view_all(true);
 	main_view->view_all();
 
-	const set<Track *> &tracks = layout->get_all<Track>();
-	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		update_track_icon(layout_3d->get_3d(**i));
+	const set<Object *> &objects = layout->get_all<Object>();
+	for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		update_object_icon(**i);
 }
 
 Designer::~Designer()
@@ -210,17 +213,17 @@ void Designer::erase_objects()
 	}
 }
 
-void Designer::track_properties()
+void Designer::object_properties()
 {
 	use_select_tool();
 	if(selection.empty())
 		return;
 
-	TrackProperties *track_prop = new TrackProperties(selection);
-	root.add(*track_prop);
-	root_layout->set_gravity(*track_prop, 0, 0);
+	ObjectProperties *dlg = new ObjectProperties(selection);
+	root.add(*dlg);
+	root_layout->set_gravity(*dlg, 0, 0);
 
-	track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response));
+	dlg->signal_response.connect(sigc::mem_fun(this, &Designer::object_properties_response));
 }
 
 void Designer::extend_track()
@@ -406,7 +409,7 @@ void Designer::key_press(unsigned key)
 				if(*j!=*i)
 					(*i)->snap_to(**j, true);
 
-			update_track_icon(layout_3d->get_3d(**i));
+			update_object_icon(**i);
 		}
 	}
 	else if(key==Msp::Input::KEY_F)
@@ -427,7 +430,13 @@ void Designer::key_press(unsigned key)
 	else if(key==Msp::Input::KEY_V)
 		svg_export();
 	else if(key==Msp::Input::KEY_P)
-		track_properties();
+		object_properties();
+	else if(key==Msp::Input::KEY_TAB)
+	{
+		Object *obj = selection.get_object();
+		if(Terrain *terrain = dynamic_cast<Terrain *>(obj))
+			use_tool(new TerrainTool(*this, keyboard, mouse, *terrain));
+	}
 }
 
 template<typename T>
@@ -509,25 +518,39 @@ Object *Designer::pick_object(const Vector &pointer)
 	return view.get_layout().get_layout().pick<Object>(Ray(cpos, Vector(cray)));
 }
 
-void Designer::update_track_icon(Track3D &track)
+void Designer::update_object_icon(Object &obj)
 {
-	overlay->clear(track);
+	Object3D &obj3d = layout_3d->get_3d(obj);
+	overlay->clear(obj3d);
 
-	if(track.get_track().get_flex())
-		overlay->add_graphic(track, "flex");
+	if(Track *track = dynamic_cast<Track *>(&obj))
+	{
+		if(track->get_flex())
+			overlay->add_graphic(obj3d, "flex");
 
-	if(unsigned saddr = track.get_track().get_sensor_address())
+		if(unsigned saddr = track->get_sensor_address())
+		{
+			overlay->add_graphic(obj3d, "trackcircuit");
+			overlay->set_label(obj3d, lexical_cast<string>(saddr));
+		}
+		else if(unsigned taddr = track->get_turnout_address())
+		{
+			if(taddr<0x800)
+			{
+				overlay->add_graphic(obj3d, "turnout");
+				overlay->set_label(obj3d, lexical_cast<string>(taddr));
+			}
+		}
+	}
+	else if(Signal *signal = dynamic_cast<Signal *>(&obj))
 	{
-		overlay->add_graphic(track, "sensor");
-		overlay->set_label(track, lexical_cast<string>(saddr));
+		overlay->add_graphic(obj3d, "signal");
+		overlay->set_label(obj3d, lexical_cast<string>(signal->get_address()));
 	}
-	else if(unsigned taddr = track.get_track().get_turnout_address())
+	else if(BeamGate *gate = dynamic_cast<BeamGate *>(&obj))
 	{
-		if(taddr<0x800)
-		{
-			overlay->add_graphic(track, "turnout");
-			overlay->set_label(track, lexical_cast<string>(taddr));
-		}
+		overlay->add_graphic(obj3d, "beamgate");
+		overlay->set_label(obj3d, lexical_cast<string>(gate->get_address()));
 	}
 }
 
@@ -536,11 +559,11 @@ void Designer::tool_status(const string &status)
 	lbl_status->set_text(status);
 }
 
-void Designer::track_properties_response(int)
+void Designer::object_properties_response(int)
 {
-	const set<Track *> &tracks = selection.get_objects<Track>();
-	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		update_track_icon(layout_3d->get_3d(**i));
+	const set<Object *> &objects = selection.get_objects();
+	for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		update_object_icon(**i);
 }
 
 void Designer::route_name_accept(const string &text)