From 6a5c3106cf6dc30d4624df99473e18df2b1d50ed Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Sun, 7 Apr 2002 18:28:38 +0000 Subject: [PATCH] added the possibility to add new fleets.. --- bs/bsdoc.cpp | 7 ++ bs/bsdoc.h | 2 + bs/bsview.cpp | 172 ++++++++++++++++++++++++++++++++++------------ bs/bsview.h | 11 ++- bs/fleet.cpp | 4 +- bs/ui/infoview.ui | 18 ++++- 6 files changed, 165 insertions(+), 49 deletions(-) diff --git a/bs/bsdoc.cpp b/bs/bsdoc.cpp index 07b02fc..70cfd89 100644 --- a/bs/bsdoc.cpp +++ b/bs/bsdoc.cpp @@ -125,4 +125,11 @@ void BSDoc::changeFleet(QString battle, QString group, QString fleet, const Flee } +////////////////////////////////////////////////////////////////////////// +// +void BSDoc::newFleet(QString battle, QString group, QString fleet, Fleet* fl) +{ + m_Battles[battle][group][fleet] = fl; + emit documentChanged(); +} diff --git a/bs/bsdoc.h b/bs/bsdoc.h index 1477409..6d6375a 100644 --- a/bs/bsdoc.h +++ b/bs/bsdoc.h @@ -71,6 +71,8 @@ class BSDoc : public QObject void changeFleet(QString battle, QString group, QString fleet, const Fleet* fl); + void newFleet(QString battle, QString group, QString fleet, Fleet* fl); + signals: void documentChanged(); diff --git a/bs/bsview.cpp b/bs/bsview.cpp index 6f0bf31..f5e74bc 100644 --- a/bs/bsview.cpp +++ b/bs/bsview.cpp @@ -62,6 +62,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) @@ -154,16 +159,14 @@ void BSView::slotDocumentChanged() } } 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') { @@ -171,7 +174,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); @@ -185,50 +187,12 @@ void BSView::slotFleetSelection(QListViewItem *lvi) } else { - bool friendly = false; - bool home = false; m_sFleet = lvi->text(0); m_sGroup = lvi->parent()->text(0); m_sBattle = lvi->parent()->parent()->text(0); - if ( m_sGroup == tr("Friendly")) - { - friendly = true; - if(m_sFleet == tr("Home Planet")) - home=true; - } - - const Fleet* fl = m_doc->specificFleet(m_sBattle, m_sGroup, m_sFleet); - - 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); - - 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); - } + updateInfoView(); + updateFleetView(); } } @@ -267,3 +231,121 @@ void BSView::slotFleetChanged(const Fleet* fleet) m_doc->changeFleet(m_sBattle, m_sGroup, m_sFleet, fleet); } +////////////////////////////////////////////////////////////////////////// +// +void BSView::slotInfoApply() +{ +} + +////////////////////////////////////////////////////////////////////////// +// +void BSView::slotInfoCancel() +{ + updateInfoView(); +} + +////////////////////////////////////////////////////////////////////////// +// +void BSView::slotInfoNew() +{ + Fleet* fl = new Fleet(); + + m_sBattle = m_InfoView->battle(); + m_sGroup = m_InfoView->group(); + m_sFleet = m_InfoView->fleetName(); + + 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() +{ +} + +////////////////////////////////////////////////////////////////////////// +// +void BSView::updateInfoView() +{ + const Fleet* fl = m_doc->specificFleet(m_sBattle, m_sGroup, m_sFleet); + + 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; + } + + if(m_sFleet == tr("Home Planet")) + { + 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); + } +} diff --git a/bs/bsview.h b/bs/bsview.h index 789a6d4..8707e0b 100644 --- a/bs/bsview.h +++ b/bs/bsview.h @@ -50,13 +50,22 @@ class BSView : public QSplitter BSView(QWidget *parent=0, BSDoc* doc=0); ~BSView(); - void addBattle(QString name); + void addBattle(QString name); protected slots: void slotDocumentChanged(); void slotFleetChanged(const Fleet*); + void slotInfoApply(); + void slotInfoCancel(); + void slotInfoNew(); + void slotInfoRemove(); protected: + + void updateInfoView(); + void updateFleetView(); + + BattleSum *m_BattleSum; QListView *m_NumberView; QSplitter *m_RightSplit; diff --git a/bs/fleet.cpp b/bs/fleet.cpp index 00fb66b..ee22ae7 100644 --- a/bs/fleet.cpp +++ b/bs/fleet.cpp @@ -170,7 +170,9 @@ unsigned Fleet::score(int tick = 0) const for (FleetList::const_iterator i = m_Fleet.begin(); i != m_Fleet.end(); ++i) { - tot_score += i->second[tick] * s_Units[i->first].totRes() / 10; + if (i->second.size() >= tick) + break; + tot_score += i->second[tick] * s_Units[i->first].totRes() / 10; } return tot_score; diff --git a/bs/ui/infoview.ui b/bs/ui/infoview.ui index b34ef8a..411daeb 100644 --- a/bs/ui/infoview.ui +++ b/bs/ui/infoview.ui @@ -257,6 +257,12 @@ InfoView RemoveButton_clicked() + + ApplyButton + clicked() + InfoView + ApplyButton_clicked() + NameLine @@ -278,8 +284,8 @@ add() - init() - destroy() + init() + destroy() setRaces( std::vector<QString> races ) setEta( int eta ) setFleetName( QString name ) @@ -291,6 +297,14 @@ setGroup( QString s ) setBattles( std::vector<QString> battles ) setBattle( QString s ) + enableNameChange( bool b ) + enableRemove( bool b ) + ApplyButton_clicked() + battle() + eta() + fleetName() + group() + race() -- 2.39.2