X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.h;h=d13c9821d67cad4c3cc09fcb4d42e57902cdb52a;hb=64d23de66c33d0f77454c3db2e40cccc18f7851b;hp=c0c6674c2a028e9ae44adc76ffdbba92761306b8;hpb=64340dad429ba4040538fc06b6882aabdb489925;p=r2c2.git

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index c0c6674..d13c982 100644
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -9,6 +9,7 @@
 
 namespace R2C2 {
 
+class SignalType;
 class TrackType;
 class VehicleType;
 
@@ -25,27 +26,28 @@ public:
 		void layout();
 		void rail_profile();
 		void scale(float, float);
-		void track(unsigned);
+		void signal(ArticleNumber);
 		void track(ArticleNumber);
-		void vehicle(unsigned);
 		void vehicle(ArticleNumber);
 	};
 
 	typedef std::map<ArticleNumber, TrackType *> TrackMap;
 	typedef std::map<ArticleNumber, VehicleType *> VehicleMap;
+	typedef std::map<ArticleNumber, SignalType *> SignalMap;
 
 	sigc::signal<void, const TrackType &> signal_track_added;
 	sigc::signal<void, const VehicleType &> signal_vehicle_added;
+	sigc::signal<void, const SignalType &> signal_signal_added;
 
 private:
 	float scale;
 	float gauge;
 	Profile rail_profile;
 	Profile ballast_profile;
-	Profile path_profile;
 	std::string track_technique;
 	TrackMap tracks;
 	VehicleMap vehicles;
+	SignalMap signals;
 	Layout layout;
 
 public:
@@ -57,7 +59,6 @@ public:
 	float get_rail_elevation() const;
 	const Profile &get_rail_profile() const { return rail_profile; }
 	const Profile &get_ballast_profile() const { return ballast_profile; }
-	const Profile &get_path_profile() const { return path_profile; }
 	const std::string &get_track_technique() const { return track_technique; }
 
 	void add_track(TrackType &);
@@ -68,6 +69,10 @@ public:
 	const VehicleType &get_vehicle(const ArticleNumber &) const;
 	const VehicleMap &get_vehicles() const { return vehicles; }
 
+	void add_signal(SignalType &);
+	const SignalType &get_signal(const ArticleNumber &) const;
+	const SignalMap &get_signals() const { return signals; }
+
 	Layout &get_layout() { return layout; }
 };