gui/map_win.cc
changeset 1833 6d107b0b6b46
parent 1737 dc821d2668c1
child 1837 8dd6160ff699
equal deleted inserted replaced
17:eed01dc6ee27 18:e8032c8008e4
     8     hide();
     8     hide();
     9   }
     9   }
    10   return true;
    10   return true;
    11 }
    11 }
    12 
    12 
    13 MapWin::MapWin(const std::string& title, MapStorage & mapst, GraphDisplayerCanvas & grdispc, NewMapWin & newmapwin):gdc(grdispc),ms(mapst), nmw(newmapwin)
    13 MapWin::MapWin(const std::string& title, MapStorage & mapst, GraphDisplayerCanvas & grdispc):gdc(grdispc),ms(mapst)
    14 {
    14 {
    15   set_title(title);
    15   set_title(title);
    16   set_default_size(200, 50);
    16   set_default_size(200, 50);
    17 
    17 
    18   signal_key_press_event().connect(sigc::mem_fun(*this, &MapWin::closeIfEscapeIsPressed));
    18   signal_key_press_event().connect(sigc::mem_fun(*this, &MapWin::closeIfEscapeIsPressed));
    21 
    21 
    22   table=new Gtk::Table(EDGE_PROPERTY_NUM, 1, false);
    22   table=new Gtk::Table(EDGE_PROPERTY_NUM, 1, false);
    23 
    23 
    24   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
    24   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
    25   {
    25   {
    26     e_combo_array[i]=new MapSelector(gdc, ms, nmw, i, true);
    26     e_combo_array[i]=new MapSelector(gdc, ms, i, true);
    27 
    27 
    28     (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
    28     (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
    29   }
    29   }
    30 
    30 
    31   vbox.pack_start(*(new Gtk::Label("Edge properties")));
    31   vbox.pack_start(*(new Gtk::Label("Edge properties")));
    38 
    38 
    39   table=new Gtk::Table(NODE_PROPERTY_NUM, 1, false);
    39   table=new Gtk::Table(NODE_PROPERTY_NUM, 1, false);
    40 
    40 
    41   for(int i=0;i<NODE_PROPERTY_NUM;i++)
    41   for(int i=0;i<NODE_PROPERTY_NUM;i++)
    42   {
    42   {
    43     n_combo_array[i]=new MapSelector(gdc, ms, nmw, i, false);
    43     n_combo_array[i]=new MapSelector(gdc, ms, i, false);
    44 
    44 
    45     (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
    45     (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
    46   }
    46   }
    47 
    47 
    48   add(vbox);
    48   add(vbox);