X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fbsview.cpp;h=5ae770305468a68475a8c3b62b03ad02c4eed9d0;hb=ba016135c4c232c79cb35c92f239579ca3d84df3;hp=9af428df1fed72e90c88ebc4599c2e6521c7de81;hpb=e07f49323a1936c90605d06f6f63e4c39b4c4aca;p=hbs.git diff --git a/bs/bsview.cpp b/bs/bsview.cpp index 9af428d..5ae7703 100644 --- a/bs/bsview.cpp +++ b/bs/bsview.cpp @@ -33,13 +33,13 @@ using namespace std; #include "scanview.h" #include "ui/infoview.h" #include "tickview.h" -#include "ui/fleetviewbase.h" +#include "fleetview.h" #include "fleet.h" BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent) { /** connect doc with the view*/ - connect(doc, SIGNAL(documentChanged()), this, SLOT(slotDocumentChanged())); + connect(doc, SIGNAL(documentChanged()), this, SLOT(slotDocumentChanged())); m_doc = doc; @@ -48,24 +48,45 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent) //setting up the listview m_NumberView = new QListView(m_LeftSplit); + m_NumberView->setRootIsDecorated(true); m_NumberView->addColumn("Name"); m_NumberView->addColumn("Number"); m_NumberView->addColumn("ETA"); - addBattle("test"); + //addBattle("NO BATTLES"); + + + connect(m_NumberView, SIGNAL(expanded(QListViewItem*)), SLOT(slotItemExpanded(QListViewItem*))); + connect(m_NumberView, SIGNAL(collapsed(QListViewItem*)), SLOT(slotItemCollapsed(QListViewItem*))); + m_InfoView = new InfoView(m_LeftSplit); + + vector raceNames; + const map >& races = Fleet::Races(); + for(map >::const_iterator i = races.begin(); i != races.end(); ++i) + { + raceNames.push_back(i->first.c_str()); + } + m_InfoView->setRaces(raceNames); //the right side m_TickView = new TickView(m_RightSplit); m_FleetViews = new QWidgetStack(m_RightSplit); m_ScanView = new ScanView(m_RightSplit); + Fleet fl1; + //fl1.setRace(tr("Terran").latin1()); + fl1.setRace("Terran"); + Fleet fl2; + fl2.setRace(tr("Generic").latin1()); + //the widget stack m_BattleSum = new BattleSum(); m_FleetViews->addWidget(m_BattleSum, 0); - m_FleetView = new FleetViewBase(); + m_FleetView = new FleetView(fl1, true, true); m_FleetViews->addWidget(m_FleetView, 1); - + m_GenericFleetView = new FleetView(fl2, true, false); + m_FleetViews->addWidget(m_GenericFleetView, 2); //m_FleetViews->raiseWidget(0); connect(m_NumberView, SIGNAL(selectionChanged(QListViewItem *)), SLOT(slotFleetSelection(QListViewItem *))); } @@ -79,8 +100,8 @@ BSView::~BSView() void BSView::addBattle(QString name) { QListViewItem* battle = new QListViewItem(m_NumberView, name); - QListViewItem* def = new QListViewItem(battle, tr("Defenders"),"", "","1"); - (void) new QListViewItem(battle, tr("Attackers"),"", "","2"); + QListViewItem* def = new QListViewItem(battle, tr("Friendly"),"", "","1"); + (void) new QListViewItem(battle, tr("Hostile"),"", "","2"); (void) new QListViewItem(def, tr("Home Planet"), "","","1"); } @@ -93,22 +114,29 @@ void BSView::slotDocumentChanged() { m_NumberView->clear(); - map > >& battles = m_doc->Battles(); + const map > >& battles = m_doc->battles(); - for (map > >::iterator i = battles.begin(); i != battles.end(); i++) + for (map > >::const_iterator i = battles.begin(); i != battles.end(); ++i) { QString b = (*i).first; QListViewItem* battle = new QListViewItem(m_NumberView, b); + battle->setOpen(m_TreeExpanded[b]["--"]); + - for (map >::iterator j = battles[b].begin(); j != battles[b].end(); j++) + for (map >::const_iterator j = i->second.begin(); j != i->second.end(); ++j) { QString g = (*j).first; QListViewItem* group = new QListViewItem(battle, g); - - for (map::iterator k = battles[b][g].begin(); k != battles[b][g].end(); k++) - { - (void) new QListViewItem(group, (*k).first); + int groupShips = 0; + group->setOpen(m_TreeExpanded[b][g]); + + for (map::const_iterator k = j->second.begin(); k != j->second.end(); ++k) + { + int ships = k->second.NumberOfShips(); + groupShips += ships; + (void) new QListViewItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(k->second.ETA())); } + group->setText(1, QString("%1").arg(groupShips)); } } } @@ -128,37 +156,86 @@ void BSView::slotFleetSelection(QListViewItem *lvi) } else if (lvi->parent()->parent() == '\0') { - m_FleetView->slotHomePlanet(false); +// m_FleetView->slotHomePlanet(false); if (lvi->text(0) == tr("Friendly")) { - m_FleetView->slotAttacker(false); +// m_FleetView->slotAttacker(false); } else { - m_FleetView->slotAttacker(true); +// m_FleetView->slotAttacker(true); } - m_FleetViews->raiseWidget(1); + m_FleetViews->raiseWidget(2); } else { - if (lvi->parent()->text(0) == tr("Friendly")) + bool home = false; + bool friendly = false; + QString fleet = lvi->text(0); + QString group = lvi->parent()->text(0); + QString battle = lvi->parent()->parent()->text(0); + if ( group == tr("Friendly")) { - m_FleetView->slotAttacker(false); - m_FleetView->slotHomePlanet(false); - if (lvi->text(0) == tr("Home Planet")) + friendly = true; + if ( fleet == tr("Home Planet")) { - m_FleetView->slotHomePlanet(true); + home = true; } } - else + Fleet fl = m_doc->specificFleet(battle, group, fleet); + m_InfoView->setRace(fl.Race().c_str()); + m_InfoView->setFleetName(fleet); + m_InfoView->setEta(fl.ETA()); + if (fl.Race() == tr("Generic").latin1()) { - m_FleetView->slotAttacker(true); - m_FleetView->slotHomePlanet(false); + m_GenericFleetView->viewFleet(fl, friendly); + m_FleetViews->raiseWidget(2); + + } + else + { + if (fl.Race() == m_FleetView->fleet().Race() && + m_FleetView->isHome() == home) + { + m_FleetView->viewFleet(fl, friendly); + } + else + { + m_FleetViews->removeWidget(m_FleetView); + m_FleetView = new FleetView(fl, friendly, home); + m_FleetViews->addWidget(m_FleetView, 1); + } + m_FleetViews->raiseWidget(1); } - m_FleetViews->raiseWidget(1); - } +} - +////////////////////////////////////////////////////////////////////////// +// +void BSView::slotItemExpanded(QListViewItem *lvi) +{ + if (lvi->parent() == '\0') + { + m_TreeExpanded[lvi->text(0)]["--"] = true; + } + else if (lvi->parent()->parent() == '\0') + { + m_TreeExpanded[lvi->parent()->text(0)][lvi->text(0)] = true; + } +} + +////////////////////////////////////////////////////////////////////////// +// +void BSView::slotItemCollapsed(QListViewItem *lvi) +{ + if (lvi->parent() == '\0') + { + m_TreeExpanded[lvi->text(0)]["--"] = false; + } + else if (lvi->parent()->parent() == '\0') + { + m_TreeExpanded[lvi->parent()->text(0)][lvi->text(0)] = false; + } } +