solved an evil bug in Fleet::distributeLossesGains and some other stuff

[hbs.git] / bs / fleetview.cpp

diff --git a/bs/fleetview.cpp b/bs/fleetview.cpp
index d40cfc53018bff1c4205e202e24b486e04a9d03b..5cbed5377caa4797c794f8a3bba2f167779298fe 100644 (file)
--- a/bs/fleetview.cpp
+++ b/bs/fleetview.cpp
@@ -43,6 +43,7 @@ FleetView::FleetView(const Fleet* fleet, bool friendly, QWidget *parent, const c
                m_bHome = false;
        }
        
+       m_Fleet->printFleet();
        m_bFriendly = friendly;
 
        //m_ChangesMapper = new QSignalMapper(this);
@@ -55,7 +56,7 @@ FleetView::FleetView(const Fleet* fleet, bool friendly, QWidget *parent, const c
        m_UnitsLayout = new QGridLayout(m_MainLayout, rows, 6);
        buildUnitTable();
        //QSpacerItem* space = new QSpacerItem(1, 1);
-       fillTable();
+       
 
        m_MainLayout->addStretch(10);
 
@@ -63,10 +64,11 @@ FleetView::FleetView(const Fleet* fleet, bool friendly, QWidget *parent, const c
        {
                m_RoidsEditView = new RoidsEditView(this);
                m_MainLayout->addWidget(m_RoidsEditView);
+               connect(m_RoidsEditView, SIGNAL(changed(const QString&, int)), SLOT(slotRoidsChanged(const QString&, int)));
        }
        m_ResourceView = new ResourceView(this);
        m_MainLayout->addWidget(m_ResourceView);
-
+  fillTable();
 }
 
 FleetView::~FleetView(){
@@ -89,6 +91,7 @@ void FleetView::viewFleet(const Fleet* fleet, bool friendly)
        {
                m_Fleet = new Fleet(*fleet);
        }
+       m_Fleet->printFleet();
        fillTable();
 }
 
@@ -189,6 +192,47 @@ void FleetView::fillTable()
        {
                m_UnitsEdit[(*i)]->setText(QString("%1").arg(m_Fleet->fleet(i->latin1(), 0)));
        }
+       Planet* pl;
+       if ((pl = dynamic_cast<Planet*>(m_Fleet)) && m_bHome)
+       {
+               m_RoidsEditView->setValue(tr("score"),pl->planetScore());
+               m_RoidsEditView->setValue(tr("metal"),pl->roids(tr("metal").latin1()));
+               m_RoidsEditView->setValue(tr("crystal"),pl->roids(tr("crystal").latin1()));
+               m_RoidsEditView->setValue(tr("eonium"),pl->roids(tr("eonium").latin1()));
+               m_RoidsEditView->setValue(tr("uninit"),pl->roids(tr("uninit").latin1()));
+       }
 }
 
+/////////////////////////////////////////////////////////////////////
+//
+void FleetView::slotRoidsChanged(const QString& type, int value)
+{
+       Planet* pl;
+       if ((pl = dynamic_cast<Planet*>(m_Fleet)))
+       {
+               if (type == tr("score"))
+                       pl->setPlanetScore(value);
+               else
+               {
+                       pl->setRoids(type.latin1(), value);
+               }
+               emit fleetChanged(pl);
+       }
+}
+
+/////////////////////////////////////////////////////////////////////
+//
+void FleetView::slotViewTickRange(int min = -1, int max = -1)
+{
+       if (min > -1)
+               m_iMinTick = min;
+       if (max > -1)
+               m_iMaxTick = max;
        
+       for(vector<QString>::iterator i = m_Names.begin(); i != m_Names.end(); ++i)
+       {
+               int before = m_Fleet->fleet(i->latin1(), m_iMinTick);
+               int after = m_Fleet->fleet(i->latin1(), m_iMaxTick);
+               m_UnitsLostSurvivedView[(*i)]->setText(QString("%1").arg(after - before));
+       }
+}