X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fbsview.cpp;h=7adc6db02ad18be3c2fbc297375a1480d57abb72;hb=refs%2Ftags%2FHBS_0_3_1;hp=c050952c291c942b45b733f80af97bb1ab70f297;hpb=c2dd8856c3d97667953a0b73403b5e5cade5ce9b;p=hbs.git

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index c050952..7adc6db 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,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());
@@ -96,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*)));
@@ -182,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);
 		
@@ -400,8 +407,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;
+}