From cc4dc2076eecb1f80bf6473a9dc529c96c15a877 Mon Sep 17 00:00:00 2001 From: Xun Li Date: Sun, 22 May 2016 10:39:47 -0700 Subject: [PATCH 1/3] #432 windows update doesn't work The downloaded and backuped files should be cleaned before upgrade. --- DialogTools/AutoUpdateDlg.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DialogTools/AutoUpdateDlg.cpp b/DialogTools/AutoUpdateDlg.cpp index 7a3cb6021..ad3a7c707 100644 --- 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++); From d3e9b7fdb3c4f093284bcf275e2a2893eb151004 Mon Sep 17 00:00:00 2001 From: Xun Li Date: Sun, 22 May 2016 11:07:50 -0700 Subject: [PATCH 2/3] #431 shift-click selection doesn't work for sorted values in table --- DataViewer/TableBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DataViewer/TableBase.cpp b/DataViewer/TableBase.cpp index d657d40ab..34116860f 100644 --- 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 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; } } From 72591eb31c94bd744c9b7c5bc9c1123a6d523179 Mon Sep 17 00:00:00 2001 From: Xun Li Date: Sun, 22 May 2016 20:58:30 -0700 Subject: [PATCH 3/3] update version; change avg chart size --- GdaConst.cpp | 2 +- version.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GdaConst.cpp b/GdaConst.cpp index 0d2bd41bc..ec483dfee 100644 --- 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 index 724c9c5e6..d0e80cd51 100644 --- 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 }