From 184d931e6eca2d24b5f2688c27109f62a8e2e4d3 Mon Sep 17 00:00:00 2001
From: Aleksey Lobanov <alekseylobanov1@gmail.com>
Date: Sat, 6 Jun 2015 13:24:37 +0300
Subject: [PATCH] Added dictionary caching

---
 CrossGen.workspace   |  4 ++--
 wxCrossGen/main.cpp  | 18 ++++++++++++------
 wxCrossGen/wxgui.hpp |  4 +++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/CrossGen.workspace b/CrossGen.workspace
index 1d039f5..0a4b414 100644
--- a/CrossGen.workspace
+++ b/CrossGen.workspace
@@ -2,10 +2,10 @@
 <CodeLite_Workspace Name="CrossGen" Database="">
   <Project Name="wxCrossGen" Path="wxCrossGen/wxCrossGen.project" Active="Yes"/>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="yes">
+    <WorkspaceConfiguration Name="Debug" Selected="no">
       <Project Name="wxCrossGen" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="no">
+    <WorkspaceConfiguration Name="Release" Selected="yes">
       <Project Name="wxCrossGen" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
diff --git a/wxCrossGen/main.cpp b/wxCrossGen/main.cpp
index 448dc65..8213882 100644
--- a/wxCrossGen/main.cpp
+++ b/wxCrossGen/main.cpp
@@ -26,6 +26,8 @@ MainFrame::MainFrame(wxWindow* parent, int id, const wxString& title, const wxPo
 
     set_properties();
     do_layout();
+    
+    _isDictLoaded = false;
 }
 
 
@@ -162,9 +164,13 @@ void MainFrame::SetGridImage(GridType &grid, size_t w) {
 
 void MainFrame::OnbtnGenerateClick(wxCommandEvent &event) {
     event.Skip();
-    DictType dict;
+    
+    if ( !_isDictLoaded ) {
+        readDict(wxT("big_cross_ru.txt"), _dict);
+        _isDictLoaded = true;
+    }
+    
     std::vector<wxString> words_out;
-    readDict(wxT("big_cross_ru.txt"), dict);
     GridType grid;
     if (tPath->GetValue() == wxEmptyString){
         wxMessageBox( wxT("Не указана путь к сетке"), wxT("Инфо"), wxICON_INFORMATION);
@@ -172,7 +178,7 @@ void MainFrame::OnbtnGenerateClick(wxCommandEvent &event) {
     }
     readGrid(tPath->GetValue(), grid);
     try{
-        generateCross(grid,dict,words_out);
+        generateCross(grid,_dict,words_out);
         
         _words.clear();
         _words = words_out;
@@ -187,7 +193,7 @@ void MainFrame::OnbtnGenerateClick(wxCommandEvent &event) {
         for (size_t i = 0; i < words_out.size(); ++i){
             if (winfos.at(i).direct == false)
                 tOutput->AppendText(wxString::Format(wxT("%d. "), winfos.at(i).ind) 
-                  + dict[words_out.at(i)] +wxT("\n"));
+                  + _dict[words_out.at(i)] +wxT("\n"));
         }
         
         tOutput->AppendText(wxT("По горизонтали:\n"));
@@ -195,7 +201,7 @@ void MainFrame::OnbtnGenerateClick(wxCommandEvent &event) {
         for (size_t i = 0; i < words_out.size(); ++i){
             if (winfos.at(i).direct == true)
                 tOutput->AppendText(wxString::Format(wxT("%d. "), winfos.at(i).ind) 
-                  + dict[words_out.at(i)]+wxT("\n"));
+                  + _dict[words_out.at(i)]+wxT("\n"));
         }
         if (winfos.size() == 0) 
             throw 42;
@@ -205,7 +211,7 @@ void MainFrame::OnbtnGenerateClick(wxCommandEvent &event) {
     catch (...){
         tOutput->Clear();
         this->Refresh();
-        wxMessageBox( wxT("Не могу создать кроссворд"), wxT("Ошибка"), wxICON_ERROR);
+        wxMessageBox( wxT("Не могу создать кроссворд"), wxT("Ошибка"), wxICON_ERROR );
     }
 }
 
diff --git a/wxCrossGen/wxgui.hpp b/wxCrossGen/wxgui.hpp
index bf507e6..f6fcb04 100644
--- a/wxCrossGen/wxgui.hpp
+++ b/wxCrossGen/wxgui.hpp
@@ -45,6 +45,9 @@ private:
     // end wxGlade
 
 protected:
+    std::vector<wxString> _words;
+    DictType _dict;
+    bool _isDictLoaded;
     // begin wxGlade: MainFrame::attributes
     wxStaticText* label_1;
     wxTextCtrl* tPath;
@@ -52,7 +55,6 @@ protected:
     wxTextCtrl* tOutput;
     wxButton* btnGenerate;
     wxStaticBitmap* bPreview;
-    std::vector<wxString> _words;
     // end wxGlade
 
     DECLARE_EVENT_TABLE();