Merge pull request #2240 from lixun910/v1.18

V1.16.0.12

Author: lixun910

BuildTools/windows/GeoDa.vcxproj

@@ -106,7 +106,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>C:\Intel\OpenCL\sdk\include;C:\OSGeo4W\include;temp\boost_1_57_0;temp\wxWidgets-3.1.0\include;temp\wxWidgets-3.1.0\lib\vc_dll\mswud;temp\json_spirit_v4.08;temp\eigen3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Intel\OpenCL\sdk\include;C:\OSGeo4W\include;temp\boost_1_57_0;temp\wxWidgets-3.1.0\include;temp\wxWidgets-3.1.0\lib\vc_dll\mswud;temp\json_spirit_v4.08;temp\eigen3;temp\spectra\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_WINDOWS;__WXMSW__;__WXDEBUG__;WXUSINGDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -243,7 +243,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\Intel\OpenCL\sdk\include;C:\OSGeo4W\include;temp\boost_1_57_0;temp\wxWidgets-3.1.0\include;temp\wxWidgets-3.1.0\lib\vc_dll\mswu;temp\json_spirit_v4.08;temp\eigen3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Intel\OpenCL\sdk\include;C:\OSGeo4W\include;temp\boost_1_57_0;temp\wxWidgets-3.1.0\include;temp\wxWidgets-3.1.0\lib\vc_dll\mswu;temp\json_spirit_v4.08;temp\eigen3;temp\spectra\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;__WXMSW__;__NO_VC_CRTDBG__;WXUSINGDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>

BuildTools/windows/build.bat

@@ -1109,7 +1109,7 @@ if %GDA_BUILD% == BUILD_32 (
     %MSBUILD_EXE% GeoDa.vs2017.sln /t:GeoDa /property:Configuration="Debug2017" /p:Platform="x64"
   ) else (
     %MSBUILD_EXE% GeoDa.vs2010.sln /t:GeoDa /property:Configuration="Release" /p:Platform="x64"
-    %MSBUILD_EXE% GeoDa.vs2010.sln /t:GeoDa /property:Configuration="Debug" /p:Platform="x64"
+    REM %MSBUILD_EXE% GeoDa.vs2010.sln /t:GeoDa /property:Configuration="Debug" /p:Platform="x64"
   )
 )
 set CHK_LIB=%BUILD_HOME%\Release\GeoDa.lib

DataViewer/DataViewerDeleteColDlg.cpp

@@ -106,7 +106,7 @@ void DataViewerDeleteColDlg::OnDelete( wxCommandEvent& ev )
         int idx = selections[i];
         wxString nm = name_to_nm[m_field->GetString(idx)];
         int col = table_int->FindColId(nm);
-        wxLogMessage(nm);
+        wxLogMessage("%s", nm);
 
     	try{
     		table_int->DeleteCol(col);

DataViewer/DataViewerEditFieldPropertiesDlg.cpp

@@ -362,7 +362,7 @@ void DataViewerEditFieldPropertiesDlg::OnCellChanging( wxGridEvent& ev )
 	wxString msg;
 	msg << "changing row " << row << ", col " << col << " from ";
 	msg << cur_str << " to " << new_str;
-    wxLogMessage(msg);
+    wxLogMessage("%s", msg);
 
 	GdaConst::FieldType type = GdaConst::unknown_type;
 	wxString type_str = field_grid->GetCellValue(row, COL_T);

DialogTools/AZPDlg.cpp

@@ -375,7 +375,6 @@ void AZPDlg::OnClickClose(wxCommandEvent& event )
 
     event.Skip();
     EndDialog(wxID_CANCEL);
-    Destroy();
 }
 
 void AZPDlg::OnClose(wxCloseEvent& ev)

DialogTools/AbstractClusterDlg.cpp

@@ -249,7 +249,8 @@ void AbstractClusterDlg::AddSimpleInputCtrls(wxPanel *panel, wxBoxSizer* vbox,
 }
 
 void AbstractClusterDlg::AddInputCtrls(wxPanel *panel, wxBoxSizer* vbox,
-                                       bool show_auto_button, bool show_spatial_weights,
+                                       bool show_auto_button, bool integer_only,
+                                       bool show_spatial_weights,
                                        bool single_variable, bool add_centroids)
 {
     wxString ttl = single_variable ? _("Select a Variable") : _("Select Variables");
@@ -260,7 +261,7 @@ void AbstractClusterDlg::AddInputCtrls(wxPanel *panel, wxBoxSizer* vbox,
 
     combo_var = new wxListBox(panel, wxID_ANY, wxDefaultPosition,
                               wxSize(250,250), 0, NULL, style);
-    InitVariableCombobox(combo_var, add_centroids);
+    InitVariableCombobox(combo_var, integer_only, add_centroids);
 
     m_use_centroids = new wxCheckBox(panel, wxID_ANY, _("Use geometric centroids"));
     auto_btn = new wxButton(panel, wxID_OK, _("Auto Weighting"));

DialogTools/AbstractClusterDlg.h

@@ -136,6 +136,7 @@ class AbstractClusterDlg : public wxDialog, public FramesManagerObserver,
     // -- functions
     virtual void AddInputCtrls(wxPanel *panel, wxBoxSizer* vbox,
                                bool show_auto_button = false,
+                               bool integer_only = false,
                                bool show_spatial_weights = true,
                                bool single_variable = false,
                                bool add_centroids = true);

DialogTools/AddIdVariable.cpp

@@ -92,7 +92,7 @@ void AddIdVariable::OnOkClick( wxCommandEvent& event )
 		return;
 	}
 
-    wxLogMessage(wxString::Format("Try to insert unique id (integer, %s) column in table.", new_id_var_name));
+    wxLogMessage("%s", wxString::Format("Try to insert unique id (integer, %s) column in table.", new_id_var_name));
 
     int col_insert_pos = 0;
 	int add_pos = table_int->InsertCol(GdaConst::long64_type,new_id_var_name, col_insert_pos);

DialogTools/CatClassifDlg.cpp

@@ -949,8 +949,8 @@ CatClassifState* CatClassifPanel::PromptNew(const CatClassifDef& ccd,
     }
 
     wxLogMessage("In CatClassifPanel::PromptNew");
-    wxLogMessage(_("suggested title:") + suggested_title);
-    wxLogMessage(_("field name:") + field_name);
+    wxLogMessage("%s", _("suggested title:") + suggested_title);
+    wxLogMessage("%s", _("field name:") + field_name);
 
     if (success || (prompt_title_dlg == false && !new_title.IsEmpty()) ) {
         cc_data = ccd;
@@ -1205,7 +1205,7 @@ void CatClassifPanel::OnAssocVarChoice(wxCommandEvent& ev)
 
 	wxString cur_fc_str = assoc_var_choice->GetStringSelection();
 
-    wxLogMessage(cur_fc_str);
+    wxLogMessage("%s", cur_fc_str);
 
 	bool is_tm_var = table_int->IsColTimeVariant(cur_fc_str);
     if (is_tm_var)

DialogTools/ConnectDatasourceDlg.cpp

@@ -773,7 +773,7 @@ void ConnectDatasourceDlg::OnOkClick( wxCommandEvent& event )
             GdaFrame* gda_frame = GdaFrame::GetGdaFrame();
             if (gda_frame) {
                 gda_frame->OpenProject(ds_file_path.GetFullPath());
-                wxLogMessage(_("Open project file:") + ds_file_path.GetFullPath());
+                wxLogMessage("%s", _("Open project file:") + ds_file_path.GetFullPath());
                 try {
                     Project* project = gda_frame->GetProject();
                     wxString layer_name;
@@ -847,8 +847,8 @@ void ConnectDatasourceDlg::OnOkClick( wxCommandEvent& event )
         if (layer_name.IsEmpty())
             layer_name = layername;
 
-        wxLogMessage(_("Open Datasource:") + datasource->ToString());
-        wxLogMessage(_("Open Layer:") + layername);
+        wxLogMessage("%s", _("Open Datasource:") + datasource->ToString());
+        wxLogMessage("%s", _("Open Layer:") + layername);
 
         SaveRecentDataSource(datasource, layer_name);