]> git.tdb.fi Git - r2c2.git/blobdiff - source/designer/designer.cpp
Code reformatting: add spaces around assignment operators
[r2c2.git] / source / designer / designer.cpp
index c1bbc3ff17dfb4f56b7bd1fa15200ab9be6d4fb4..71391ff349c007a3ff8013b8c5bed08b52f28476 100644 (file)
@@ -50,30 +50,30 @@ Designer::Designer(int argc, char **argv):
 {
        DataFile::load(catalogue, "tracks.dat");
 
-       cat_layout=new Layout(catalogue);
-       cat_layout_3d=new Layout3D(*cat_layout);
+       cat_layout = new Layout(catalogue);
+       cat_layout_3d = new Layout3D(*cat_layout);
 
-       const map<unsigned, TrackType *> &ctracks=catalogue.get_tracks();
-       unsigned n=0;
+       const map<unsigned, TrackType *> &ctracks = catalogue.get_tracks();
+       unsigned n = 0;
        for(map<unsigned, TrackType *>::const_iterator i=ctracks.begin(); i!=ctracks.end(); ++i, ++n)
        {
-               Track *track=new Track(*i->second);
+               Track *track = new Track(*i->second);
                track->set_position(Point((n%11)*0.1-0.5, 0.2-n/11*0.3, 0));
                track->set_rotation(M_PI/2);
                cat_layout->add_track(*track);
        }
 
-       manipulator=new Manipulator(*this);
+       manipulator = new Manipulator(*this);
        manipulator->signal_status.connect(sigc::mem_fun(this, &Designer::manipulation_status));
        manipulator->signal_done.connect(sigc::mem_fun(this, &Designer::manipulation_done));
 
-       layout=new Layout(catalogue);
-       layout_3d=new Layout3D(*layout);
+       layout = new Layout(catalogue);
+       layout_3d = new Layout3D(*layout);
 
        if(argc>1)
        {
                DataFile::load(*layout, argv[1]);
-               const list<Track3D *> &ltracks=layout_3d->get_tracks();
+               const list<Track3D *> &ltracks = layout_3d->get_tracks();
                for(list<Track3D *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
                {
                        if((*i)->get_track().get_sensor_id())
@@ -86,15 +86,15 @@ Designer::Designer(int argc, char **argv):
 
                if(!layout->get_base().empty())
                {
-                       base_mesh=new GL::Mesh;
+                       base_mesh = new GL::Mesh;
                        DataFile::load(*base_mesh, layout->get_base());
                }
        }
 
-       selection=new Selection;
+       selection = new Selection;
        manipulator->set_selection(selection);
 
-       measure=new Measure(*this);
+       measure = new Measure(*this);
        measure->signal_changed.connect(sigc::mem_fun(this, &Designer::measure_changed));
        measure->signal_done.connect(sigc::mem_fun(this, &Designer::measure_done));
 }
@@ -112,9 +112,9 @@ Designer::~Designer()
 
 int Designer::main()
 {
-       dpy=new Graphics::Display;
-       wnd=new Graphics::Window(*dpy, screen_w, screen_h);
-       glc=new Graphics::GLContext(*wnd);
+       dpy = new Graphics::Display;
+       wnd = new Graphics::Window(*dpy, screen_w, screen_h);
+       glc = new Graphics::GLContext(*wnd);
 
        wnd->signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
        wnd->signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press));
@@ -130,14 +130,14 @@ int Designer::main()
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        glEnable(GL_CULL_FACE);
 
-       GL::Texture2D *font_tex=new GL::Texture2D;
+       GL::Texture2D *font_tex = new GL::Texture2D;
        font_tex->set_min_filter(GL::LINEAR);
        font_tex->load_image("dejavu-20.png");
-       font=new GL::Font();
+       font = new GL::Font();
        font->set_texture(*font_tex);
        DataFile::load(*font, "dejavu-20.font");
 
-       mode=SELECT;
+       mode = SELECT;
 
        Application::main();
 
@@ -154,94 +154,94 @@ int Designer::main()
 
 void Designer::map_pointer_coords(int x, int y, float &gx, float &gy)
 {
-       float cos_pitch=cos(cam_pitch);
-       float sin_pitch=sin(cam_pitch);
-       float cos_yaw=cos(cam_yaw);
-       float sin_yaw=sin(cam_yaw);
+       float cos_pitch = cos(cam_pitch);
+       float sin_pitch = sin(cam_pitch);
+       float cos_yaw = cos(cam_yaw);
+       float sin_yaw = sin(cam_yaw);
 
-       float rx=sin_yaw*0.55228;
-       float ry=-cos_yaw*0.55228;
+       float rx = sin_yaw*0.55228;
+       float ry = -cos_yaw*0.55228;
 
-       float ux=cos_yaw*-sin_pitch*0.41421;
-       float uy=sin_yaw*-sin_pitch*0.41421;
-       float uz=cos_pitch*0.41421;
+       float ux = cos_yaw*-sin_pitch*0.41421;
+       float uy = sin_yaw*-sin_pitch*0.41421;
+       float uz = cos_pitch*0.41421;
 
-       float xf=static_cast<float>(x)*2/screen_w-1;
-       float yf=static_cast<float>(y)*2/screen_h-1;
+       float xf = static_cast<float>(x)*2/screen_w-1;
+       float yf = static_cast<float>(y)*2/screen_h-1;
 
-       float vx=cos_yaw*cos_pitch + xf*rx + yf*ux;
-       float vy=sin_yaw*cos_pitch + xf*ry + yf*uy;
-       float vz=sin_pitch + yf*uz;
+       float vx = cos_yaw*cos_pitch + xf*rx + yf*ux;
+       float vy = sin_yaw*cos_pitch + xf*ry + yf*uy;
+       float vz = sin_pitch + yf*uz;
 
-       gx=cam_pos.x-vx*cam_pos.z/vz;
-       gy=cam_pos.y-vy*cam_pos.z/vz;
+       gx = cam_pos.x-vx*cam_pos.z/vz;
+       gy = cam_pos.y-vy*cam_pos.z/vz;
 }
 
 void Designer::tick()
 {
-       const Msp::Time::TimeStamp t=Msp::Time::now();
-       float dt=(t-last_tick)/Msp::Time::sec;
-       last_tick=t;
+       const Msp::Time::TimeStamp t = Msp::Time::now();
+       float dt = (t-last_tick)/Msp::Time::sec;
+       last_tick = t;
 
        dpy->tick();
 
        if(move_y)
        {
-               cam_pos.x+=cos(cam_yaw)*dt*move_y;
-               cam_pos.y+=sin(cam_yaw)*dt*move_y;
+               cam_pos.x += cos(cam_yaw)*dt*move_y;
+               cam_pos.y += sin(cam_yaw)*dt*move_y;
        }
        if(move_x)
        {
-               cam_pos.x+=sin(cam_yaw)*dt*move_x;
-               cam_pos.y+=-cos(cam_yaw)*dt*move_x;
+               cam_pos.x += sin(cam_yaw)*dt*move_x;
+               cam_pos.y += -cos(cam_yaw)*dt*move_x;
        }
        if(zoom)
        {
-               cam_pos.x+=cos(cam_yaw)*cos(cam_pitch)*dt*zoom;
-               cam_pos.y+=sin(cam_yaw)*cos(cam_pitch)*dt*zoom;
-               cam_pos.z+=sin(cam_pitch)*dt*zoom;
+               cam_pos.x += cos(cam_yaw)*cos(cam_pitch)*dt*zoom;
+               cam_pos.y += sin(cam_yaw)*cos(cam_pitch)*dt*zoom;
+               cam_pos.z += sin(cam_pitch)*dt*zoom;
        }
        if(rotate)
        {
-               float vx=cos(cam_yaw)*cos(cam_pitch);
-               float vy=sin(cam_yaw)*cos(cam_pitch);
-               float vz=sin(cam_pitch);
+               float vx = cos(cam_yaw)*cos(cam_pitch);
+               float vy = sin(cam_yaw)*cos(cam_pitch);
+               float vz = sin(cam_pitch);
 
-               float gx=cam_pos.x-vx*cam_pos.z/vz;
-               float gy=cam_pos.y-vy*cam_pos.z/vz;
-               float d=sqrt(vx*vx+vy*vy)*cam_pos.z/vz;
+               float gx = cam_pos.x-vx*cam_pos.z/vz;
+               float gy = cam_pos.y-vy*cam_pos.z/vz;
+               float d = sqrt(vx*vx+vy*vy)*cam_pos.z/vz;
 
-               cam_yaw+=M_PI*dt*rotate;
+               cam_yaw += M_PI*dt*rotate;
                if(cam_yaw>M_PI*2)
-                       cam_yaw-=M_PI*2;
+                       cam_yaw -= M_PI*2;
                else if(cam_yaw<0)
-                       cam_yaw+=M_PI*2;
+                       cam_yaw += M_PI*2;
 
-               cam_pos.x=gx+cos(cam_yaw)*d;
-               cam_pos.y=gy+sin(cam_yaw)*d;
+               cam_pos.x = gx+cos(cam_yaw)*d;
+               cam_pos.y = gy+sin(cam_yaw)*d;
        }
        if(pitch)
        {
-               cam_pitch+=M_PI/2*dt*pitch;
+               cam_pitch += M_PI/2*dt*pitch;
                if(cam_pitch>M_PI/12)
-                       cam_pitch=M_PI/12;
+                       cam_pitch = M_PI/12;
                else if(cam_pitch<-M_PI/2)
-                       cam_pitch=-M_PI/2;
+                       cam_pitch = -M_PI/2;
        }
 
        if(tooltip_timeout && t>tooltip_timeout)
        {
-               Track3D *t3d=0;
+               Track3D *t3d = 0;
 
                if(mode==CATALOGUE)
-                       t3d=pick_track(pointer_x, pointer_y);
+                       t3d = pick_track(pointer_x, pointer_y);
                else
-                       t3d=pick_track(pointer_x, pointer_y);
+                       t3d = pick_track(pointer_x, pointer_y);
 
                if(t3d)
                {
-                       const Track &track=t3d->get_track();
-                       const TrackType &ttype=track.get_type();
+                       const Track &track = t3d->get_track();
+                       const TrackType &ttype = track.get_type();
                        ostringstream ss;
                        ss.precision(2);
                        ss<<ttype.get_article_number()<<' '<<ttype.get_description();
@@ -251,14 +251,14 @@ void Designer::tick()
                                ss<<" (turnout "<<track.get_turnout_id()<<')';
                        else if(track.get_sensor_id())
                                ss<<" (sensor "<<track.get_sensor_id()<<')';
-                       tooltip=ss.str();
+                       tooltip = ss.str();
 
                        move_tooltip(pointer_x, pointer_y);
                }
                else
-                       tooltip="";
+                       tooltip.clear();
 
-               tooltip_timeout=Msp::Time::TimeStamp();
+               tooltip_timeout = Msp::Time::TimeStamp();
        }
 
        render();
@@ -270,7 +270,7 @@ void Designer::tick()
 
 void Designer::key_press(unsigned code, unsigned mod, wchar_t ch)
 {
-       unsigned key=Msp::Input::key_from_sys(code);
+       unsigned key = Msp::Input::key_from_sys(code);
 
        if(mode==INPUT)
        {
@@ -279,41 +279,41 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t ch)
        }
 
        if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R)
-               shift=true;
+               shift = true;
 
        if(key==Msp::Input::KEY_N)
-               mode=CATALOGUE;
+               mode = CATALOGUE;
        else if(key==Msp::Input::KEY_G)
        {
                manipulator->start_move();
-               mode=MANIPULATE;
+               mode = MANIPULATE;
        }
        else if(key==Msp::Input::KEY_R)
        {
                manipulator->start_rotate();
-               mode=MANIPULATE;
+               mode = MANIPULATE;
        }
        else if(key==Msp::Input::KEY_D)
        {
                manipulator->duplicate();
                manipulator->start_move();
-               mode=MANIPULATE;
+               mode = MANIPULATE;
        }
        else if(key==Msp::Input::KEY_W)
        {
-               input=new ::Input(*this, "Filename");
+               input = new ::Input(*this, "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;
+               mode = INPUT;
        }
        else if(key==Msp::Input::KEY_PLUS)
                selection->select_more();
        else if(key==Msp::Input::KEY_L && (mod&1))
        {
-               const set<Track *> &tracks=layout->get_tracks();
-               float len=0;
+               const set<Track *> &tracks = layout->get_tracks();
+               float len = 0;
                for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-                       len+=(*i)->get_type().get_total_length();
+                       len += (*i)->get_type().get_total_length();
                cout<<"Total length: "<<len<<"m\n";
        }
        else if(key==Msp::Input::KEY_L)
@@ -321,25 +321,25 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t ch)
        else if(key==Msp::Input::KEY_M)
        {
                measure->start();
-               mode=MEASURE;
+               mode = MEASURE;
        }
        else if(key==Msp::Input::KEY_Z)
        {
                manipulator->start_elevate();
-               mode=MANIPULATE;
+               mode = MANIPULATE;
        }
        else if(key==Msp::Input::KEY_ESC)
        {
                if(mode==MANIPULATE)
                        manipulator->cancel();
                else if(mode==CATALOGUE)
-                       mode=SELECT;
+                       mode = SELECT;
                else
                        selection->clear();
        }
        else if(key==Msp::Input::KEY_X)
        {
-               set<Track *> tracks=selection->get_tracks();
+               set<Track *> tracks = selection->get_tracks();
                selection->clear();
                for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
                {
@@ -349,8 +349,8 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t ch)
        }
        else if(key==Msp::Input::KEY_F && (mod&1))
        {
-               const set<Track *> &tracks=selection->get_tracks();
-               const set<Track *> &ltracks=layout->get_tracks();
+               const set<Track *> &tracks = selection->get_tracks();
+               const set<Track *> &ltracks = layout->get_tracks();
                for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                {
                        (*i)->set_flex(!(*i)->get_flex());
@@ -359,7 +359,7 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t ch)
                                if(*j!=*i)
                                        (*i)->snap_to(**j, true);
 
-                       Track3D &t3d=layout_3d->get_track(**i);
+                       Track3D &t3d = layout_3d->get_track(**i);
                        if((*i)->get_flex())
                                t3d.set_color(GL::Color(1, 0.5, 1));
                        else
@@ -374,32 +374,32 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t ch)
                manipulator->even_slope();
        else if(key==Msp::Input::KEY_T)
        {
-               Track *track=selection->get_track();
+               Track *track = selection->get_track();
                if(selection->size()==1 && track->get_type().get_n_routes()>1)
                {
                        ostringstream ss;
                        ss<<track->get_turnout_id();
-                       input=new ::Input(*this, "Turnout ID", ss.str());
+                       input = new ::Input(*this, "Turnout ID", ss.str());
                        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;
+                       mode = INPUT;
                }
        }
        else if(key==Msp::Input::KEY_S)
        {
-               const set<Track *> &tracks=selection->get_tracks();
-               bool ok=false;
-               int id=-1;
+               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_routes()==1)
-                               ok=true;
+                               ok = true;
                        if(static_cast<int>((*i)->get_sensor_id())!=id)
                        {
                                if(id==-1)
-                                       id=(*i)->get_sensor_id();
+                                       id = (*i)->get_sensor_id();
                                else
-                                       id=-2;
+                                       id = -2;
                        }
                }
                if(ok)
@@ -407,58 +407,58 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t ch)
                        ostringstream ss;
                        if(id>=0)
                                ss<<id;
-                       input=new ::Input(*this, "Sensor ID", ss.str());
+                       input = new ::Input(*this, "Sensor ID", ss.str());
                        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;
+                       mode = INPUT;
                }
        }
        else if(key==Msp::Input::KEY_RIGHT)
-               rotate=-1;
+               rotate = -1;
        else if(key==Msp::Input::KEY_LEFT)
-               rotate=1;
+               rotate = 1;
        else if(key==Msp::Input::KEY_UP)
-               move_y=1;
+               move_y = 1;
        else if(key==Msp::Input::KEY_DOWN)
-               move_y=-1;
+               move_y = -1;
        else if(key==Msp::Input::KEY_INSERT)
-               zoom=-1;
+               zoom = -1;
        else if(key==Msp::Input::KEY_PGUP)
-               zoom=1;
+               zoom = 1;
        else if(key==Msp::Input::KEY_HOME)
-               pitch=1;
+               pitch = 1;
        else if(key==Msp::Input::KEY_END)
-               pitch=-1;
+               pitch = -1;
        else if(key==Msp::Input::KEY_DELETE)
-               move_x=-1;
+               move_x = -1;
        else if(key==Msp::Input::KEY_PGDN)
-               move_x=1;
+               move_x = 1;
 }
 
 void Designer::key_release(unsigned code, unsigned)
 {
-       unsigned key=Msp::Input::key_from_sys(code);
+       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;
+               shift = false;
        else if(key==Msp::Input::KEY_RIGHT || key==Msp::Input::KEY_LEFT)
-               rotate=0;
+               rotate = 0;
        else if(key==Msp::Input::KEY_UP || key==Msp::Input::KEY_DOWN)
-               move_y=0;
+               move_y = 0;
        else if(key==Msp::Input::KEY_INSERT || key==Msp::Input::KEY_PGUP)
-               zoom=0;
+               zoom = 0;
        else if(key==Msp::Input::KEY_HOME || key==Msp::Input::KEY_END)
-               pitch=0;
+               pitch = 0;
        else if(key==Msp::Input::KEY_DELETE || key==Msp::Input::KEY_PGDN)
-               move_x=0;
+               move_x = 0;
 }
 
 void Designer::button_press(int x, int y, unsigned btn, unsigned)
 {
-       y=screen_h-y-1;
+       y = screen_h-y-1;
 
        float gx, gy;
        map_pointer_coords(x, y, gx, gy);
@@ -467,27 +467,27 @@ void Designer::button_press(int x, int y, unsigned btn, unsigned)
        {
                if(btn==1)
                {
-                       Track3D *ctrack=pick_track(x, y);
+                       Track3D *ctrack = pick_track(x, y);
                        if(ctrack)
                        {
-                               Track *track=ctrack->get_track().copy();
+                               Track *track = ctrack->get_track().copy();
                                track->set_position(Point(gx, gy, 0));
                                layout->add_track(*track);
 
                                selection->clear();
                                selection->add_track(track);
 
-                               mode=SELECT;
+                               mode = SELECT;
                        }
                }
                else
-                       mode=SELECT;
+                       mode = SELECT;
        }
        else if(mode==SELECT)
        {
                if(btn==1)
                {
-                       Track3D *track=pick_track(x, y);
+                       Track3D *track = pick_track(x, y);
                        if(track)
                        {
                                if(!shift)
@@ -504,16 +504,16 @@ void Designer::button_press(int x, int y, unsigned btn, unsigned)
 
 void Designer::pointer_motion(int x, int y)
 {
-       y=screen_h-y-1;
+       y = screen_h-y-1;
 
        float gx, gy;
        map_pointer_coords(x, y, gx, gy);
 
        if(mode==SELECT || mode==CATALOGUE)
        {
-               pointer_x=x;
-               pointer_y=y;
-               tooltip_timeout=Msp::Time::now()+100*Msp::Time::msec;
+               pointer_x = x;
+               pointer_y = y;
+               tooltip_timeout = Msp::Time::now()+100*Msp::Time::msec;
        }
 
        if(mode!=INPUT)
@@ -581,7 +581,7 @@ void Designer::render()
        {
                glTranslatef(tooltip_x, tooltip_y, 0);
                glScalef(20, 20, 20);
-               float width=font->get_string_width(tooltip);
+               float width = font->get_string_width(tooltip);
                glColor4f(0, 0, 0, 0.5);
                glBegin(GL_QUADS);
                glVertex2f(0, 0);
@@ -599,13 +599,13 @@ void Designer::render()
 
 Track3D *Designer::pick_track(int x, int y)
 {
-       Layout3D *l=layout_3d;
+       Layout3D *l = layout_3d;
        if(mode==CATALOGUE)
-               l=cat_layout_3d;
+               l = cat_layout_3d;
 
-       float xx=(static_cast<float>(x-static_cast<int>(screen_w)/2)/screen_h)*0.82843;
-       float yy=(static_cast<float>(y)/screen_h-0.5)*0.82843;
-       float size=4.0/screen_h*0.82843;
+       float xx = (static_cast<float>(x-static_cast<int>(screen_w)/2)/screen_h)*0.82843;
+       float yy = (static_cast<float>(y)/screen_h-0.5)*0.82843;
+       float size = 4.0/screen_h*0.82843;
 
        project_3d();
        apply_camera();
@@ -615,36 +615,36 @@ Track3D *Designer::pick_track(int x, int y)
 
 void Designer::manipulation_status(const string &status)
 {
-       tooltip=status;
+       tooltip = status;
 }
 
 void Designer::manipulation_done(bool)
 {
-       mode=SELECT;
+       mode = SELECT;
 }
 
 void Designer::measure_changed()
 {
-       float pard=measure->get_parallel_distance()*1000;
-       float perpd=measure->get_perpendicular_distance()*1000;
-       float d=sqrt(pard*pard+perpd*perpd);
-       float adiff=measure->get_angle_difference()*180/M_PI;
+       float pard = measure->get_parallel_distance()*1000;
+       float perpd = measure->get_perpendicular_distance()*1000;
+       float d = sqrt(pard*pard+perpd*perpd);
+       float adiff = measure->get_angle_difference()*180/M_PI;
        ostringstream ss;
        ss.precision(3);
        ss<<"Par "<<pard<<"mm - Perp "<<perpd<<"mm - Total "<<d<<"mm - Angle "<<adiff<<"°";
-       tooltip=ss.str();
+       tooltip = ss.str();
 }
 
 void Designer::measure_done()
 {
-       mode=SELECT;
+       mode = SELECT;
 }
 
 void Designer::move_tooltip(int x, int y)
 {
-       int w=static_cast<int>(font->get_string_width(tooltip)*20);
-       tooltip_x=max(min(static_cast<int>(screen_w)-w, x), 0);
-       tooltip_y=max(min(static_cast<int>(screen_h)-20, y), 0);
+       int w = static_cast<int>(font->get_string_width(tooltip)*20);
+       tooltip_x = max(min(static_cast<int>(screen_w)-w, x), 0);
+       tooltip_y = max(min(static_cast<int>(screen_h)-20, y), 0);
 }
 
 void Designer::save_accept()
@@ -656,11 +656,11 @@ void Designer::save_accept()
 
 void Designer::turnout_id_accept()
 {
-       Track *track=selection->get_track();
-       unsigned id=lexical_cast<unsigned>(input->get_text());
+       Track *track = selection->get_track();
+       unsigned id = lexical_cast<unsigned>(input->get_text());
        track->set_turnout_id(id);
 
-       Track3D &t3d=layout_3d->get_track(*track);
+       Track3D &t3d = layout_3d->get_track(*track);
        if(id)
                t3d.set_color(GL::Color(0.5, 1, 1));
        else
@@ -671,13 +671,13 @@ void Designer::turnout_id_accept()
 
 void Designer::sensor_id_accept()
 {
-       const set<Track *> &tracks=selection->get_tracks();
-       unsigned id=lexical_cast<unsigned>(input->get_text());
+       const set<Track *> &tracks = selection->get_tracks();
+       unsigned id = lexical_cast<unsigned>(input->get_text());
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
                (*i)->set_sensor_id(id);
 
-               Track3D &t3d=layout_3d->get_track(**i);
+               Track3D &t3d = layout_3d->get_track(**i);
                if(id)
                        t3d.set_color(GL::Color(1, 1, 0.5));
                else
@@ -690,6 +690,6 @@ void Designer::sensor_id_accept()
 void Designer::input_dismiss()
 {
        delete input;
-       input=0;
-       mode=SELECT;
+       input = 0;
+       mode = SELECT;
 }