Changeset 28

Timestamp:

19/12/06 21:32:15 (6 years ago)

Author:

guyru

Message:

fixed init of database file

Location:

trunk/OpenYahtzee

Files:

• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (3 diffs)
• src/HighScoreTableDB.cpp (modified) (1 diff)
• src/HighScoreTableDB.h (modified) (1 diff)
• src/MainFrame.cpp (modified) (2 diffs)

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="9" >
+ <DocsAndViews NumberOfDocuments="11" >
   <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.h" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.cpp" >
@@ -10 +10 @@
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 Type="Source" />
+   <View0 line="64" Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/ObjectsID.h" >
@@ -16 +16 @@
   </Doc3>
   <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.h" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.h" >
-   <View0 line="26" Type="Source" />
+   <View0 Type="Source" />
   </Doc5>
   <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.cpp" >
+   <View0 line="72" Type="Source" />
+  </Doc6>
+  <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.cpp" >
    <View0 line="0" Type="Source" />
-  </Doc6>
-  <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.cpp" >
-   <View0 line="32" Type="Source" />
   </Doc7>
-  <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.cpp" >
-   <View0 line="29" Type="Source" />
+  <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.cpp" >
+   <View0 line="0" Type="Source" />
   </Doc8>
+  <Doc9 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.h" >
+   <View0 line="49" Type="Source" />
+  </Doc9>
+  <Doc10 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.cpp" >
+   <View0 line="0" Type="Source" />
+  </Doc10>
  </DocsAndViews>
  <pluginList>

trunk/OpenYahtzee/src/HighScoreTableDB.cpp

@@ -68 +68 @@
 }
 
+int HighScoreTableDB::GetSize()
+{
+        return m_size;
+}
 void HighScoreTableDB::SetSize(int size)
 {

trunk/OpenYahtzee/src/HighScoreTableDB.h

@@ -48 +48 @@
         int SendHighScore(std::string name, std::string date, int score);
         void SetSize(int size);
+        int GetSize();
 
         std::list<std::string> GetHighScoreTable();

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -46 +46 @@
 #include "six.xpm"
 
+//default values
 #define SPACE_SIZE 1
+#define DEF_HIGHSCORESIZE 16
 
 MainFrame::MainFrame(const wxString& title, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE)
         : wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, size, style)
 {
+
+        std::ostringstream sstr;
+
         m_settingsdb = new SettingsDB(); //Get the settings database connection
         m_highscoredb = new HighScoreTableDB();
-        int highscoresize = atoi((m_settingsdb->GetKey("highscoresize")).c_str());
-        m_highscoredb->SetSize( (highscoresize>0)?highscoresize:20 );
+
+
+        if (m_settingsdb->GetKey("highscoresize") == "") { //check if we need to create a newdatabase
+                m_highscoredb->SetSize(DEF_HIGHSCORESIZE);
+                sstr<<DEF_HIGHSCORESIZE<<std::flush;
+                m_settingsdb->SetKey("highscoresize", sstr.str());
+        } else {
+                int highscoresize = atoi((m_settingsdb->GetKey("highscoresize")).c_str());
+                //m_highscoredb->SetSize((highscoresize>0)?highscoresize:DEF_HIGHSCORESIZE);
+                m_highscoredb->SetSize(highscoresize);
+        }
 
         bitmap_dices[0] = new wxBitmap(one_xpm);
@@ -297 +311 @@
         std::ostringstream sstr;
         
-        data.highscoresize = atoi((m_settingsdb->GetKey("highscoresize")).c_str());
+        data.highscoresize = m_highscoredb->GetSize();
         
         dialog->SetData(data);