Skip to content

Commit

Permalink
preparation for release 2.4.2
Browse files Browse the repository at this point in the history 
fixing the RCA bug
  • Loading branch information
akeddy committed Feb 16, 2016
1 parent d5a23d7 commit 07a8a03
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 570 deletions.
Binary file modified bin/images/Logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/images/Logo2.4.1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion bin/release_notes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@
<body>
<img src="images/CrazyEye/linux/CrazyEye_Run_32x32.png" width="32" height="32" alt="CrazyEye_Run_32x32"/>

<p>Copyright &copy 2009, 2010, 2011, 2012, 2013, 2014, 2015 Robert Beiko ([email protected])</p>
<p>Copyright &copy 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Robert Beiko ([email protected])</p>
<p><i>An application for merging geographic data with information about biological sequences collected from the environment.</i></p>
<h3>New Features</h3>
<p>See <b>kiwi.cs.dal.ca/GenGIS/Revision_History</b> for all bug fixes.</p>

<h4>Version 2.4.2 (February 16, 2016)</h4>

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

</ul>

<h4>Version 2.4.1 (August 27, 2015)</h4>

<ul>
Expand Down
608 changes: 63 additions & 545 deletions plugins/RCA/RCA.fbp
View file

Large diffs are not rendered by default.

44 changes: 27 additions & 17 deletions plugins/RCA/RCALayout.py
View file
Original file line number Diff line number Diff line change
@@ -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

###########################################################################
Expand All @@ -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 )
Expand All @@ -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 )
Expand All @@ -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 )
Expand All @@ -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 )

Expand All @@ -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 )
Expand All @@ -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 )
Expand All @@ -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 )
Expand All @@ -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()

Expand All @@ -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 )
Expand All @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion src/core/App.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
5 changes: 3 additions & 2 deletions src/core/App.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
};
Expand Down
8 changes: 4 additions & 4 deletions win32/InnoInstaller/GenGIS.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 07a8a03

Please sign in to comment.