X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=b0971c25271be9d65390ff08ca5841614e7c84b6;hb=651698847d5293cfb15b6fb23a394701388c0151;hp=f79ef7a9ae8daa4bfdb94a901ba3b6d170412b9c;hpb=e07c0d862a4d43b2585c93e79d25380d00675309;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index f79ef7a..b0971c2 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -25,6 +25,7 @@ Distributed under the GPL
 #include <msp/strings/utils.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
+#include "libmarklin/route.h"
 #include "libmarklin/tracktype.h"
 #include "designer.h"
 #include "input.h"
@@ -46,16 +47,10 @@ Designer::Designer(int argc, char **argv):
 	mode(SELECT),
 	manipulator(*this, selection),
 	measure(*this),
-	input(0),
-	camera_ctl(window, camera),
-	shift(false)
+	camera_ctl(window, camera)
 {
 	window.set_title("Railway Designer");
 	window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
-	window.signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press));
-	window.signal_key_release.connect(sigc::mem_fun(this, &Designer::key_release));
-	window.signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press));
-	window.signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion));
 
 	manipulator.signal_status.connect(sigc::mem_fun(this, &Designer::manipulation_status));
 	manipulator.signal_done.connect(sigc::mem_fun(this, &Designer::manipulation_done));
@@ -74,9 +69,6 @@ Designer::Designer(int argc, char **argv):
 	{
 		filename = argv[1];
 		DataFile::load(*layout, argv[1]);
-		const list<Track3D *> &ltracks = layout_3d->get_tracks();
-		for(list<Track3D *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
-			update_track_color(**i);
 
 		if(!layout->get_base().empty())
 		{
@@ -109,23 +101,40 @@ Designer::Designer(int argc, char **argv):
 	// Setup UI
 	DataFile::load(ui_res, "marklin.res");
 	root = new GLtk::Root(ui_res, window);
-
-	lbl_tooltip = new GLtk::Label(ui_res);
-	lbl_tooltip->set_style("tooltip");
-	root->add(*lbl_tooltip);
-	lbl_tooltip->set_visible(false);
+	root->signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press));
+	root->signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press));
+	root->signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion));
+	root->signal_tooltip.connect(sigc::mem_fun(this, &Designer::tooltip));
 
 	toolbar = new Toolbar(*this);
 	root->add(*toolbar);
 	toolbar->set_position(0, window.get_height()-toolbar->get_geometry().h);
-	toolbar->set_visible(true);
+	toolbar->set_focusable(false);
+
+	GLtk::Panel *statusbar = new GLtk::Panel(ui_res);
+	root->add(*statusbar);
+	statusbar->set_size(window.get_width(), 20);
+	statusbar->set_focusable(false);
+
+	lbl_status = new GLtk::Label(ui_res);
+	statusbar->add(*lbl_status);
+	lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16));
+
+	overlay = new Overlay3D(window, camera, ui_res.get_default_font());
+
+	const list<Track3D *> &tracks = layout_3d->get_tracks();
+	for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		update_track_icon(**i);
 }
 
 Designer::~Designer()
 {
+	delete overlay;
 	delete root;
-	delete layout;
+	delete pipeline;
+	delete base_object;
 	delete layout_3d;
+	delete layout;
 	delete cat_layout_3d;
 }
 
@@ -140,10 +149,8 @@ int Designer::main()
 
 void Designer::save()
 {
-	input = new ::Input(*this, "Save layout", filename);
-	input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
-	input->signal_accept.connect(sigc::mem_fun(this, &Designer::save_accept));
-	mode = INPUT;
+	InputDialog *input = new InputDialog(*this, "Save layout", filename);
+	input->signal_accept.connect(sigc::mem_fun(layout, &Layout::save));
 }
 
 void Designer::quit()
@@ -151,6 +158,46 @@ void Designer::quit()
 	exit(0);
 }
 
+void Designer::new_track()
+{
+	mode = CATALOGUE;
+}
+
+void Designer::set_turnout_id()
+{
+	Track *track = selection.get_track();
+	if(selection.size()==1 && track->get_type().is_turnout())
+	{
+		InputDialog *input = new InputDialog(*this, "Turnout ID", lexical_cast(track->get_turnout_id()));
+		input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept));
+	}
+}
+
+void Designer::set_sensor_id()
+{
+	const set<Track *> &tracks = selection.get_tracks();
+	bool ok = false;
+	int id = -1;
+	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	{
+		if(!(*i)->get_type().is_turnout())
+			ok = true;
+		if(static_cast<int>((*i)->get_sensor_id())!=id)
+		{
+			if(id==-1)
+				id = (*i)->get_sensor_id();
+			else
+				id = -2;
+		}
+	}
+
+	if(ok)
+	{
+		InputDialog *input = new InputDialog(*this, "Sensor ID", (id>=0 ? lexical_cast(id) : string()));
+		input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept));
+	}
+}
+
 void Designer::edit_route(Route &r)
 {
 	cur_route = &r;
@@ -190,54 +237,21 @@ void Designer::tick()
 	last_tick = t;
 
 	window.get_display().tick();
+	root->tick();
 	camera_ctl.tick(dt);
 
-	if(tooltip_timeout && t>tooltip_timeout)
-	{
-		Track3D *t3d = 0;
-
-		if(mode==CATALOGUE)
-			t3d = pick_track(pointer_x, pointer_y);
-		else
-			t3d = pick_track(pointer_x, pointer_y);
-
-		if(t3d)
-		{
-			const Track &track = t3d->get_track();
-			const TrackType &ttype = track.get_type();
-			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())
-				info += format(" (turnout %d)", track.get_turnout_id());
-			else if(track.get_sensor_id())
-				info += format(" (sensor %d)", track.get_sensor_id());
-
-			set_tooltip(pointer_x, pointer_y, info);
-		}
-		else
-			clear_tooltip();
-
-		tooltip_timeout = Msp::Time::TimeStamp();
-	}
-
 	render();
 
 	window.swap_buffers();
 }
 
-void Designer::key_press(unsigned code, unsigned mod, wchar_t)
+void Designer::key_press(unsigned key, unsigned mod, wchar_t)
 {
-	unsigned key = Msp::Input::key_from_sys(code);
-
-	if(mode==INPUT)
-		return;
-
-	if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R)
-		shift = true;
+	key = Input::key_from_sys(key);
+	mod = Input::mod_from_sys(mod);
 
 	if(key==Msp::Input::KEY_N)
-		mode = CATALOGUE;
+		new_track();
 	else if(key==Msp::Input::KEY_G)
 	{
 		manipulator.start_move();
@@ -258,7 +272,7 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t)
 		save();
 	else if(key==Msp::Input::KEY_PLUS)
 		selection.select_more();
-	else if(key==Msp::Input::KEY_L && (mod&1))
+	else if(key==Msp::Input::KEY_L && (mod&Input::MOD_SHIFT))
 	{
 		const set<Track *> &tracks = layout->get_tracks();
 		float len = 0;
@@ -293,11 +307,12 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t)
 		selection.clear();
 		for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		{
+			overlay->clear(layout_3d->get_track(**i));
 			layout->remove_track(**i);
 			delete *i;
 		}
 	}
-	else if(key==Msp::Input::KEY_F && (mod&1))
+	else if(key==Msp::Input::KEY_F && (mod&Input::MOD_SHIFT))
 	{
 		const set<Track *> &tracks = selection.get_tracks();
 		const set<Track *> &ltracks = layout->get_tracks();
@@ -309,69 +324,27 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t)
 				if(*j!=*i)
 					(*i)->snap_to(**j, true);
 
-			update_track_color(layout_3d->get_track(**i));
+			update_track_icon(layout_3d->get_track(**i));
 		}
 	}
 	else if(key==Msp::Input::KEY_F)
 		manipulator.flatten();
-	else if(key==Msp::Input::KEY_E && (mod&1))
+	else if(key==Msp::Input::KEY_E && (mod&Input::MOD_SHIFT))
 		manipulator.even_slope(true);
 	else if(key==Msp::Input::KEY_E)
 		manipulator.even_slope();
 	else if(key==Msp::Input::KEY_T)
-	{
-		Track *track = selection.get_track();
-		if(selection.size()==1 && track->get_type().get_n_paths()>1)
-		{
-			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;
-		}
-	}
+		set_turnout_id();
 	else if(key==Msp::Input::KEY_S)
-	{
-		const set<Track *> &tracks = selection.get_tracks();
-		bool ok = false;
-		int id = -1;
-		for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		{
-			if((*i)->get_type().get_n_paths()==1)
-				ok = true;
-			if(static_cast<int>((*i)->get_sensor_id())!=id)
-			{
-				if(id==-1)
-					id = (*i)->get_sensor_id();
-				else
-					id = -2;
-			}
-		}
-		if(ok)
-		{
-			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;
-		}
-	}
+		set_sensor_id();
 	else if(key==Msp::Input::KEY_A)
 		add_selection_to_route();
 }
 
-void Designer::key_release(unsigned code, unsigned)
-{
-	unsigned key = Msp::Input::key_from_sys(code);
-
-	if(mode==INPUT)
-		return;
-
-	if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R)
-		shift = false;
-}
-
-void Designer::button_press(int x, int y, unsigned btn, unsigned)
+void Designer::button_press(int x, int y, unsigned btn, unsigned mod)
 {
 	y = window.get_height()-y-1;
+	mod = Input::mod_from_sys(mod);
 
 	Point ground = map_pointer_coords(x, y);
 
@@ -382,9 +355,8 @@ void Designer::button_press(int x, int y, unsigned btn, unsigned)
 			Track3D *ctrack = pick_track(x, y);
 			if(ctrack)
 			{
-				Track *track = ctrack->get_track().copy();
+				Track *track = new Track(*layout, ctrack->get_track().get_type());
 				track->set_position(ground);
-				layout->add_track(*track);
 
 				selection.clear();
 				selection.add_track(track);
@@ -402,7 +374,7 @@ void Designer::button_press(int x, int y, unsigned btn, unsigned)
 			Track3D *track = pick_track(x, y);
 			if(track)
 			{
-				if(!shift)
+				if(!(mod&Input::MOD_SHIFT))
 					selection.clear();
 				selection.toggle_track(&track->get_track());
 			}
@@ -418,15 +390,7 @@ void Designer::pointer_motion(int x, int y)
 {
 	y = window.get_height()-y-1;
 
-	pointer_x = x;
-	pointer_y = y;
-
-	if(mode==SELECT || mode==CATALOGUE)
-		tooltip_timeout = Msp::Time::now()+100*Msp::Time::msec;
-
-	clear_tooltip();
-
-	if(mode!=INPUT)
+	if(!root->get_child_at(x, y))
 	{
 		Point ground = map_pointer_coords(x, y);
 		manipulator.pointer_motion(x, y, ground.x, ground.y);
@@ -465,6 +429,9 @@ void Designer::render()
 		pipeline->render_all();
 		layout_3d->get_endpoint_scene().render();
 		GL::enable(GL_CULL_FACE);
+		GL::disable(GL::DEPTH_TEST);
+		overlay->render(0);
+		GL::enable(GL::DEPTH_TEST);
 		/*if(cur_route)
 		{
 			glColor4f(0.5, 0.8, 1.0, 1.0);
@@ -514,30 +481,33 @@ Track3D *Designer::pick_track(int x, int y)
 	return l->pick_track(xx, yy, size);
 }
 
-void Designer::update_track_color(Track3D &track)
+void Designer::update_track_icon(Track3D &track)
 {
-	if(track.get_track().get_sensor_id())
+	overlay->clear(track);
+
+	if(track.get_track().get_flex())
+		overlay->add_graphic(track, "flex");
+
+	if(unsigned sid = track.get_track().get_sensor_id())
 	{
-		if(track.get_track().get_flex())
-			track.set_color(GL::Color(1, 0.6, 1));
-		else
-			track.set_color(GL::Color(0.7, 0.7, 1));
+		overlay->add_graphic(track, "sensor");
+		overlay->set_label(track, lexical_cast(sid));
+	}
+	else if(unsigned tid = track.get_track().get_turnout_id())
+	{
+		overlay->add_graphic(track, "turnout");
+		overlay->set_label(track, lexical_cast(tid));
 	}
-	else if(track.get_track().get_turnout_id())
-		track.set_color(GL::Color(0.8, 1, 0.8));
-	else if(track.get_track().get_flex())
-		track.set_color(GL::Color(1, 0.8, 0.8));
-	else
-		track.set_color(GL::Color(1, 1, 1));
 }
 
 void Designer::manipulation_status(const string &status)
 {
-	set_tooltip(pointer_x, pointer_y, status);
+	lbl_status->set_text(status);
 }
 
 void Designer::manipulation_done(bool)
 {
+	lbl_status->set_text(string());
 	mode = SELECT;
 }
 
@@ -548,68 +518,34 @@ void Designer::measure_changed()
 	float d = sqrt(pard*pard+perpd*perpd);
 	float adiff = measure.get_angle_difference()*180/M_PI;
 	string info = format("Par %.1fmm - Perp %.1fmm - Total %.1fmm - Angle %.1f°", pard, perpd, d, adiff);
-	set_tooltip(pointer_x, pointer_y, info);
+	lbl_status->set_text(info);
 }
 
 void Designer::measure_done()
 {
+	lbl_status->set_text(string());
 	mode = SELECT;
 }
 
-void Designer::set_tooltip(int x, int y, const std::string &text)
-{
-	int fontsize = ui_res.get_default_font().get_default_size();
-	int h = fontsize+6;
-	int w = static_cast<int>(ui_res.get_default_font().get_string_width(text)*fontsize)+6;
-	x = max(min(static_cast<int>(window.get_width())-w, x), 0);
-	y = max(min(static_cast<int>(window.get_height())-h, y), 0);
-	lbl_tooltip->set_text(text);
-	lbl_tooltip->set_geometry(GLtk::Geometry(x, y, w, h));
-	lbl_tooltip->set_visible(true);
-}
-
-void Designer::clear_tooltip()
-{
-	lbl_tooltip->set_visible(false);
-}
-
-void Designer::save_accept()
-{
-	layout->save(input->get_text());
-
-	input_dismiss();
-}
-
-void Designer::turnout_id_accept()
+void Designer::turnout_id_accept(const string &text)
 {
 	Track *track = selection.get_track();
-	unsigned id = lexical_cast<unsigned>(input->get_text());
+	unsigned id = (text.empty() ? 0 : lexical_cast<unsigned>(text));
 	track->set_turnout_id(id);
 
-	update_track_color(layout_3d->get_track(*track));
-
-	input_dismiss();
+	update_track_icon(layout_3d->get_track(*track));
 }
 
-void Designer::sensor_id_accept()
+void Designer::sensor_id_accept(const string &text)
 {
 	const set<Track *> &tracks = selection.get_tracks();
-	unsigned id = lexical_cast<unsigned>(input->get_text());
+	unsigned id = (text.empty() ? 0 : lexical_cast<unsigned>(text));
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
 		(*i)->set_sensor_id(id);
 
-		update_track_color(layout_3d->get_track(**i));
+		update_track_icon(layout_3d->get_track(**i));
 	}
-
-	input_dismiss();
-}
-
-void Designer::input_dismiss()
-{
-	delete input;
-	input = 0;
-	mode = SELECT;
 }
 
 void Designer::view_all()
@@ -636,3 +572,23 @@ void Designer::view_all()
 	camera.set_position(GL::Vector3(center.x, center.y-cam_dist*0.5, cam_dist*0.866));
 	camera.set_look_direction(GL::Vector3(0, 0.5, -0.866));
 }
+
+string Designer::tooltip(int x, int y)
+{
+	if(Track3D *t3d = pick_track(x, y))
+	{
+		const Track &track = t3d->get_track();
+		const TrackType &ttype = track.get_type();
+		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())
+			info += format(" (turnout %d)", track.get_turnout_id());
+		else if(track.get_sensor_id())
+			info += format(" (sensor %d)", track.get_sensor_id());
+
+		return info;
+	}
+
+	return string();
+}