]> git.tdb.fi Git - r2c2.git/blobdiff - source/designer/manipulator.cpp
Code reformatting: add spaces around assignment operators
[r2c2.git] / source / designer / manipulator.cpp
index 798e99f7ebef1c95a47ede24de2daf043480aa6d..1f21430737c6c2f7d9dcda85869c02cddd1847da 100644 (file)
@@ -32,9 +32,9 @@ void Manipulator::set_selection(Selection *s)
 {
        selection_changed_conn.disconnect();
 
-       selection=s;
+       selection = s;
        if(selection)
-               selection_changed_conn=selection->signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
+               selection_changed_conn = selection->signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
 
        selection_changed();
 }
@@ -44,9 +44,9 @@ void Manipulator::start_move()
        if(mode)
                cancel();
 
-       move_origin=gpointer;
+       move_origin = gpointer;
 
-       mode=MOVE;
+       mode = MOVE;
 }
 
 void Manipulator::start_rotate()
@@ -54,9 +54,9 @@ void Manipulator::start_rotate()
        if(mode)
                cancel();
 
-       rot_origin=atan2(gpointer.y-center.y, gpointer.x-center.x);
+       rot_origin = atan2(gpointer.y-center.y, gpointer.x-center.x);
 
-       mode=ROTATE;
+       mode = ROTATE;
 }
 
 void Manipulator::start_elevate()
@@ -64,9 +64,9 @@ void Manipulator::start_elevate()
        if(mode)
                cancel();
 
-       elev_origin=pointer_y;
+       elev_origin = pointer_y;
 
-       mode=ELEVATE;
+       mode = ELEVATE;
 }
 
 void Manipulator::duplicate()
@@ -77,7 +77,7 @@ void Manipulator::duplicate()
        list<Track *> new_tracks;
        for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
-               Track *track=i->track->copy();
+               Track *track = i->track->copy();
                designer.get_layout()->add_track(*track);
                new_tracks.push_back(track);
        }
@@ -99,14 +99,14 @@ void Manipulator::flatten()
 
        if(tracks.empty()) return;
 
-       float z=0;
+       float z = 0;
        for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               z+=i->track->get_position().z+i->track->get_slope()/2;
-       z/=tracks.size();
+               z += i->track->get_position().z+i->track->get_slope()/2;
+       z /= tracks.size();
 
        for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
-               Point p=i->track->get_position();
+               Point p = i->track->get_position();
                i->track->set_position(Point(p.x, p.y, z));
                i->track->set_slope(0);
        }
@@ -133,69 +133,69 @@ void Manipulator::even_slope(bool smooth)
        for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
                tracks2.push_back(i->track);
 
-       float total_len=0;
+       float total_len = 0;
 
        list<TrackOrder> order;
-       Track *cur=*neighbors.begin();
+       Track *cur = *neighbors.begin();
        while(tracks2.size())
        {
-               bool rev=false;
+               bool rev = false;
                for(list<Track *>::iterator i=tracks2.begin(); i!=tracks2.end(); ++i)
                {
-                       const vector<Track *> &links=(*i)->get_links();
+                       const vector<Track *> &links = (*i)->get_links();
                        if(links[0]==cur)
                        {
-                               cur=*i;
+                               cur = *i;
                                tracks2.erase(i);
                                break;
                        }
                        else if(links[1]==cur)
                        {
-                               cur=*i;
-                               rev=true;
+                               cur = *i;
+                               rev = true;
                                tracks2.erase(i);
                                break;
                        }
                }
                order.push_back(TrackOrder(cur, rev));
-               total_len+=cur->get_type().get_total_length();
+               total_len += cur->get_type().get_total_length();
        }
 
-       set<Track *>::iterator nb=neighbors.begin();
-       int epi=(*nb)->get_endpoint_by_link(*order.front().track);
-       float start_z=(*nb)->get_endpoint_position(epi).z;
+       set<Track *>::iterator nb = neighbors.begin();
+       int epi = (*nb)->get_endpoint_by_link(*order.front().track);
+       float start_z = (*nb)->get_endpoint_position(epi).z;
        ++nb;
-       epi=(*nb)->get_endpoint_by_link(*order.back().track);
-       float end_z=(*nb)->get_endpoint_position(epi).z;
+       epi = (*nb)->get_endpoint_by_link(*order.back().track);
+       float end_z = (*nb)->get_endpoint_position(epi).z;
 
        if(smooth)
        {
-               float dir=(end_z>start_z)?1:-1;
-               float cur_slope=0;
+               float dir = (end_z>start_z)?1:-1;
+               float cur_slope = 0;
                while((end_z-start_z)*dir/total_len>cur_slope+0.025 && order.size()>2)
                {
-                       cur_slope+=0.025;
+                       cur_slope += 0.025;
 
-                       float dz=order.front().track->get_type().get_total_length()*dir*cur_slope;
+                       float dz = order.front().track->get_type().get_total_length()*dir*cur_slope;
                        set_slope(order.front(), start_z, dz);
-                       start_z+=dz;
-                       total_len-=order.front().track->get_type().get_total_length();
+                       start_z += dz;
+                       total_len -= order.front().track->get_type().get_total_length();
                        order.erase(order.begin());
 
-                       dz=order.back().track->get_type().get_total_length()*dir*cur_slope;
+                       dz = order.back().track->get_type().get_total_length()*dir*cur_slope;
                        set_slope(order.back(), end_z-dz, dz);
-                       end_z-=dz;
-                       total_len-=order.back().track->get_type().get_total_length();
+                       end_z -= dz;
+                       total_len -= order.back().track->get_type().get_total_length();
                        order.erase(--order.end());
                }
        }
 
-       float cur_z=start_z;
+       float cur_z = start_z;
        for(list<TrackOrder>::iterator i=order.begin(); i!=order.end(); ++i)
        {
-               float dz=i->track->get_type().get_total_length()*(end_z-start_z)/total_len;
+               float dz = i->track->get_type().get_total_length()*(end_z-start_z)/total_len;
                set_slope(*i, cur_z, dz);
-               cur_z+=dz;
+               cur_z += dz;
        }
 
        for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
@@ -208,9 +208,9 @@ void Manipulator::cancel()
 {
        if(!mode)
                return;
-       mode=NONE;
+       mode = NONE;
 
-       wrap_pos=center;
+       wrap_pos = center;
        for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
                i->track->set_position(Point(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z));
@@ -220,8 +220,8 @@ void Manipulator::cancel()
        for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
                (*i)->check_slope();
 
-       angle=0;
-       wrap_rot=0;
+       angle = 0;
+       wrap_rot = 0;
 
        signal_done.emit(false);
 }
@@ -232,20 +232,20 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
                cancel();
        else if(mode)
        {
-               mode=NONE;
+               mode = NONE;
                update_wrap();
-               angle=0;
+               angle = 0;
 
                for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
                        for(vector<MTrack>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
                                j->track->break_link(**i);
 
-               const set<Track *> &ltracks=designer.get_layout()->get_tracks();
+               const set<Track *> &ltracks = designer.get_layout()->get_tracks();
                for(set<Track *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
                {
-                       bool ok=true;
+                       bool ok = true;
                        for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j)
-                               ok=(j->track!=*i);
+                               ok = (j->track!=*i);
                        if(!ok) continue;
 
                        for(vector<MTrack>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
@@ -253,7 +253,7 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
                }
 
                for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-                       i->rot=i->track->get_rotation();
+                       i->rot = i->track->get_rotation();
 
                update_neighbors();
 
@@ -263,40 +263,40 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
 
 void Manipulator::pointer_motion(int, int y, float gx, float gy)
 {
-       pointer_y=y;
-       gpointer=Point(gx, gy, 0);
+       pointer_y = y;
+       gpointer = Point(gx, gy, 0);
 
        if(mode==MOVE)
        {
                Point delta(gpointer.x-move_origin.x, gpointer.y-move_origin.y, 0);
 
-               wrap_pos=Point(center.x+delta.x, center.y+delta.y, center.z);
+               wrap_pos = Point(center.x+delta.x, center.y+delta.y, center.z);
                for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
                {
                        i->track->set_position(Point(wrap_pos.x+i->pos.x, wrap_pos.y+i->pos.y, wrap_pos.z+i->pos.z));
                        i->track->set_rotation(i->rot);
                }
 
-               const set<Track *> &ltracks=designer.get_layout()->get_tracks();
-               MTrack *snapped=0;
+               const set<Track *> &ltracks = designer.get_layout()->get_tracks();
+               MTrack *snapped = 0;
                for(set<Track *>::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i)
                {
-                       bool ok=true;
+                       bool ok = true;
                        for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j)
-                               ok=(j->track!=*i);
+                               ok = (j->track!=*i);
                        if(!ok) continue;
 
                        for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && !snapped); ++j)
                                if(j->track->snap_to(**i, false))
-                                       snapped=&*j;
+                                       snapped = &*j;
                }
 
                if(snapped)
                {
-                       float da=snapped->track->get_rotation()-snapped->rot;
-                       float c=cos(da);
-                       float s=sin(da);
-                       const Point &sp=snapped->track->get_position();
+                       float da = snapped->track->get_rotation()-snapped->rot;
+                       float c = cos(da);
+                       float s = sin(da);
+                       const Point &sp = snapped->track->get_position();
                        for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
                        {
                                if(&*i==snapped)
@@ -310,29 +310,29 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
        }
        else if(mode==ROTATE)
        {
-               float a=atan2(gpointer.y-center.y, gpointer.x-center.x);
-               angle+=a-rot_origin;
-               rot_origin=a;
+               float a = atan2(gpointer.y-center.y, gpointer.x-center.x);
+               angle += a-rot_origin;
+               rot_origin = a;
 
-               wrap_rot=angle;
+               wrap_rot = angle;
                for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
                {
-                       float c=cos(angle);
-                       float s=sin(angle);
+                       float c = cos(angle);
+                       float s = sin(angle);
                        i->track->set_position(Point(center.x+c*i->pos.x-s*i->pos.y, center.y+s*i->pos.x+c*i->pos.y, center.z*i->pos.z));
                        i->track->set_rotation(angle+i->rot);
                }
        }
        else if(mode==ELEVATE)
        {
-               float dz=(y-elev_origin)/1000.;
+               float dz = (y-elev_origin)/1000.;
 
                ostringstream ss;
                ss.precision(3);
                ss<<"Elevation: "<<dz*1000<<"mm ("<<(center.z+dz)*1000<<"mm)";
                signal_status.emit(ss.str());
 
-               wrap_pos.z=center.z+dz;
+               wrap_pos.z = center.z+dz;
                for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
                        i->track->set_position(Point(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z+dz));
 
@@ -378,7 +378,7 @@ void Manipulator::selection_changed()
        tracks.clear();
        if(selection)
        {
-               const set<Track *> &stracks=selection->get_tracks();
+               const set<Track *> &stracks = selection->get_tracks();
                tracks.insert(tracks.end(), stracks.begin(), stracks.end());
        }
 
@@ -389,61 +389,61 @@ void Manipulator::selection_changed()
 void Manipulator::update_wrap()
 {
        wrap.clear();
-       float min_x=0, max_x=0;
-       float min_y=0, max_y=0;
+       float min_x = 0, max_x = 0;
+       float min_y = 0, max_y = 0;
        for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
-               Track3D &t3d=designer.get_layout_3d()->get_track(*i->track);
+               Track3D &t3d = designer.get_layout_3d()->get_track(*i->track);
 
                TrackWrap tw;
-               float min_area=100;
+               float min_area = 100;
                for(float a=0; a<M_PI; a+=0.01)
                {
                        Point minp, maxp;
                        t3d.get_bounds(a, minp, maxp);
-                       float area=(maxp.x-minp.x)*(maxp.y-minp.y);
+                       float area = (maxp.x-minp.x)*(maxp.y-minp.y);
                        if(area<min_area)
                        {
-                               float c=cos(a);
-                               float s=sin(a);
-                               float x=(minp.x+maxp.x)/2;
-                               float y=(minp.y+maxp.y)/2;
-                               tw.pos=Point(c*x-s*y, s*x+c*y, (minp.z+maxp.z)/2);
-                               tw.rot=a;
-                               tw.width=maxp.x-minp.x+0.01;
-                               tw.height=maxp.y-minp.y+0.01;
-
-                               min_area=area;
+                               float c = cos(a);
+                               float s = sin(a);
+                               float x = (minp.x+maxp.x)/2;
+                               float y = (minp.y+maxp.y)/2;
+                               tw.pos = Point(c*x-s*y, s*x+c*y, (minp.z+maxp.z)/2);
+                               tw.rot = a;
+                               tw.width = maxp.x-minp.x+0.01;
+                               tw.height = maxp.y-minp.y+0.01;
+
+                               min_area = area;
                        }
                }
 
                if(i==tracks.begin())
                {
-                       min_x=max_x=tw.pos.x;
-                       min_y=max_y=tw.pos.y;
+                       min_x = max_x = tw.pos.x;
+                       min_y = max_y = tw.pos.y;
                }
                else
                {
-                       min_x=min(min_x, tw.pos.x);
-                       max_x=max(max_x, tw.pos.x);
-                       min_y=min(min_y, tw.pos.y);
-                       max_y=max(max_y, tw.pos.y);
+                       min_x = min(min_x, tw.pos.x);
+                       max_x = max(max_x, tw.pos.x);
+                       min_y = min(min_y, tw.pos.y);
+                       max_y = max(max_y, tw.pos.y);
                }
                wrap.push_back(tw);
        }
 
-       center=Point((min_x+max_x)/2, (min_y+max_y)/2, 0);
-       wrap_pos=center;
-       wrap_rot=0;
+       center = Point((min_x+max_x)/2, (min_y+max_y)/2, 0);
+       wrap_pos = center;
+       wrap_rot = 0;
        for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
-               const Point &tp=i->track->get_position();
-               i->pos=Point(tp.x-center.x, tp.y-center.y, tp.z);
+               const Point &tp = i->track->get_position();
+               i->pos = Point(tp.x-center.x, tp.y-center.y, tp.z);
        }
        for(list<TrackWrap>::iterator i=wrap.begin(); i!=wrap.end(); ++i)
        {
-               i->pos.x-=center.x;
-               i->pos.y-=center.y;
+               i->pos.x -= center.x;
+               i->pos.y -= center.y;
        }
 }
 
@@ -452,7 +452,7 @@ void Manipulator::update_neighbors()
        neighbors.clear();
        for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
-               const vector<Track *> &links=i->track->get_links();
+               const vector<Track *> &links = i->track->get_links();
                for(vector<Track *>::const_iterator j=links.begin(); j!=links.end(); ++j)
                {
                        if(!*j)
@@ -460,9 +460,9 @@ void Manipulator::update_neighbors()
                        if(neighbors.count(*j))
                                continue;
 
-                       bool ok=true;
+                       bool ok = true;
                        for(vector<MTrack>::iterator k=tracks.begin(); (k!=tracks.end() && ok); ++k)
-                               ok=(k->track!=*j);
+                               ok = (k->track!=*j);
 
                        if(ok)
                                neighbors.insert(*j);
@@ -472,7 +472,7 @@ void Manipulator::update_neighbors()
 
 void Manipulator::set_slope(TrackOrder &track, float z, float dz)
 {
-       const Point &p=track.track->get_position();
+       const Point &p = track.track->get_position();
        if(track.rev)
        {
                track.track->set_position(Point(p.x, p.y, z+dz));