Changeset 58

Timestamp:

26/01/07 22:18:07 (6 years ago)

Author:

guyru

Message:

calculate subtotal score

Location:

trunk/OpenYahtzee

Files:

• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (5 diffs)
• src/MainFrame.cpp (modified) (7 diffs)
• src/MainFrame.h (modified) (2 diffs)
• src/SettingsDialog.cpp (modified) (4 diffs)
• src/SettingsDialog.h (modified) (2 diffs)

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="17" >
+ <DocsAndViews NumberOfDocuments="16" >
   <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.h" >
    <View0 Type="Source" />
@@ -10 +10 @@
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="121" Type="Source" />
+   <View0 line="407" Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/ObjectsID.h" >
-   <View0 line="30" Type="Source" />
+   <View0 Type="Source" />
   </Doc3>
   <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.h" >
-   <View0 line="52" Type="Source" />
+   <View0 line="95" Type="Source" />
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.h" >
@@ -25 +25 @@
   </Doc6>
   <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.cpp" >
-   <View0 Type="Source" />
+   <View0 line="93" Type="Source" />
   </Doc7>
   <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.cpp" >
@@ -36 +36 @@
    <View0 Type="Source" />
   </Doc10>
-  <Doc11 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/Icon.h" >
-   <View0 Type="Source" />
+  <Doc11 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.h" >
+   <View0 line="39" Type="Source" />
   </Doc11>
-  <Doc12 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.h" >
+  <Doc12 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/wxDynamicBitmap.cpp" >
    <View0 Type="Source" />
   </Doc12>
-  <Doc13 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/wxDynamicBitmap.cpp" >
+  <Doc13 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.cpp" >
    <View0 Type="Source" />
   </Doc13>
-  <Doc14 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.cpp" >
+  <Doc14 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/wxDynamicBitmap.h" >
    <View0 Type="Source" />
   </Doc14>
-  <Doc15 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/wxDynamicBitmap.h" >
-   <View0 Type="Source" />
+  <Doc15 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.rc" >
+   <View0 line="0" Type="Source" />
   </Doc15>
-  <Doc16 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.rc" >
-   <View0 line="0" Type="Source" />
-  </Doc16>
  </DocsAndViews>
  <pluginList>
@@ -61 +58 @@
   <kdevbookmarks>
    <bookmarks>
-    <bookmark url="/home/guy/workspace/OpenYahztee/src/MainFrame.cpp" >
-     <mark line="596" />
+    <bookmark url="/home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" >
+     <mark line="108" />
     </bookmark>
    </bookmarks>

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -86 +86 @@
                 m_animate = true;
         }
+        if (m_settingsdb->GetKey("calculatesubtotal") == "Yes") {
+                m_calculatesubtotal = true;
+        } else if (m_settingsdb->GetKey("calculatesubtotal") == "No") {
+                m_calculatesubtotal = false;
+        } else {
+                m_settingsdb->SetKey("calculatesubtotal", "Yes");
+                m_calculatesubtotal = true;
+        }
 
         // END Database initialization
@@ -145 +153 @@
         wxSizer *lowersection = new wxStaticBoxSizer( new wxStaticBox( panel, wxID_ANY, wxT("Lower Section") ), wxVERTICAL);
         
-        wxFlexGridSizer* uppergrid = new wxFlexGridSizer(9, 2, 0, 0);
-        wxFlexGridSizer* lowergrid = new wxFlexGridSizer(9, 2, 0, 0);
+        wxFlexGridSizer* uppergrid = new wxFlexGridSizer(2, 0, 10);
+        wxFlexGridSizer* lowergrid = new wxFlexGridSizer(2, 0, 10);
 
         
@@ -343 +351 @@
         }
 
+        //recalculate the subtotals
+        CalculateSubTotal();
+
         (GetMenuBar()->FindItem(ID_UNDO))->Enable(false);
         //cancel the counting for the choice that was canceled
@@ -371 +382 @@
 
         data.animate = (m_settingsdb->GetKey("animate")=="Yes")?true:false;
+        data.subtotal = (m_settingsdb->GetKey("calculatesubtotal")=="Yes")?true:false;
         
         dialog->SetData(data);
@@ -391 +403 @@
                         m_settingsdb->SetKey("animate","No");
                         m_animate = false;
+                }
+                if (data.subtotal){
+                        m_settingsdb->SetKey("calculatesubtotal","Yes");
+                        m_calculatesubtotal = true;
+                        
+                } else {
+                        m_settingsdb->SetKey("calculatesubtotal","No");
+                        m_calculatesubtotal = false;
                 }
 
@@ -757 +777 @@
         ResetRolls();
 
+        CalculateSubTotal();
+
         //and disable the button
         FindWindow(id)->Enable(false);
@@ -762 +784 @@
         EnableUndo(id);
         EndofGame();
+}
+
+void MainFrame::CalculateSubTotal()
+{
+        if (!m_calculatesubtotal)
+                return;
+        long upperscore = 0;
+        long lowerscore = 0;
+        wxString tempstr;
+        long temp;
+
+
+        for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){
+                tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
+                tempstr.ToLong(&temp,10);
+                upperscore +=temp;
+        }
+        
+        tempstr.Printf(wxT("%i"),upperscore);
+        ((wxTextCtrl*) FindWindow(ID_UPPERSECTIONTOTAL)) -> SetValue(tempstr);
+
+        for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) {
+                tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
+                tempstr.ToLong(&temp,10);
+                lowerscore +=temp;
+        }
+        
+        tempstr.Printf(wxT("%i"),lowerscore);
+        ((wxTextCtrl*) FindWindow(ID_LOWERTOTAL)) -> SetValue(tempstr);
 }
 

trunk/OpenYahtzee/src/MainFrame.h

@@ -74 +74 @@
         inline void EnableUndo(int id);
         void PostScore(int id);
+        void CalculateSubTotal();
         void LaunchBrowser (wxString link);
 
@@ -93 +94 @@
 
         bool m_animate; //sets whether to animate the dice.
+        bool m_calculatesubtotal; //sets whether to calculate the subtotal after every score or not
 
 };

trunk/OpenYahtzee/src/SettingsDialog.cpp

@@ -38 +38 @@
         checkbox_reset = new wxCheckBox(this, ID_RESETHIGHSCORE, wxT("Reset high score table"));
         animate_checkbox = new wxCheckBox(this, ID_ANIMATECHECKBOX, wxT("Animate dice"));
+        subtotal_checkbox = new wxCheckBox(this, wxID_ANY, wxT("Calculate sub-total score for the upper and lower sections"));
+
 
         connect_event_table();
@@ -56 +58 @@
         wxBoxSizer* highscoresizer = new wxBoxSizer(wxHORIZONTAL);
 
-        highscoresizer->Add(label_1, 0, wxALL|wxADJUST_MINSIZE, 5);
-        highscoresizer->Add(spin_ctrl, 0, wxALL|wxADJUST_MINSIZE, 5);
+        highscoresizer->Add(label_1, 0, wxALL, 5);
+        highscoresizer->Add(spin_ctrl, 0, wxALL, 5);
         top_sizer->Add(highscoresizer, 0, 0, 0);
         top_sizer->Add(checkbox_reset, 0,wxALL, 5);
 
         top_sizer->Add(animate_checkbox,0,wxALL,5);
+        top_sizer->Add(subtotal_checkbox,0,wxALL,5);
 
         top_sizer->Add(CreateButtonSizer(wxOK|wxCANCEL), 1, wxBOTTOM, 10);
@@ -89 +92 @@
         spin_ctrl->SetValue(data.highscoresize);
         animate_checkbox->SetValue(data.animate);
+        subtotal_checkbox->SetValue(data.subtotal);
 }
 
@@ -97 +101 @@
         data.reset = checkbox_reset->GetValue();
         data.animate = animate_checkbox->GetValue();
+        data.subtotal = subtotal_checkbox->GetValue();
         return data;
 }

trunk/OpenYahtzee/src/SettingsDialog.h

@@ -38 +38 @@
         bool reset;
         bool animate;
+        bool subtotal;
 };
 
@@ -66 +67 @@
         
         wxCheckBox* animate_checkbox;
+        wxCheckBox* subtotal_checkbox;
         
 };