X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fbsview.cpp;h=2dfe3f37f45263381c262a25b30c8dfc1f8169ca;hp=5ae770305468a68475a8c3b62b03ad02c4eed9d0;hb=5940cfda3be2c7b4ecbd64c814948b29139177c0;hpb=7a187d329c61f264cbafc28654c6b8bb1e3b87a1

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index 5ae7703..2dfe3f3 100644
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -52,6 +52,7 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 	m_NumberView->addColumn("Name");
 	m_NumberView->addColumn("Number");
 	m_NumberView->addColumn("ETA");
+	m_NumberView->addColumn("Score");
 	//addBattle("NO BATTLES");
 
 	
@@ -83,9 +84,9 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 	//the widget stack
 	m_BattleSum = new BattleSum();
 	m_FleetViews->addWidget(m_BattleSum, 0);
-	m_FleetView = new FleetView(fl1, true, true);
+	m_FleetView = new FleetView(&fl1, true);
 	m_FleetViews->addWidget(m_FleetView, 1);
-	m_GenericFleetView = new FleetView(fl2, true, false);
+	m_GenericFleetView = new FleetView(&fl2, true);
 	m_FleetViews->addWidget(m_GenericFleetView, 2);
 	//m_FleetViews->raiseWidget(0);
 	connect(m_NumberView, SIGNAL(selectionChanged(QListViewItem *)), SLOT(slotFleetSelection(QListViewItem *))); 
@@ -114,29 +115,33 @@ void BSView::slotDocumentChanged()
 {
 	m_NumberView->clear();
 	
-	const map<QString, map<QString, map<QString, Fleet> > >& battles = m_doc->battles();	
+	const BattleList& battles = m_doc->battles();	
 
-	for (map<QString, map<QString, map<QString, Fleet> > >::const_iterator i = battles.begin(); i != battles.end(); ++i)
+	for (BattleList::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<QString, map<QString, Fleet> >::const_iterator j = i->second.begin(); j != i->second.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;
+			unsigned groupScore = 0;
 			group->setOpen(m_TreeExpanded[b][g]);
 
-			for (map<QString, Fleet>::const_iterator k = j->second.begin(); k != j->second.end(); ++k)
+			for (map<QString, Fleet*>::const_iterator k = j->second.begin(); k != j->second.end(); ++k)
 			{	
-				int ships = k->second.NumberOfShips();
+				int ships = k->second->numberOfShips();
+				unsigned score = k->second->score();
 				groupShips += ships;
-				(void) new QListViewItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(k->second.ETA()));
+				groupScore += score;
+				(void) new QListViewItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(k->second->ETA()), QString("%1").arg(score));
 			}
 			group->setText(1, QString("%1").arg(groupShips));
+			group->setText(3, QString("%1").arg(groupScore));
 		}
 	}
 }
@@ -170,24 +175,22 @@ void BSView::slotFleetSelection(QListViewItem *lvi)
 	}
 	else
 	{
-		bool home = false;
 		bool friendly = false;
+		bool home	= false;
 		QString fleet = lvi->text(0);
 		QString group = lvi->parent()->text(0);
 		QString battle = lvi->parent()->parent()->text(0);
 		if ( group == tr("Friendly"))
 		{
 			friendly = true;
-			if ( fleet == tr("Home Planet"))
-			{
-				home = true;
-			}
+			if(fleet == tr("Home Planet"))
+				home=true;
 		}
-		Fleet fl = m_doc->specificFleet(battle, group, fleet);
-		m_InfoView->setRace(fl.Race().c_str());
+		const 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_InfoView->setEta(fl->ETA());
+		if (fl->race() == tr("Generic").latin1())
 		{
 			m_GenericFleetView->viewFleet(fl, friendly);
 			m_FleetViews->raiseWidget(2);
@@ -195,7 +198,7 @@ void BSView::slotFleetSelection(QListViewItem *lvi)
 		}
 		else 
 		{
-			if (fl.Race() == m_FleetView->fleet().Race() &&
+			if (fl->race() == m_FleetView->fleet()->race() &&
 			m_FleetView->isHome() == home)
 			{
 				m_FleetView->viewFleet(fl, friendly);
@@ -203,7 +206,7 @@ void BSView::slotFleetSelection(QListViewItem *lvi)
 			else
 			{
 				m_FleetViews->removeWidget(m_FleetView);
-				m_FleetView = new FleetView(fl, friendly, home);
+				m_FleetView = new FleetView(fl, friendly);
 				m_FleetViews->addWidget(m_FleetView, 1);
 			}
 			m_FleetViews->raiseWidget(1);