some changes

diff --git a/bs/planet.cpp b/bs/planet.cpp
index 4fa69786a009e426ae8dd666724965d3aa89465c..e0cf514e0c45d7b6054afbaae1c3b3ebc99342a9 100644 (file)
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -17,6 +17,8 @@
 
 #include "planet.h"
 
+using namespace std;
+
 Planet::Planet()
 {
        m_sRace = "Planet";
@@ -42,22 +44,35 @@ void Planet::setPlanetScore(unsigned i)
 
 //////////////////////////////////////////////////////////////////////////
 //
-int roids(std::string type, int tick = 0) const
+int Planet::roids(std::string type, int tick = 0) const
 {
-       ticks = m_Roids[type].size();
+       // const... I would like [] as for const types: int ticks = m_Roids[type].size();
+       
+       vector<int>const* roids;
+       for (RoidList::const_iterator i = m_Roids.begin(); i != m_Roids.end(); ++i)
+       {
+               if (i->first == type)
+               {
+                       roids = &i->second;
+                       break;
+               }
+       }
+
+       int ticks = roids->size();
+
        if( ticks == 0)
                return 0;
        if (ticks < tick)
-               return m_Roids[type][ticks];
-       return m_Roids[type][tick];
+               return roids->at(ticks);
+       return roids->at(tick);
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
-void setRoids(std::string type, int number)
+void Planet::setRoids(std::string type, int number)
 {
        if (m_Roids[type].size() == 0)
-               m_Roids.push_back(number);
+               m_Roids[type].push_back(number);
        m_Roids[type][0] = number;
 }
 

diff --git a/bs/planet.h b/bs/planet.h
index 5e2b13a40f6e6fc53a3427fa0d55b73ef188b643..1fd9109c2cf9e8ba936ce1f12630ec64cad8ae6d 100644 (file)
--- a/bs/planet.h
+++ b/bs/planet.h
@@ -20,7 +20,7 @@
 
 #include "fleet.h"
 
-typedef std::map<std::string, int> RoidList;
+typedef std::map<std::string, std::vector<int> > RoidList;
 
 /**This class is the implementation of a planet.
  *

diff --git a/bs/ui/roidseditview.ui b/bs/ui/roidseditview.ui
index cc4857985b12bba5f217833e24857ebfc88ee42b..1df54f159524d50c0a8c8fb88c887158a08f2a03 100644 (file)
--- a/bs/ui/roidseditview.ui
+++ b/bs/ui/roidseditview.ui
@@ -165,6 +165,38 @@
         </widget>
     </grid>
 </widget>
+<connections>
+    <connection>
+        <sender>MetalEdit</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>RoidsEditView</receiver>
+        <slot>slotValueChanged(const QString&amp;)</slot>
+    </connection>
+    <connection>
+        <sender>CrystalEdit</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>RoidsEditView</receiver>
+        <slot>slotValueChanged(const QString&amp;)</slot>
+    </connection>
+    <connection>
+        <sender>EoniumEdit</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>RoidsEditView</receiver>
+        <slot>slotValueChanged(const QString&amp;)</slot>
+    </connection>
+    <connection>
+        <sender>UninitEdit</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>RoidsEditView</receiver>
+        <slot>slotValueChanged(const QString&amp;)</slot>
+    </connection>
+    <connection>
+        <sender>ScoreEdit</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>RoidsEditView</receiver>
+        <slot>slotValueChanged(const QString&amp;)</slot>
+    </connection>
+</connections>
 <tabstops>
     <tabstop>MetalEdit</tabstop>
     <tabstop>CrystalEdit</tabstop>
@@ -177,6 +209,11 @@
 <signals>
     <signal>changed(const QString&amp;, int)</signal>
 </signals>
+<slots>
+    <slot>init()</slot>
+    <slot>setValue( const QString &amp; s, unsigned value )</slot>
+    <slot access="protected">slotValueChanged( const QString &amp; s )</slot>
+</slots>
 <pixmapinproject/>
 <layoutdefaults spacing="0" margin="2"/>
 </UI>