Add the signal to the catalogue layout

[r2c2.git] / source / 3d / layout.cpp

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index d97dfe507472824aa5fdb91f7fa947a0d4b76063..bd59e126a91befd5a87ce1678a76cca91df1c257 100644 (file)
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -26,6 +26,9 @@ Layout3D::Layout3D(Layout &l):
        const set<Track *> &ltracks = layout.get_tracks();
        for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
                track_added(**i);
+       const set<Signal *> &lsignals = layout.get_signals();
+       for(set<Signal *>::iterator i=lsignals.begin(); i!=lsignals.end(); ++i)
+               signal_added(**i);
 }
 
 Layout3D::~Layout3D()
@@ -38,18 +41,13 @@ Layout3D::~Layout3D()
 
 void Layout3D::get_bounds(Vector &minp, Vector &maxp) const
 {
-       minp = maxp = Vector();
+       Geometry::BoundingBox<float, 3> bbox;
 
        for(TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-       {
-               Vector tmin;
-               Vector tmax;
-               i->second->get_bounds(Angle::zero(), tmin, tmax);
-               minp.x = min(minp.x, tmin.x);
-               minp.y = min(minp.y, tmin.y);
-               maxp.x = max(maxp.x, tmax.x);
-               maxp.y = max(maxp.y, tmax.y);
-       }
+               bbox = bbox|i->second->get_track().get_type().get_shape()->get_axis_aligned_bounding_box();
+
+       minp = bbox.get_minimum_point();
+       maxp = bbox.get_maximum_point();
 }
 
 void Layout3D::add_track(Track3D &t)