#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)
//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");
m_InfoView = new InfoView(m_LeftSplit);
//the widget stack
m_BattleSum = new BattleSum();
m_FleetViews->addWidget(m_BattleSum, 0);
- m_FleetView = new FleetViewBase();
+ m_FleetView = new FleetView();
m_FleetViews->addWidget(m_FleetView, 1);
//m_FleetViews->raiseWidget(0);
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");
}
{
m_NumberView->clear();
- map<QString, map<QString, map<QString, Fleet> > >& battles = m_doc->Battles();
+ const map<QString, map<QString, map<QString, Fleet> > >& battles = m_doc->Battles();
- for (map<QString, map<QString, map<QString, Fleet> > >::iterator i = battles.begin(); i != battles.end(); i++)
+ for (map<QString, map<QString, map<QString, Fleet> > >::const_iterator i = battles.begin(); i != battles.end(); ++i)
{
QString b = (*i).first;
QListViewItem* battle = new QListViewItem(m_NumberView, b);
- for (map<QString, map<QString, Fleet> >::iterator j = battles[b].begin(); j != battles[b].end(); j++)
+ for (map<QString, map<QString, Fleet> >::const_iterator j = i->second.begin(); j != i->second.end(); ++j)
{
QString g = (*j).first;
QListViewItem* group = new QListViewItem(battle, g);
+ int groupShips = 0;
- for (map<QString, Fleet>::iterator k = battles[b][g].begin(); k != battles[b][g].end(); k++)
- {
- (void) new QListViewItem(group, (*k).first);
+ for (map<QString, Fleet>::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));
}
}
}
}
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);
{
if (lvi->parent()->text(0) == tr("Friendly"))
{
- m_FleetView->slotAttacker(false);
- m_FleetView->slotHomePlanet(false);
+// m_FleetView->slotAttacker(false);
+// m_FleetView->slotHomePlanet(false);
if (lvi->text(0) == tr("Home Planet"))
{
- m_FleetView->slotHomePlanet(true);
+// m_FleetView->slotHomePlanet(true);
}
}
else
{
- m_FleetView->slotAttacker(true);
- m_FleetView->slotHomePlanet(false);
+// m_FleetView->slotAttacker(true);
+// m_FleetView->slotHomePlanet(false);
}
m_FleetViews->raiseWidget(1);