From 07a8a03bcc06a0b8022479f7090388fa933ce275 Mon Sep 17 00:00:00 2001 From: akeddy Date: Tue, 16 Feb 2016 12:37:09 -0400 Subject: [PATCH] preparation for release 2.4.2 fixing the RCA bug --- bin/images/Logo.png | Bin 9569 -> 9813 bytes bin/images/Logo2.4.1.png | Bin 0 -> 9569 bytes bin/release_notes.html | 9 +- plugins/RCA/RCA.fbp | 608 ++++----------------------------- plugins/RCA/RCALayout.py | 44 ++- src/core/App.cpp | 2 +- src/core/App.hpp | 5 +- win32/InnoInstaller/GenGIS.iss | 8 +- 8 files changed, 106 insertions(+), 570 deletions(-) create mode 100644 bin/images/Logo2.4.1.png diff --git a/bin/images/Logo.png b/bin/images/Logo.png index 22b5d97dbb316b7fd0bd5dc8bf4f0d34246fded7..0bfadffd84a0235a82926d5c5a646a43362a1d1c 100644 GIT binary patch literal 9813 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 CaAq_B literal 9569 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 CrazyEye_Run_32x32 -

Copyright © 2009, 2010, 2011, 2012, 2013, 2014, 2015 Robert Beiko (beiko@cs.dal.ca)

+

Copyright © 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Robert Beiko (beiko@cs.dal.ca)

An application for merging geographic data with information about biological sequences collected from the environment.

New Features

See kiwi.cs.dal.ca/GenGIS/Revision_History for all bug fixes.

+

Version 2.4.2 (February 16, 2016)

+ +
    +
  • Fixes a bug in the RCA plugin for some Windows systems.<\li> + +
+

Version 2.4.1 (August 27, 2015)

    diff --git a/plugins/RCA/RCA.fbp b/plugins/RCA/RCA.fbp index be2e80c9..ac686f38 100644 --- a/plugins/RCA/RCA.fbp +++ b/plugins/RCA/RCA.fbp @@ -1,14 +1,12 @@ - + Python 1 source_name - 0 0 - res UTF-8 connect RCALayout @@ -20,13 +18,10 @@ . 1 - 1 1 0 0 - 0 - wxAUI_MGR_DEFAULT wxSYS_COLOUR_BTNFACE wxBOTH @@ -34,11 +29,11 @@ 1 impl_virtual - + wxSYS_COLOUR_WINDOW 0 wxID_ANY - + 850,450 850,450 RCALayout @@ -47,18 +42,16 @@ Reference Condition Analysis + + wxFILTER_NONE + wxDefaultValidator + wxTAB_TRAVERSAL 1 - - - - - - OnClose @@ -128,55 +121,28 @@ wxALL 0 - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - - 1 + wxSYS_COLOUR_INFOTEXT - 0 0 wxID_ANY RCA Model: - - 0 - - 0 - 1 m_staticText6 - 1 - - protected - 1 - Resizable - 1 - 0 + + wxFILTER_NONE + wxDefaultValidator + @@ -211,55 +177,23 @@ wxALL 0 - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - - 1 + wxSYS_COLOUR_WINDOW - 0 0 wxID_ANY - - 0 - - 0 - 1 cboModel - 1 - - protected - 1 - Resizable 0 - 1 - - 0 wxFILTER_NONE @@ -294,60 +228,33 @@ - + 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 0 - - 1 - 1 - 1 - 1 - - - - - + - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - - 1 + wxSYS_COLOUR_INFOTEXT - 0 0 wxID_ANY Taxon Names: - - 0 - - 0 - 1 m_staticText2 - 1 - - protected - 1 - Resizable - 1 - 0 + + wxFILTER_NONE + wxDefaultValidator + @@ -377,60 +284,28 @@ - + 5 wxALL 0 - - 1 - 1 - 1 - 1 - - - - - + - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - 1 - 0 0 wxID_ANY - - 0 - - 0 - 1 cboDiversity - 1 - - protected - 1 - Resizable 0 - 1 - - 0 wxFILTER_NONE @@ -465,60 +340,33 @@ - + 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 0 - - 1 - 1 - 1 - 1 - - - - - + - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - - 1 + wxSYS_COLOUR_INFOTEXT - 0 0 wxID_ANY Taxon Counts: - - 0 - - 0 - 1 m_staticText3 - 1 - - protected - 1 - Resizable - 1 - 0 + + wxFILTER_NONE + wxDefaultValidator + @@ -548,60 +396,28 @@ - + 5 wxALL 0 - - 1 - 1 - 1 - 1 - - - - - + - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - 1 - 0 0 wxID_ANY - - 0 - - 0 - 1 cboCount - 1 - - protected - 1 - Resizable 0 - 1 - - 0 wxFILTER_NONE @@ -646,60 +462,29 @@ 0 - + 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - + wxALL + 0 + - - 1 - 0 - 1 1 0 - 0 - Dock - 0 - Left 1 - 1 - 0 0 wxID_ANY Run - - 0 - - 0 - 1 btnRun - 1 - - protected - 1 - Resizable - 1 - 0 wxFILTER_NONE @@ -748,29 +533,16 @@ 5 wxALL|wxEXPAND - 1 + 0 - 1 - 1 - 1 - 1 - - - - 0 0 - - - 1 wxALIGN_LEFT wxALIGN_TOP - 0 - 1 wxALIGN_CENTRE 30 @@ -779,10 +551,6 @@ 1 - 0 - Dock - 0 - Left 0 1 0 @@ -790,11 +558,9 @@ 0 1 - 1 - + wxSYS_COLOUR_WINDOW 1 - 0 0 wxID_ANY @@ -802,32 +568,24 @@ 0 0 - - 0 - -1,-1 - - 0 + 550,300 - 1 table - 1 - - protected - 1 - Resizable wxALIGN_CENTRE 50 wxALIGN_CENTRE 5 - 1 - -1,-1 + - 0 + + wxFILTER_NONE + wxDefaultValidator + wxHSCROLL|wxVSCROLL @@ -858,7 +616,7 @@ - + a @@ -911,55 +669,28 @@ 0 1 - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - - 1 + wxSYS_COLOUR_INFOTEXT - 0 0 wxID_ANY - Bar plot scale factor: - - 0 + Reference Condition Analysis - - 0 - 1 m_staticText51 - 1 - - protected - 1 - Resizable - 1 - 0 + + wxFILTER_NONE + wxDefaultValidator + @@ -997,54 +728,23 @@ 0 1 - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - 1 - 0 0 wxID_ANY - - 0 - - - 0 + 0 - 1 - m_textCtrl1 - 1 - - + userScaleFactor protected - 1 - Resizable - 1 45,-1 - 0 wxFILTER_NONE @@ -1090,56 +790,25 @@ wxALL 0 1 - - 1 - 1 - 1 - 1 - - - - - + - - 1 - 0 - 1 1 0 - 0 - Dock - 0 - Left 1 - 1 - 0 0 wxID_ANY Plot Selected Data - - 0 - - 0 - 1 btnPlot - 1 - - protected - 1 - Resizable - 1 - 0 wxFILTER_NONE @@ -1182,55 +851,24 @@ 0 1 - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 1 0 - 0 - Dock - 0 - Left 1 - 1 - 0 0 wxID_ANY Add Selected To GenGIS - - 0 - - 0 - 1 m_btnAdd - 1 - - protected - 1 - Resizable - 1 - 0 wxFILTER_NONE @@ -1288,55 +926,28 @@ wxALL 0 - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - - 1 + wxSYS_COLOUR_INFOTEXT - 0 0 wxID_ANY Save table of results to file: - - 0 - - 0 - 1 m_staticText5 - 1 - - protected - 1 - Resizable - 1 - 0 + + wxFILTER_NONE + wxDefaultValidator + @@ -1366,59 +977,28 @@ - + 5 wxALL 0 - - 1 - 1 - 1 - 1 - - - - - + - - 1 - 0 - 1 1 - 0 - Dock - 0 - Left 1 - 1 - 0 0 wxID_ANY - - 0 - Save file as - - 0 + Select a file - 1 filePicker - 1 - - protected - 1 - Resizable - 1 wxFLP_OVERWRITE_PROMPT|wxFLP_SAVE - 0 wxFILTER_NONE @@ -1475,55 +1055,24 @@ wxALL 0 - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 1 0 - 0 - Dock - 0 - Left 1 - 1 - 0 0 wxID_ANY ? - - 0 - - 0 - 1 m_btnHelp - 1 - - protected - 1 - Resizable - 1 wxBU_EXACTFIT - 0 wxFILTER_NONE @@ -1573,55 +1122,24 @@ wxALL 0 - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 1 0 - 0 - Dock - 0 - Left 1 - 1 - 0 0 wxID_ANY Close - - 0 - - 0 - 1 btOK - 1 - - protected - 1 - Resizable - 1 - 0 wxFILTER_NONE diff --git a/plugins/RCA/RCALayout.py b/plugins/RCA/RCALayout.py index c817d20b..4b80c982 100644 --- a/plugins/RCA/RCALayout.py +++ b/plugins/RCA/RCALayout.py @@ -1,14 +1,13 @@ # -*- coding: utf-8 -*- ########################################################################### -## Python code generated with wxFormBuilder (version Oct 8 2012) +## Python code generated with wxFormBuilder (version Sep 8 2010) ## http://www.wxformbuilder.org/ ## ## PLEASE DO "NOT" EDIT THIS FILE! ########################################################################### import wx -import wx.xrc import wx.grid ########################################################################### @@ -20,7 +19,8 @@ class RCALayout ( wx.Frame ): def __init__( self, parent ): wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u"Reference Condition Analysis", pos = wx.DefaultPosition, size = wx.Size( 850,450 ), style = wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL ) - self.SetSizeHintsSz( wx.Size( 850,450 ), wx.DefaultSize ) + self.SetSizeHintsSz( wx.Size( 850,450 ), wx.Size( 850,450 ) ) + self.SetForegroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_WINDOW ) ) self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) ) bSizer1 = wx.BoxSizer( wx.VERTICAL ) @@ -38,16 +38,22 @@ def __init__( self, parent ): self.m_staticText6 = wx.StaticText( self, wx.ID_ANY, u"RCA Model:", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText6.Wrap( -1 ) + self.m_staticText6.SetForegroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_INFOTEXT ) ) + fgSizer1.Add( self.m_staticText6, 0, wx.ALL, 5 ) cboModelChoices = [] self.cboModel = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, cboModelChoices, 0 ) self.cboModel.SetSelection( 0 ) + self.cboModel.SetForegroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_WINDOW ) ) + fgSizer1.Add( self.cboModel, 0, wx.ALL, 5 ) self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"Taxon Names:", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText2.Wrap( -1 ) - fgSizer1.Add( self.m_staticText2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + self.m_staticText2.SetForegroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_INFOTEXT ) ) + + fgSizer1.Add( self.m_staticText2, 0, wx.ALL, 5 ) cboDiversityChoices = [] self.cboDiversity = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, cboDiversityChoices, 0 ) @@ -56,7 +62,9 @@ def __init__( self, parent ): self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, u"Taxon Counts:", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText3.Wrap( -1 ) - fgSizer1.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + self.m_staticText3.SetForegroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_INFOTEXT ) ) + + fgSizer1.Add( self.m_staticText3, 0, wx.ALL, 5 ) cboCountChoices = [] self.cboCount = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, cboCountChoices, 0 ) @@ -67,19 +75,19 @@ def __init__( self, parent ): fgSizer1.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 ) self.btnRun = wx.Button( self, wx.ID_ANY, u"Run", wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer1.Add( self.btnRun, 1, wx.ALL|wx.EXPAND, 5 ) - + fgSizer1.Add( self.btnRun, 0, wx.ALL, 5 ) fgSizer4.Add( fgSizer1, 1, wx.EXPAND, 5 ) bSizer31 = wx.BoxSizer( wx.VERTICAL ) - self.table = wx.grid.Grid( self, wx.ID_ANY, wx.DefaultPosition, wx.Size( -1,-1 ), wx.HSCROLL|wx.VSCROLL ) + self.table = wx.grid.Grid( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.HSCROLL|wx.VSCROLL ) # Grid self.table.CreateGrid( 5, 5 ) self.table.EnableEditing( False ) self.table.EnableGridLines( True ) + self.table.SetGridLineColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_WINDOW ) ) self.table.EnableDragGridSize( False ) self.table.SetMargins( 0, 0 ) @@ -100,14 +108,16 @@ def __init__( self, parent ): self.table.SetDefaultCellAlignment( wx.ALIGN_LEFT, wx.ALIGN_TOP ) self.table.SetMinSize( wx.Size( 550,300 ) ) - bSizer31.Add( self.table, 1, wx.ALL|wx.EXPAND, 5 ) + bSizer31.Add( self.table, 0, wx.ALL|wx.EXPAND, 5 ) gbSizer1 = wx.GridBagSizer( 0, 0 ) gbSizer1.SetFlexibleDirection( wx.BOTH ) gbSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - self.m_staticText51 = wx.StaticText( self, wx.ID_ANY, u"Bar plot scale factor:", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText51 = wx.StaticText( self, wx.ID_ANY, u"Reference Condition Analysis", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText51.Wrap( -1 ) + self.m_staticText51.SetForegroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_INFOTEXT ) ) + gbSizer1.Add( self.m_staticText51, wx.GBPosition( 0, 0 ), wx.GBSpan( 1, 1 ), wx.ALL, 5 ) self.userScaleFactor = wx.TextCtrl( self, wx.ID_ANY, u"1.0", wx.DefaultPosition, wx.Size( 45,-1 ), 0 ) @@ -119,7 +129,6 @@ def __init__( self, parent ): self.m_btnAdd = wx.Button( self, wx.ID_ANY, u"Add Selected To GenGIS", wx.DefaultPosition, wx.DefaultSize, 0 ) gbSizer1.Add( self.m_btnAdd, wx.GBPosition( 0, 3 ), wx.GBSpan( 1, 1 ), wx.ALL, 5 ) - bSizer31.Add( gbSizer1, 0, wx.EXPAND, 5 ) fgSizer3 = wx.FlexGridSizer( 0, 2, 0, 0 ) @@ -128,18 +137,17 @@ def __init__( self, parent ): self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Save table of results to file:", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText5.Wrap( -1 ) + self.m_staticText5.SetForegroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_INFOTEXT ) ) + fgSizer3.Add( self.m_staticText5, 0, wx.ALL, 5 ) - self.filePicker = wx.FilePickerCtrl( self, wx.ID_ANY, u"rca_results.csv", u"Save file as", u"*.csv", wx.DefaultPosition, wx.DefaultSize, wx.FLP_OVERWRITE_PROMPT|wx.FLP_SAVE ) + self.filePicker = wx.FilePickerCtrl( self, wx.ID_ANY, u"rca_results.csv", u"Select a file", u"*.csv", wx.DefaultPosition, wx.DefaultSize, wx.FLP_OVERWRITE_PROMPT|wx.FLP_SAVE ) fgSizer3.Add( self.filePicker, 0, wx.ALL, 5 ) - bSizer31.Add( fgSizer3, 0, wx.EXPAND, 5 ) - fgSizer4.Add( bSizer31, 1, wx.EXPAND, 5 ) - bSizer1.Add( fgSizer4, 1, wx.EXPAND, 5 ) bSizer3 = wx.BoxSizer( wx.HORIZONTAL ) @@ -153,10 +161,8 @@ def __init__( self, parent ): self.btOK = wx.Button( self, wx.ID_ANY, u"Close", wx.DefaultPosition, wx.DefaultSize, 0 ) bSizer3.Add( self.btOK, 0, wx.ALL, 5 ) - bSizer1.Add( bSizer3, 0, wx.EXPAND, 5 ) - self.SetSizer( bSizer1 ) self.Layout() @@ -166,6 +172,7 @@ def __init__( self, parent ): self.Bind( wx.EVT_CLOSE, self.OnClose ) self.btnRun.Bind( wx.EVT_BUTTON, self.OnRun ) self.table.Bind( wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.OnLabelClick ) + self.table.Bind( wx.grid.EVT_GRID_EDITOR_SHOWN, self.a ) self.table.Bind( wx.grid.EVT_GRID_RANGE_SELECT, self.OnSelectedRange ) self.table.Bind( wx.grid.EVT_GRID_SELECT_CELL, self.OnSelectedCell ) self.btnPlot.Bind( wx.EVT_BUTTON, self.OnPlot ) @@ -188,6 +195,9 @@ def OnRun( self, event ): def OnLabelClick( self, event ): event.Skip() + def a( self, event ): + event.Skip() + def OnSelectedRange( self, event ): event.Skip() diff --git a/src/core/App.cpp b/src/core/App.cpp index 6a6d1347..6487f7ff 100644 --- a/src/core/App.cpp +++ b/src/core/App.cpp @@ -108,7 +108,7 @@ App::App(): m_bCurrentlySerializing( false ), m_bSaveIsUpToDate( true ), m_bIsEmptySession( true ), - m_appVersion( wxT( "2.4.1" ) ) + m_appVersion( wxT( "2.4.2" ) ) { m_colourMapManager.reset(new ColourMapManager()); std::wstring colourMapPath = (GetExeDir() + wxT("colourMaps")).c_str(); diff --git a/src/core/App.hpp b/src/core/App.hpp index 1d3aba79..f11aa995 100644 --- a/src/core/App.hpp +++ b/src/core/App.hpp @@ -70,9 +70,10 @@ namespace GenGIS V2_30 = 12, V2_40 = 13, V2_41 = 14, - //V2_42 = 15, + V2_42 = 15, + //V2_43 = 16, // - GENGIS_VERSION = V2_41, + GENGIS_VERSION = V2_42, SAVE_VERSION = V2_40 /* For serialization: The last version of GenGIS whose session file is compatible with this release. */ }; diff --git a/win32/InnoInstaller/GenGIS.iss b/win32/InnoInstaller/GenGIS.iss index b6605876..1b104155 100644 --- a/win32/InnoInstaller/GenGIS.iss +++ b/win32/InnoInstaller/GenGIS.iss @@ -5,16 +5,16 @@ ; NOTE: The value of AppId uniquely identifies this application. ; Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{F8901CDF-C145-4EDF-B76D-0E53F8408F5F} +AppId={{1E297C55-7A7B-439A-AE7B-CC787F5BDDB2} AppName=GenGIS -AppVerName=GenGIS v2.4.1 +AppVerName=GenGIS v2.4.2 ; Remember to update the APP_VERSION::CURRENT enum in 'App.hpp' to match the AppVerName number AppPublisher=Beiko Lab AppPublisherURL=http://kiwi.cs.dal.ca/GenGIS AppSupportURL=http://kiwi.cs.dal.ca/GenGIS AppUpdatesURL=http://kiwi.cs.dal.ca/GenGIS -DefaultDirName={pf}\GenGIS2.4.1 -DefaultGroupName=GenGIS2.4.1 +DefaultDirName={pf}\GenGIS2.4.2 +DefaultGroupName=GenGIS2.4.2 AllowNoIcons=yes LicenseFile=..\..\bin\license.txt OutputDir=..\..\win32\InnoInstaller\Setup