X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fzoneproperties.cpp;h=5f971b920a1596c37a41e854b29cb1859e3969bf;hb=9a7097fed866060efb8738f8b2f17d5c96a6c980;hp=6ea4f2a330fc1a4b115a597933b01ede9813968d;hpb=fcc044d4eb24820af9acf1431042e4c422366915;p=r2c2.git

diff --git a/source/designer/zoneproperties.cpp b/source/designer/zoneproperties.cpp
index 6ea4f2a..5f971b9 100644
--- a/source/designer/zoneproperties.cpp
+++ b/source/designer/zoneproperties.cpp
@@ -2,14 +2,25 @@
 #include <msp/gltk/column.h>
 #include <msp/gltk/label.h>
 #include <msp/gltk/row.h>
+#include "libr2c2/block.h"
+#include "libr2c2/track.h"
 #include "zoneproperties.h"
 
 using namespace std;
 using namespace Msp;
 using namespace R2C2;
 
+string track_block_name(Track *const &track)
+{
+	if(track)
+		return track->get_block().get_name();
+	else
+		return "(unspecified)";
+}
+
 ZoneProperties::ZoneProperties(Zone &z):
-	zone(z)
+	zone(z),
+	up_directions(&track_block_name)
 {
 	set_layout(new GLtk::Layout);
 	GLtk::Column col(*layout);
@@ -33,23 +44,64 @@ ZoneProperties::ZoneProperties(Zone &z):
 
 		add(*(drp_qualifier = new GLtk::Dropdown));
 		GLtk::ListDataStore<string> &data = dynamic_cast<GLtk::ListDataStore<string> &>(drp_qualifier->get_data());
-		const char *qualifiers[] = { "track", "platform", "siding", 0 };
+		const char *qualifiers[] = { "(none)", "track", "platform", "siding", 0 };
 		for(unsigned i=0; qualifiers[i]; ++i)
 		{
 			data.append(qualifiers[i]);
 			if(zone.get_qualifier()==qualifiers[i])
 				drp_qualifier->set_selected_index(i);
 		}
+
+		if(zone.get_qualifier().empty())
+			drp_qualifier->set_selected_index(0);
 	}
 
 	{
 		GLtk::Row row(*layout);
 		add(*(lbl1 = new GLtk::Label("Number")));
 		layout->add_constraint(*lbl1, GLtk::Layout::COPY_WIDTH, *lbl2);
-		add(*(ent_number = new GLtk::Entry(lexical_cast<string>(zone.get_number()))));
+		unsigned n = zone.get_number();
+		add(*(ent_number = new GLtk::Entry(n ? lexical_cast<string>(zone.get_number()) : string())));
 		ent_number->set_edit_size(4, 1);
 	}
 
+	{
+		GLtk::Row row(*layout);
+		add(*(lbl2 = new GLtk::Label("Up towards")));
+		layout->add_constraint(*lbl1, GLtk::Layout::COPY_WIDTH, *lbl2);
+		add(*(drp_up_direction = new GLtk::Dropdown(up_directions)));
+
+		up_directions.append(0);
+
+		Track *up = zone.get_end(TrackChain::UP).next().track();
+		if(!up)
+			drp_up_direction->set_selected_index(0);
+
+		for(unsigned i=0; i<2; ++i)
+			if(TrackIter iter = zone.get_end(i).next())
+			{
+				up_directions.append(iter.track());
+				if(iter.track()==up)
+					drp_up_direction->set_selected_index(up_directions.size()-1);
+			}
+	}
+
+	{
+		GLtk::Row row(*layout);
+		add(*(lbl1 = new GLtk::Label("Direction")));
+		layout->add_constraint(*lbl1, GLtk::Layout::COPY_WIDTH, *lbl2);
+
+		add(*(drp_preferred_dir = new GLtk::Dropdown));
+		GLtk::ListDataStore<string> &data = dynamic_cast<GLtk::ListDataStore<string> &>(drp_preferred_dir->get_data());
+		const char *directions[] = { "either", "up", "down", 0 };
+		for(unsigned i=0; directions[i]; ++i)
+		{
+			data.append(directions[i]);
+			if(zone.get_preferred_direction()==i)
+				drp_preferred_dir->set_selected_index(i);
+		}
+	}
+
 	GLtk::Button *btn;
 
 	{
@@ -69,9 +121,26 @@ void ZoneProperties::on_response(int code)
 	{
 		string qualifier;
 		int sel = drp_qualifier->get_selected_index();
-		if(sel>=0)
+		if(sel>0)
 			qualifier = drp_qualifier->get_data().get_string(sel);
-		unsigned number = lexical_cast<unsigned>(ent_number->get_text());
+
+		unsigned number = 0;
+		string num_str = ent_number->get_text();
+		if(!num_str.empty())
+			number = lexical_cast<unsigned>(ent_number->get_text());
+
 		zone.set_name(ent_group->get_text(), qualifier, number);
+
+		sel = drp_up_direction->get_selected_index();
+		if(sel==0)
+			zone.clear_direction();
+		else
+			zone.set_direction_towards(*up_directions.get(sel), TrackChain::UP);
+
+		if(zone.has_direction())
+		{
+			sel = drp_preferred_dir->get_selected_index();
+			zone.set_preferred_direction(static_cast<TrackChain::Direction>(sel));
+		}
 	}
 }