X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fbsview.cpp;h=df3f558d97de534a8a5d37512581b9c1de3c2a4f;hp=f5e74bc82324a8f93440976d6b9bddad7cc388b9;hb=7311d423f454c500dbc60dd822007da3981b0d56;hpb=6a5c3106cf6dc30d4624df99473e18df2b1d50ed

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index f5e74bc..df3f558 100644
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -32,13 +32,20 @@ using namespace std;
 #include "battlesum.h"
 #include "scanview.h"
 #include "ui/infoview.h"
-#include "tickview.h"
+//#include "tickview.h"
 #include "fleetview.h"
 #include "fleet.h"
+#include "planet.h"
 
 BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 {
   /** connect doc with the view*/
+
+	m_iMaxTick = 0;
+	m_iMinTick = 0;
+	m_iResultMode = 0;
+	
+	m_bMoreDocChanges = false;
 	connect(doc, SIGNAL(documentChanged()), this, SLOT(slotDocumentChanged()));
 	
 	m_doc = doc;
@@ -76,9 +83,9 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 	m_InfoView->setRaces(raceNames);
 	
 	//the right side
-	m_TickView = new TickView(m_RightSplit);
+	//m_TickView = new TickView(m_RightSplit);
 	m_FleetViews = new QWidgetStack(m_RightSplit);
-	m_ScanView = new ScanView(m_RightSplit);
+	//m_ScanView = new ScanView(m_RightSplit);
 	
 	Fleet fl1;
 	//fl1.setRace(tr("Terran").latin1());
@@ -93,6 +100,9 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 	m_FleetViews->addWidget(m_FleetView, 1);
 	m_GenericFleetView = new FleetView(&fl2, true);
 	m_FleetViews->addWidget(m_GenericFleetView, 2);
+	m_FleetView->slotViewTickRange(m_iMinTick, m_iMaxTick);
+	m_GenericFleetView->slotViewTickRange(m_iMinTick, m_iMaxTick);
+
 	//m_FleetViews->raiseWidget(0);
 	connect(m_NumberView, SIGNAL(selectionChanged(QListViewItem *)), SLOT(slotFleetSelection(QListViewItem *)));
 	connect(m_FleetView, SIGNAL(fleetChanged(const Fleet*)), SLOT(slotFleetChanged(const Fleet*)));
@@ -120,6 +130,9 @@ void BSView::addBattle(QString name)
  */
 void BSView::slotDocumentChanged()
 {
+	if (m_bMoreDocChanges)
+		return;
+
 	m_NumberView->clear();
 	
 	const BattleList& battles = m_doc->battles();	
@@ -176,11 +189,11 @@ void BSView::slotFleetSelection(QListViewItem *lvi)
 	{
 		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(2);
 		
@@ -235,6 +248,39 @@ void BSView::slotFleetChanged(const Fleet* fleet)
 //
 void BSView::slotInfoApply()
 {
+	QString battle = m_InfoView->battle();
+	QString group  = m_InfoView->group();
+	QString fleet  = m_InfoView->fleetName();
+
+
+	
+	const Fleet* old = m_doc->specificFleet(m_sBattle, m_sGroup, m_sFleet);
+
+	const Planet* oldpl = dynamic_cast<const Planet*>(old);
+
+	Fleet* fl;
+	if(oldpl)
+		fl = new Planet(*oldpl);
+	else
+		fl = new Fleet(*old);
+
+	
+		
+	m_bMoreDocChanges = true;
+	m_doc->removeFleet(m_sBattle, m_sGroup, m_sFleet);
+	m_bMoreDocChanges = false;
+
+	m_sBattle = battle;
+	m_sGroup = group;
+	m_sFleet = fleet;
+
+
+	fl->setETA(m_InfoView->eta());
+	fl->setName(m_sFleet.latin1());
+	fl->setRace(m_InfoView->race().latin1());
+	fl->setStays(m_InfoView->stays());
+	
+	m_doc->newFleet(m_sBattle, m_sGroup, m_sFleet, fl);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -248,15 +294,31 @@ void BSView::slotInfoCancel()
 //
 void BSView::slotInfoNew()
 {
+
+	QString battle = m_InfoView->battle();
+	QString group  = m_InfoView->group();
+	QString fleet  = m_InfoView->fleetName();
+
+	const Fleet* fl1 = m_doc->specificFleet(battle, group, fleet);
+	if (fl1)
+	{
+		//fleet does already exist, do not overwrite.
+		//Need something else here....
+		return;
+	}
+
+	
+	
 	Fleet* fl = new Fleet();
 
-	m_sBattle = m_InfoView->battle();
-	m_sGroup = m_InfoView->group();
-	m_sFleet = m_InfoView->fleetName();
+	m_sBattle = battle;
+	m_sGroup = group;
+	m_sFleet = fleet;
 
 	fl->setETA(m_InfoView->eta());
 	fl->setName(m_sFleet.latin1());
 	fl->setRace(m_InfoView->race().latin1());
+	fl->setStays(m_InfoView->stays());
 
 	m_doc->newFleet(m_sBattle, m_sGroup, m_sFleet, fl);
 
@@ -266,6 +328,8 @@ void BSView::slotInfoNew()
 //
 void BSView::slotInfoRemove()
 {
+	m_doc->removeFleet(m_sBattle, m_sGroup, m_sFleet);
+	m_sFleet = "";
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -276,32 +340,34 @@ void BSView::updateInfoView()
 
 	if(!fl)
 	{
-		m_InfoView->setRace("");
 		m_InfoView->setFleetName("");
 		m_InfoView->setEta(0);
-		m_InfoView->setGroup("");
-		m_InfoView->setBattle("");		
 		m_InfoView->enableNameChange(true);
 		m_InfoView->enableRemove(false);
 		return;
 	}
+	m_InfoView->setGroup(m_sGroup);
+	m_InfoView->setBattle(m_sBattle);
 
-	if(m_sFleet == tr("Home Planet"))
+/*	NO LONGER NEEDED SINCE IT'S INTEGRATED IN THE InfoView CLASS
+ *	if(m_sFleet == tr("Home Planet") && m_sGroup == tr("Friendly"))
 	{
-		m_InfoView->enableNameChange(false);
-		m_InfoView->enableRemove(false);
+		//m_InfoView->enableNameChange(false);
+		//m_InfoView->enableRemove(false);
 	}
 	else
 	{
 		m_InfoView->enableNameChange(true);
 		m_InfoView->enableRemove(true);
 	}
+*/
 
 	m_InfoView->setRace(fl->race().c_str());
 	m_InfoView->setFleetName(m_sFleet);
 	m_InfoView->setEta(fl->ETA());
 	m_InfoView->setGroup(m_sGroup);
 	m_InfoView->setBattle(m_sBattle);
+	m_InfoView->setStays(fl->stays());
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -344,8 +410,32 @@ void BSView::updateFleetView()
 			delete m_FleetView;
 			m_FleetView = new FleetView(fl, friendly);
 			connect(m_FleetView, SIGNAL(fleetChanged(const Fleet*)), SLOT(slotFleetChanged(const Fleet*)));
+			m_FleetView->slotViewTickRange(m_iMinTick, m_iMaxTick);
+			m_FleetView->slotSetResultMode(m_iResultMode);
 			m_FleetViews->addWidget(m_FleetView, 1);
 		}
+		m_FleetViews->raiseWidget(2);
 		m_FleetViews->raiseWidget(1);
 	}
 }
+
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::slotTickChanged(int min, int max)
+{
+	m_FleetView->slotViewTickRange(min, max);
+	m_GenericFleetView->slotViewTickRange(min, max);
+
+	m_iMinTick = min;
+	m_iMaxTick = max;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::slotResultModeChanged( int i)
+{
+	m_FleetView->slotSetResultMode(i);
+	m_GenericFleetView->slotSetResultMode(i);
+	
+	m_iResultMode = i;
+}