X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fbsview.cpp;h=9212fb166c4295cad4be300ebe67186993f4a51b;hb=e0be1e6e8f7a246acf49e1f315c8d5bc5a65bfa3;hp=005c4438eaba1d03be40b5a56610ac460ddaa284;hpb=3ae63f013b2ac281d17acec43bc054a132861d35;p=hbs.git

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index 005c443..9212fb1 100644
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -32,7 +32,7 @@ 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"
@@ -40,6 +40,10 @@ using namespace std;
 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()));
@@ -79,7 +83,7 @@ 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);
 	
@@ -96,10 +100,14 @@ 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*)));
 	connect(m_GenericFleetView, SIGNAL(fleetChanged(const Fleet*)), SLOT(slotFleetChanged(const Fleet*)));
+	connect(m_ScanView, SIGNAL(scanUsed(int,QString, int)), SLOT(slotUseScan(int, QString, int)));
 }
 
 BSView::~BSView()
@@ -271,6 +279,7 @@ void BSView::slotInfoApply()
 	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);
 }
@@ -310,6 +319,7 @@ void BSView::slotInfoNew()
 	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);
 
@@ -358,6 +368,7 @@ void BSView::updateInfoView()
 	m_InfoView->setEta(fl->ETA());
 	m_InfoView->setGroup(m_sGroup);
 	m_InfoView->setBattle(m_sBattle);
+	m_InfoView->setStays(fl->stays());
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -400,8 +411,41 @@ 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;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::slotUseScan(int action, QString text, int fleets)
+{
+	cerr << "Action: " << action << endl;
+	cerr << "Text: " << text.latin1() << endl;
+	cerr << "Fleets: " << fleets << endl;
+}