restore join count ratio summary in unique value map

Author: lixun910

GeneralWxUtils.cpp

@@ -821,3 +821,77 @@ void SummaryDialog::OnClose( wxCloseEvent& event )
     Destroy();
     event.Skip();
 }
+
+
+BEGIN_EVENT_TABLE( ValidationSummaryDialog, wxFrame)
+    EVT_CLOSE( ValidationSummaryDialog::OnClose )
+END_EVENT_TABLE()
+
+ValidationSummaryDialog::~ValidationSummaryDialog( )
+{
+    frames_manager->removeObserver(this);
+}
+
+ValidationSummaryDialog::ValidationSummaryDialog( wxWindow* parent, Project* project,
+                                           wxString showText,
+                                           wxWindowID id,
+                                           const wxString& caption,
+                                           const wxPoint& pos,
+                                           const wxSize& size, long style )
+:wxFrame(parent, id, caption, pos, size, style)
+{
+    wxLogMessage("Open ValidationSummaryDialog.");
+    SetParent(parent);
+    frames_manager = project->GetFramesManager();
+    
+    results = showText;
+    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
+    CreateControls();
+    Centre();
+    m_textbox->AppendText(results);
+    
+    frames_manager->registerObserver(this);
+}
+
+void ValidationSummaryDialog::update(FramesManager* o)
+{
+}
+
+void ValidationSummaryDialog::CreateControls()
+{
+    wxPanel *panel = new wxPanel(this, -1);
+    wxBoxSizer *vbox = new wxBoxSizer(wxVERTICAL);
+    m_textbox = new SimpleReportTextCtrl(panel, XRCID("ID_TEXTCTRL"), "", wxDefaultPosition, wxSize(620,560));
+    
+    if (GeneralWxUtils::isWindows()) {
+        wxFont font(8,wxFONTFAMILY_TELETYPE,wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
+        m_textbox->SetFont(font);
+    } else {
+        wxFont font(12,wxFONTFAMILY_TELETYPE,wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
+        m_textbox->SetFont(font);
+        
+    }
+    vbox->Add(m_textbox, 1, wxEXPAND|wxALL);
+    panel->SetSizer(vbox);
+    
+    Center();
+}
+
+void ValidationSummaryDialog::AddNewReport(const wxString report)
+{
+    results = report + results;
+    m_textbox->SetValue(results);
+}
+
+void ValidationSummaryDialog::SetReport(const wxString report)
+{
+    results = report;
+    m_textbox->SetValue(results);
+}
+
+void ValidationSummaryDialog::OnClose( wxCloseEvent& event )
+{
+    wxLogMessage("In ValidationSummaryDialog::OnClose()");
+    Destroy();
+    event.Skip();
+}

GeneralWxUtils.h

@@ -117,6 +117,37 @@ class SummaryDialog : public wxFrame, public FramesManagerObserver
     FramesManager* frames_manager;
 };
 
+class ValidationSummaryDialog : public wxFrame, public FramesManagerObserver
+{
+    DECLARE_EVENT_TABLE()
+
+public:
+    ValidationSummaryDialog() {}
+    ValidationSummaryDialog(wxWindow* parent, Project* project, wxString showText,
+        wxWindowID id = wxID_ANY,
+        const wxString& caption = _("Spatial Validation Summary"),
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxSize(680, 480),
+        long style = wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX);
+    virtual ~ValidationSummaryDialog();
+    
+    /** Implementation of FramesManagerObserver interface */
+    virtual void update(FramesManager* o);
+    
+    void CreateControls();
+    void OnClose(wxCloseEvent& event);
+    void AddNewReport(const wxString report);
+    void SetReport(const wxString report);
+    
+    SimpleReportTextCtrl* m_textbox;
+    wxString results;
+    
+private:
+    FramesManager* frames_manager;
+};
+
+
+
 class ScrolledDetailMsgDialog : public wxDialog
 {
 public:

GeoDa.cpp

@@ -5108,12 +5108,29 @@ void GdaFrame::ChangeToEqualIntervals(int num_cats)
 void GdaFrame::OnOpenUniqueValues(wxCommandEvent& event)
 {
     wxLogMessage("In GdaFrame::OnOpenUniqueValues()");
-    bool show_str_var = true;
-	VariableSettingsDlg dlg(project_p, VariableSettingsDlg::univariate,
-                            // default values
-                            false, false, _("Variable Settings"), "", "","","",false, false, false,
-                            show_str_var);
+    UniqueValuesSettingDlg dlg(project_p);
 	if (dlg.ShowModal() != wxID_OK) return;
+    
+    wxString joincountSummary = dlg.GetSummary();
+    if (!joincountSummary.IsEmpty()) {
+        FramesManager* fm = project_p->GetFramesManager();
+        std::list<FramesManagerObserver*> observers(fm->getCopyObservers());
+        std::list<FramesManagerObserver*>::iterator it;
+        for (it=observers.begin(); it != observers.end(); ++it) {
+            if (SummaryDialog* w = dynamic_cast<SummaryDialog*>(*it)) {
+                w->AddNewReport(joincountSummary);
+                w->m_textbox->SetSelection(0, 0);
+                w->Show(true);
+                w->Raise();
+                return;
+            }
+        }
+        
+        SummaryDialog* summaryDlg = new SummaryDialog(this, project_p, joincountSummary, wxID_ANY, _("Join Count Ratio Summary"));
+        summaryDlg->Show(true);
+        summaryDlg->m_textbox->SetSelection(0, 0);
+    }
+    
     MapFrame* nf = new MapFrame(GdaFrame::gda_frame, project_p,
                                 dlg.var_info, dlg.col_ids,
                                 CatClassification::unique_values,
@@ -5174,7 +5191,7 @@ void GdaFrame::OnOpenClusterValidation(wxCommandEvent& event)
         std::list<FramesManagerObserver*> observers(fm->getCopyObservers());
         std::list<FramesManagerObserver*>::iterator it;
         for (it=observers.begin(); it != observers.end(); ++it) {
-            if (SummaryDialog* w = dynamic_cast<SummaryDialog*>(*it)) {
+            if (ValidationSummaryDialog* w = dynamic_cast<ValidationSummaryDialog*>(*it)) {
                 w->AddNewReport(validationSummary);
                 w->m_textbox->SetSelection(0, 0);
                 w->Show(true);
@@ -5183,9 +5200,9 @@ void GdaFrame::OnOpenClusterValidation(wxCommandEvent& event)
             }
         }
 
-        SummaryDialog* summaryDlg = new SummaryDialog(this, project_p,
+        ValidationSummaryDialog* summaryDlg = new ValidationSummaryDialog(this, project_p,
                                                       validationSummary, wxID_ANY,
-                                                      _("Validation Summary"));
+                                                      _("Spatial Validation Summary"));
         summaryDlg->Show(true);
         summaryDlg->m_textbox->SetSelection(0, 0);
     }

version.h

@@ -2,10 +2,10 @@ namespace Gda {
 	const int version_major = 1;
 	const int version_minor = 18;
 	const int version_build = 0;
-	const int version_subbuild = 32;
+	const int version_subbuild = 34;
 	const int version_year = 2021;
 	const int version_month = 8;
-	const int version_day = 22;
+	const int version_day = 23;
 	const int version_night = 0;
 	const int version_type = 2; // 0: alpha, 1: beta, 2: release
 }