Merge pull request #433 from lixun910/master

1.8.7.5
GeoDaCenter · May 23, 2016 · b2260a9 · b2260a9
2 parents d08cc94 + 531d0a4
commit b2260a9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/DataViewer/TableBase.cpp b/DataViewer/TableBase.cpp
@@ -190,12 +190,12 @@ void TableBase::FromGridSelectRowRange(int first_row, int last_row)
 	for (int i=0; i<hl_size; ++i) {
 		if (i < first_row || i > last_row) {
             if (hs[row_order[i]])  {
-                hs[i] = false;
+                hs[row_order[i]] = false;
                 selection_changed = true;
             }
 		} else {
             if (!hs[row_order[i]])  {
-                hs[i] = true;
+                hs[row_order[i]] = true;
                 selection_changed = true;
             }
 		}

diff --git a/DialogTools/AutoUpdateDlg.cpp b/DialogTools/AutoUpdateDlg.cpp
@@ -375,6 +375,8 @@ void AutoUpdateDlg::OnOkClick( wxCommandEvent& event )
                 wxString backup_file_name = file_name + ".backup";
                 int size = wxAtoi(file_size);
 
+				wxRemoveFile(backup_file_name);
+                wxRemoveFile(update_file_name);
 
                 if (DownloadUrl(file_url.mb_str(), update_file_name.mb_str())){
                     // check file size
@@ -386,8 +388,11 @@ void AutoUpdateDlg::OnOkClick( wxCommandEvent& event )
 
                     // replace the old file
                     wxRenameFile(file_name, backup_file_name);
-                    wxRename(update_file_name, file_name);
+                    wxRenameFile(update_file_name, file_name);
 
+					wxRemoveFile(backup_file_name);
+					wxRemoveFile(update_file_name);
+
                     success = true;
                 }
                 progressDlg.Update(current_job++);

diff --git a/GdaConst.cpp b/GdaConst.cpp
@@ -303,7 +303,7 @@ const wxColour GdaConst::pcp_line_color(128, 0, 64); // dark cherry
 const wxColour GdaConst::pcp_horiz_line_color(0, 98, 0); // dark green
 
 // Averages Chart
-const wxSize GdaConst::line_chart_default_size(760, 580);
+const wxSize GdaConst::line_chart_default_size(800, 620);
 
 // colors defined in init()
 wxColour GdaConst::ln_cht_clr_regimes_hl;

diff --git a/version.h b/version.h
@@ -2,10 +2,10 @@ namespace Gda {
 	const int version_major = 1;
 	const int version_minor = 8;
 	const int version_build = 7;
-	const int version_subbuild = 3;
+	const int version_subbuild = 5;
 	const int version_year = 2016;
 	const int version_month = 5;
-	const int version_day = 20;
+	const int version_day = 22;
 	const int version_night = 0;
 	const int version_type = 1; // 0: alpha, 1: beta, 2: release
 }