X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fbsview.cpp;h=b5e25b0a2c88fe8d21c46ea1faa9af4c7973625d;hb=935b6de2d1428854d76acc20b1727eb4a30f9273;hp=005c4438eaba1d03be40b5a56610ac460ddaa284;hpb=3ae63f013b2ac281d17acec43bc054a132861d35;p=hbs.git diff --git a/bs/bsview.cpp b/bs/bsview.cpp index 005c443..b5e25b0 100644 --- a/bs/bsview.cpp +++ b/bs/bsview.cpp @@ -28,11 +28,13 @@ using namespace std; //QT includes #include #include +#include +#include #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 +42,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())); @@ -47,7 +53,16 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent) m_doc = doc; m_LeftSplit = new QSplitter(QSplitter::Vertical, this); - m_RightSplit = new QSplitter(QSplitter::Vertical, this); + + m_Pages = new QTabWidget(this); + + m_RightSplit = new QSplitter(QSplitter::Vertical); + m_Pages->addTab(m_RightSplit, tr("Units")); + + m_Report = new QTextEdit(); + m_Report->setReadOnly(true); + m_Pages->addTab(m_Report, tr("Report")); + //setting up the listview m_NumberView = new QListView(m_LeftSplit); @@ -79,7 +94,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 +111,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() @@ -166,6 +185,7 @@ void BSView::slotDocumentChanged() } m_InfoView->setBattles(battlenames); updateInfoView(); + setCurrentListViewItem(); updateFleetView(); } @@ -177,9 +197,28 @@ void BSView::slotFleetSelection(QListViewItem *lvi) if (lvi->parent() == '\0') { m_FleetViews->raiseWidget(0); + m_sFleet = QString::null; + m_sGroup = QString::null; + QString temp = lvi->text(0); + + if (temp != m_sBattle) + { + m_sBattle = temp; + slotGenerateReport(); + } } else if (lvi->parent()->parent() == '\0') { + m_sFleet = QString::null; + m_sGroup = lvi->text(0); + QString temp = lvi->parent()->text(0); + + if (temp != m_sBattle) + { + m_sBattle = temp; + slotGenerateReport(); + } + if (lvi->text(0) == tr("Friendly")) { // m_FleetView->slotAttacker(false); @@ -195,7 +234,13 @@ void BSView::slotFleetSelection(QListViewItem *lvi) { m_sFleet = lvi->text(0); m_sGroup = lvi->parent()->text(0); - m_sBattle = lvi->parent()->parent()->text(0); + QString temp = lvi->parent()->parent()->text(0); + + if (temp != m_sBattle) + { + m_sBattle = temp; + slotGenerateReport(); + } updateInfoView(); updateFleetView(); @@ -271,6 +316,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 +356,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 +405,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 +448,137 @@ 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; +} + + +////////////////////////////////////////////////////////////////////////// +// +void BSView::slotGenerateReport() +{ + const Fleet *fl = m_doc->specificFleet(m_sBattle, "Friendly", "Home Planet"); + + const Planet* pl = dynamic_cast(fl); + if (pl) + { + cerr << "generating....." << endl; + ReportList report = pl->report(); + QString t; + + t.append("\n"); + + + for (ReportList::iterator i = report.begin(); i != report.end(); ++i) + { + t.append(QString("Tick number: %0\n").arg(i->first)); + t.append("
    \n"); + for(map > > >::iterator j = i->second.begin(); j != i->second.end(); ++j) + { + t.append(QString("
  • Now handling initiative: %0\n").arg(j->first)); + t.append("
      \n"); + + for(map > >::iterator k = j->second.begin(); k != j->second.end(); ++k) + { + for(map >::iterator l = k->second.begin(); l != k->second.end(); ++l) + { + t.append(QString("
    • %0 %1 %2 killing/blocking at: \n").arg(l->second["000"]).arg(k->first.c_str()).arg(l->first.c_str())); + t.append("
        \n"); + + for(map::iterator m = l->second.begin(); m != l->second.end(); ++m) + { + if (m->first != "000") + t.append(QString("
      • %0 %1
      • ").arg(m->second).arg(m->first.c_str())); + } + + t.append("
      \n"); + t.append("
    • \n"); + } + } + t.append("
    \n"); + t.append("
  • \n"); + } + t.append("
\n"); + + t.append("
\n"); + } + t.append("
\n"); + //cerr << t.latin1(); + //m_Report->clear(); + m_Report->setText(t); + + } + //m_Report->append("test\n"); +} + +////////////////////////////////////////////////////////////////////////// +// +void BSView::setCurrentListViewItem() +{ + QListViewItemIterator i(m_NumberView); + while ( i.current() != 0) + { + QListViewItem* lvi = i.current(); + if (lvi->parent() == '\0') + { + if (m_sFleet.isNull() && m_sGroup.isNull() && m_sBattle == lvi->text(0)) + { + m_NumberView->setCurrentItem(lvi); + return; + } + } + else if (lvi->parent()->parent() == '\0') + { + if (m_sFleet.isNull() && m_sGroup == lvi->text(0) && m_sBattle == lvi->parent()->text(0)) + { + m_NumberView->setCurrentItem(lvi); + return; + } + } + else + { + if (m_sFleet == lvi->text(0) && m_sGroup == lvi->parent()->text(0) && m_sBattle == lvi->parent()->parent()->text(0)) + { + m_NumberView->setCurrentItem(lvi); + return; + } + } + ++i; + } + m_NumberView->setCurrentItem(m_NumberView->firstChild()); +}