X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainlistdialog.cpp;h=5e3c50b6873e827c0d3ba8b77ce14104e99e6ede;hb=abed4a255060d5a233ec0ac2dd60af9132e29201;hp=5d0c9fec9d85402f94dd16c068c8947ed3bab551;hpb=b8cf5d2f394c151c6b095396dafdc66162cb060e;p=r2c2.git diff --git a/source/engineer/trainlistdialog.cpp b/source/engineer/trainlistdialog.cpp index 5d0c9fe..5e3c50b 100644 --- a/source/engineer/trainlistdialog.cpp +++ b/source/engineer/trainlistdialog.cpp @@ -11,23 +11,26 @@ using namespace std; using namespace Msp; using namespace R2C2; -class TrainItem: public GLtk::List::Item +class TrainItem: public GLtk::List::MultiColumnItem { -private: - GLtk::Label address; - GLtk::Label name; - -public: +public: typedef R2C2::Train *ValueType; TrainItem(ValueType); +}; + + +class DetectedLocoItem: public GLtk::List::MultiColumnItem +{ +public: + typedef const Driver::DetectedLocomotive *ValueType; -private: - virtual void on_style_change(); + DetectedLocoItem(ValueType); }; TrainListDialog::TrainListDialog(Engineer &e): + DynamicDialog(e.get_user_interface()), engineer(e), layout(engineer.get_layout()) { @@ -38,17 +41,46 @@ TrainListDialog::TrainListDialog(Engineer &e): lst_trains->set_data(trains); lst_trains->set_item_type(); + lst_imported = dynamic_cast(get_item(widgets, "lst_imported")); + lst_imported->set_data(detected_locos); + lst_imported->set_item_type(); + + dynamic_cast(get_item(widgets, "tgl_trains"))->signal_toggled.connect(sigc::bind(sigc::mem_fun(this, &TrainListDialog::tab_toggled), lst_trains)); + dynamic_cast(get_item(widgets, "tgl_import"))->signal_toggled.connect(sigc::bind(sigc::mem_fun(this, &TrainListDialog::tab_toggled), lst_imported)); + dynamic_cast(get_item(widgets, "btn_new"))->signal_clicked.connect(sigc::mem_fun(this, &TrainListDialog::new_clicked)); dynamic_cast(get_item(widgets, "btn_show"))->signal_clicked.connect(sigc::mem_fun(this, &TrainListDialog::show_clicked)); const map <rains = layout.get_trains(); for(map::const_iterator i=ltrains.begin(); i!=ltrains.end(); ++i) + { trains.append(i->second); + i->second->signal_name_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &TrainListDialog::train_name_changed), sigc::ref(*i->second)))); + } + + if(layout.has_driver()) + { + Driver &driver = layout.get_driver(); + driver.signal_locomotive_detected.connect(sigc::mem_fun(this, &TrainListDialog::locomotive_detected)); + driver.signal_locomotive_gone.connect(sigc::mem_fun(this, &TrainListDialog::locomotive_gone)); + + unsigned i = 0; + while(const Driver::DetectedLocomotive *loco = driver.enumerate_detected_locos(i++)) + detected_locos.append(loco); + } + layout.signal_train_added.connect(sigc::mem_fun(this, &TrainListDialog::train_added)); + layout.signal_train_removed.connect(sigc::mem_fun(this, &TrainListDialog::train_removed)); } void TrainListDialog::new_clicked() { NewTrainDialog *dlg = new NewTrainDialog(engineer); + if(lst_imported->is_visible()) + { + int selected = lst_imported->get_selected_index(); + if(selected>=0) + dlg->prefill(*detected_locos.get(selected)); + } find_ancestor()->add(*dlg); dlg->autosize(); } @@ -60,31 +92,70 @@ void TrainListDialog::show_clicked() { TrainDialog *dlg = new TrainDialog(engineer, *trains.get(index)); find_ancestor()->add(*dlg); - dlg->autosize(); } } +void TrainListDialog::tab_toggled(bool value, GLtk::Widget *wdg) +{ + wdg->set_visible(value); +} -TrainItem::TrainItem(ValueType train): - address(lexical_cast(train->get_address())), - name(train->get_name()) +void TrainListDialog::locomotive_detected(const Driver::DetectedLocomotive &loco) { - add(address); - add(name); + detected_locos.append(&loco); } -void TrainItem::on_style_change() +void TrainListDialog::locomotive_gone(const Driver::DetectedLocomotive &loco) { - if(!style) - return; + int index = detected_locos.find(&loco); + if(index>=0) + detected_locos.remove(index); +} - address.autosize(); - name.autosize(); +void TrainListDialog::train_added(Train &train) +{ + unsigned n_items = trains.size(); + unsigned i; + for(i=0; iget_address()>train.get_address()) + break; + trains.insert(i, &train); + + train.signal_name_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &TrainListDialog::train_name_changed), sigc::ref(train)))); +} - if(const GLtk::Part *part = style->get_part("children")) - { - const GLtk::Sides &margin = part->get_margin(); - address.set_position(margin.left, margin.bottom); - name.set_position(margin.left+30, margin.bottom); - } +void TrainListDialog::train_removed(Train &train) +{ + int i = trains.find(&train); + if(i>=0) + trains.remove(i); +} + +void TrainListDialog::train_name_changed(Train &train) +{ + trains.refresh(&train); +} + +bool TrainListDialog::save_state(DataFile::Statement &st) const +{ + st.keyword = "trainlistdialog"; + save_position(st.sub); + + return true; +} + + +TrainItem::TrainItem(ValueType train) +{ + add(*new GLtk::Label(train->get_protocol())); + add(*new GLtk::Label(lexical_cast(train->get_address()))); + add(*new GLtk::Label(train->get_name())); +} + + +DetectedLocoItem::DetectedLocoItem(ValueType loco) +{ + add(*new GLtk::Label(loco->protocol)); + add(*new GLtk::Label(lexical_cast(loco->address))); + add(*new GLtk::Label(loco->name)); }