X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fbsview.cpp;h=c050952c291c942b45b733f80af97bb1ab70f297;hp=5ae770305468a68475a8c3b62b03ad02c4eed9d0;hb=c2dd8856c3d97667953a0b73403b5e5cade5ce9b;hpb=ba016135c4c232c79cb35c92f239579ca3d84df3 diff --git a/bs/bsview.cpp b/bs/bsview.cpp index 5ae7703..c050952 100644 --- a/bs/bsview.cpp +++ b/bs/bsview.cpp @@ -35,10 +35,13 @@ using namespace std; #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_bMoreDocChanges = false; connect(doc, SIGNAL(documentChanged()), this, SLOT(slotDocumentChanged())); m_doc = doc; @@ -52,6 +55,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"); @@ -61,6 +65,11 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent) m_InfoView = new InfoView(m_LeftSplit); + connect(m_InfoView,SIGNAL(add()),SLOT(slotInfoNew())); + connect(m_InfoView,SIGNAL(apply()),SLOT(slotInfoApply())); + connect(m_InfoView,SIGNAL(cancel()),SLOT(slotInfoCancel())); + connect(m_InfoView,SIGNAL(remove()),SLOT(slotInfoRemove())); + vector raceNames; const map >& races = Fleet::Races(); for(map >::const_iterator i = races.begin(); i != races.end(); ++i) @@ -83,12 +92,14 @@ 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 *))); + 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*))); } BSView::~BSView() @@ -112,43 +123,56 @@ void BSView::addBattle(QString name) */ void BSView::slotDocumentChanged() { + if (m_bMoreDocChanges) + return; + m_NumberView->clear(); - const map > >& battles = m_doc->battles(); + const BattleList& battles = m_doc->battles(); + + vector battlenames; - for (map > >::const_iterator i = battles.begin(); i != battles.end(); ++i) + for (BattleList::const_iterator i = battles.begin(); i != battles.end(); ++i) { QString b = (*i).first; + battlenames.push_back(i->first); QListViewItem* battle = new QListViewItem(m_NumberView, b); battle->setOpen(m_TreeExpanded[b]["--"]); - for (map >::const_iterator j = i->second.begin(); j != i->second.end(); ++j) + for (map >::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::const_iterator k = j->second.begin(); k != j->second.end(); ++k) + for (map::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; + //if(k->first == tr("Home Planet")) + (void) new QListViewItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(k->second->ETA()), QString("%1").arg(score)); + /*else + (void) new QCheckListItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(k->second->ETA()), QString("%1").arg(score), QCheckListItem::CheckBox);*/ + } group->setText(1, QString("%1").arg(groupShips)); + group->setText(3, QString("%1").arg(groupScore)); } } + m_InfoView->setBattles(battlenames); + updateInfoView(); + updateFleetView(); } ////////////////////////////////////////////////////////////////////////////// // void BSView::slotFleetSelection(QListViewItem *lvi) { - //cout << lvi->parent()->text(2).toLocal8bit() << endl; -// for (int i = 0; i < 5; i++) -// cout << lvi->text(i).local8Bit() << endl; - if (lvi->parent() == '\0') { @@ -156,7 +180,6 @@ void BSView::slotFleetSelection(QListViewItem *lvi) } else if (lvi->parent()->parent() == '\0') { -// m_FleetView->slotHomePlanet(false); if (lvi->text(0) == tr("Friendly")) { // m_FleetView->slotAttacker(false); @@ -170,44 +193,12 @@ void BSView::slotFleetSelection(QListViewItem *lvi) } else { - bool home = false; - bool friendly = 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; - } - } - 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_GenericFleetView->viewFleet(fl, friendly); - m_FleetViews->raiseWidget(2); + m_sFleet = lvi->text(0); + m_sGroup = lvi->parent()->text(0); + m_sBattle = lvi->parent()->parent()->text(0); - } - else - { - if (fl.Race() == m_FleetView->fleet().Race() && - m_FleetView->isHome() == home) - { - m_FleetView->viewFleet(fl, friendly); - } - else - { - m_FleetViews->removeWidget(m_FleetView); - m_FleetView = new FleetView(fl, friendly, home); - m_FleetViews->addWidget(m_FleetView, 1); - } - m_FleetViews->raiseWidget(1); - } + updateInfoView(); + updateFleetView(); } } @@ -239,3 +230,178 @@ void BSView::slotItemCollapsed(QListViewItem *lvi) } } +////////////////////////////////////////////////////////////////////////// +// +void BSView::slotFleetChanged(const Fleet* fleet) +{ + m_doc->changeFleet(m_sBattle, m_sGroup, m_sFleet, 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(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()); + + m_doc->newFleet(m_sBattle, m_sGroup, m_sFleet, fl); +} + +////////////////////////////////////////////////////////////////////////// +// +void BSView::slotInfoCancel() +{ + updateInfoView(); +} + +////////////////////////////////////////////////////////////////////////// +// +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 = battle; + m_sGroup = group; + m_sFleet = fleet; + + fl->setETA(m_InfoView->eta()); + fl->setName(m_sFleet.latin1()); + fl->setRace(m_InfoView->race().latin1()); + + m_doc->newFleet(m_sBattle, m_sGroup, m_sFleet, fl); + +} + +////////////////////////////////////////////////////////////////////////// +// +void BSView::slotInfoRemove() +{ + m_doc->removeFleet(m_sBattle, m_sGroup, m_sFleet); + m_sFleet = ""; +} + +////////////////////////////////////////////////////////////////////////// +// +void BSView::updateInfoView() +{ + const Fleet* fl = m_doc->specificFleet(m_sBattle, m_sGroup, m_sFleet); + + if(!fl) + { + m_InfoView->setFleetName(""); + m_InfoView->setEta(0); + m_InfoView->enableNameChange(true); + m_InfoView->enableRemove(false); + return; + } + m_InfoView->setGroup(m_sGroup); + m_InfoView->setBattle(m_sBattle); + +/* 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); + } + 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); +} + +////////////////////////////////////////////////////////////////////////// +// +void BSView::updateFleetView() +{ + bool friendly = false; + bool home = false; + + const Fleet* fl = m_doc->specificFleet(m_sBattle, m_sGroup, m_sFleet); + + if (!fl) + { + m_FleetViews->raiseWidget(2); + return; + } + + if ( m_sGroup == tr("Friendly")) + { + friendly = true; + if(m_sFleet == tr("Home Planet")) + home=true; + } + if (fl->race() == tr("Generic").latin1()) + { + m_GenericFleetView->viewFleet(fl, friendly); + m_FleetViews->raiseWidget(2); + + } + else + { + if (fl->race() == m_FleetView->fleet()->race() && + m_FleetView->isHome() == home) + { + m_FleetView->viewFleet(fl, friendly); + } + else + { + m_FleetViews->removeWidget(m_FleetView); + delete m_FleetView; + m_FleetView = new FleetView(fl, friendly); + connect(m_FleetView, SIGNAL(fleetChanged(const Fleet*)), SLOT(slotFleetChanged(const Fleet*))); + m_FleetViews->addWidget(m_FleetView, 1); + } + m_FleetViews->raiseWidget(1); + } +}