From 320a350e8fff4c6c52ca545fb3e94bc4cb22baed Mon Sep 17 00:00:00 2001
From: akeddy <a.keddy.bcs@gmail.com>
Date: Sat, 22 Apr 2017 14:39:08 -0300
Subject: [PATCH] Updated the look and feel of Cartograms. Added warping to
 Polygons.

---
 bin/release_notes.html                        |   11 +
 gui/MapProperties.fbp                         |  238 +++-
 .../PhylogeneticDistance.fbp                  | 1166 +++++++++++++++++
 .../PhylogeneticDistance.py                   |  245 ++++
 .../PhylogeneticDistanceLayout.py             |  167 +++
 plugins/PhylogeneticDistance/__init__.py      |   27 +
 src/core/App.cpp                              |    2 +-
 src/core/App.hpp                              |    6 +-
 src/core/Cartogram.cpp                        |  159 ++-
 src/core/Cartogram.hpp                        |    6 +
 src/core/PolygonModel.hpp                     |    4 +
 src/gui/MapPropertiesDlg.cpp                  |   32 +-
 src/gui/MapPropertiesDlg.hpp                  |    2 +-
 src/gui/MapPropertiesLayout.cpp               |   30 +-
 src/gui/MapPropertiesLayout.h                 |    6 +
 win32/InnoInstaller/GenGIS.iss                |    8 +-
 16 files changed, 2056 insertions(+), 53 deletions(-)
 create mode 100644 plugins/PhylogeneticDistance/PhylogeneticDistance.fbp
 create mode 100644 plugins/PhylogeneticDistance/PhylogeneticDistance.py
 create mode 100644 plugins/PhylogeneticDistance/PhylogeneticDistanceLayout.py
 create mode 100644 plugins/PhylogeneticDistance/__init__.py

diff --git a/bin/release_notes.html b/bin/release_notes.html
index 80c047e6..1b1a70ba 100644
--- a/bin/release_notes.html
+++ b/bin/release_notes.html
@@ -10,6 +10,17 @@
         <h3>New Features</h3>
 		<p>See <b>kiwi.cs.dal.ca/GenGIS/Revision_History</b> for all bug fixes.</p>
 		
+		<h4>Version 2.5.3 (April 22, 2017)</h4>
+		<ul>
+			<li> Added the ability to warp pre-existing polygons with cartograms.<\li>
+			<li> Updated the UI to display the UTM grid shift for the Location Multiplier.<\li>
+		</ul>
+	
+		<h4>Version 2.5.2 (Aug 07, 2016)</h4>
+		<ul>
+			<li> Fixed read/write bug in Cartogram creation that stopped in on some machines.<\li>
+		</ul>
+		
 		<h4>Version 2.5.1 (May 15, 2016)</h4>
 		<ul>
 			<li> Renamed Phylogenetic Distance Plugin to GCPD.<\li>
diff --git a/gui/MapProperties.fbp b/gui/MapProperties.fbp
index 61bfa536..3b8a5842 100644
--- a/gui/MapProperties.fbp
+++ b/gui/MapProperties.fbp
@@ -603,7 +603,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Symbology</property>
-                            <property name="select">1</property>
+                            <property name="select">0</property>
                             <object class="wxPanel" expanded="0">
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
@@ -1972,7 +1972,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Cartogram</property>
-                            <property name="select">0</property>
+                            <property name="select">1</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
@@ -2047,7 +2047,7 @@
                                                     <property name="minimum_size"></property>
                                                     <property name="name">gSizer1</property>
                                                     <property name="permission">none</property>
-                                                    <property name="rows">2</property>
+                                                    <property name="rows">4</property>
                                                     <property name="vgap">0</property>
                                                     <object class="sizeritem" expanded="1">
                                                         <property name="border">5</property>
@@ -2062,7 +2062,7 @@
                                                             <property name="font"></property>
                                                             <property name="hidden">0</property>
                                                             <property name="id">wxID_ANY</property>
-                                                            <property name="label">Location Radius</property>
+                                                            <property name="label">Location Radius (UTM)</property>
                                                             <property name="maximum_size"></property>
                                                             <property name="minimum_size"></property>
                                                             <property name="name">m_lblAreaFudge</property>
@@ -2118,7 +2118,7 @@
                                                             <property name="font"></property>
                                                             <property name="hidden">0</property>
                                                             <property name="id">wxID_ANY</property>
-                                                            <property name="initial">4</property>
+                                                            <property name="initial">5</property>
                                                             <property name="max">10000</property>
                                                             <property name="maximum_size"></property>
                                                             <property name="min">0</property>
@@ -2160,8 +2160,232 @@
                                                             <event name="OnRightUp"></event>
                                                             <event name="OnSetFocus"></event>
                                                             <event name="OnSize"></event>
-                                                            <event name="OnSpinCtrl"></event>
-                                                            <event name="OnSpinCtrlText"></event>
+                                                            <event name="OnSpinCtrl">OnAreaFudge</event>
+                                                            <event name="OnSpinCtrlText">OnAreaFudge</event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="1">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL|wxALIGN_RIGHT</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="1">
+                                                            <property name="bg"></property>
+                                                            <property name="context_help"></property>
+                                                            <property name="context_menu">1</property>
+                                                            <property name="enabled">1</property>
+                                                            <property name="fg"></property>
+                                                            <property name="font"></property>
+                                                            <property name="hidden">0</property>
+                                                            <property name="id">wxID_ANY</property>
+                                                            <property name="label">X:</property>
+                                                            <property name="maximum_size"></property>
+                                                            <property name="minimum_size"></property>
+                                                            <property name="name">m_lblAreaFudgeXLabel</property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pos"></property>
+                                                            <property name="size"></property>
+                                                            <property name="style">wxALIGN_RIGHT</property>
+                                                            <property name="subclass"></property>
+                                                            <property name="tooltip"></property>
+                                                            <property name="validator_data_type"></property>
+                                                            <property name="validator_style">wxFILTER_NONE</property>
+                                                            <property name="validator_type">wxDefaultValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="1">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="1">
+                                                            <property name="bg"></property>
+                                                            <property name="context_help"></property>
+                                                            <property name="context_menu">1</property>
+                                                            <property name="enabled">1</property>
+                                                            <property name="fg"></property>
+                                                            <property name="font"></property>
+                                                            <property name="hidden">0</property>
+                                                            <property name="id">wxID_ANY</property>
+                                                            <property name="label"></property>
+                                                            <property name="maximum_size"></property>
+                                                            <property name="minimum_size"></property>
+                                                            <property name="name">m_lblAreaFudgeX</property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pos"></property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <property name="subclass"></property>
+                                                            <property name="tooltip"></property>
+                                                            <property name="validator_data_type"></property>
+                                                            <property name="validator_style">wxFILTER_NONE</property>
+                                                            <property name="validator_type">wxDefaultValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="1">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL|wxALIGN_RIGHT</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="1">
+                                                            <property name="bg"></property>
+                                                            <property name="context_help"></property>
+                                                            <property name="context_menu">1</property>
+                                                            <property name="enabled">1</property>
+                                                            <property name="fg"></property>
+                                                            <property name="font"></property>
+                                                            <property name="hidden">0</property>
+                                                            <property name="id">wxID_ANY</property>
+                                                            <property name="label">Y:</property>
+                                                            <property name="maximum_size"></property>
+                                                            <property name="minimum_size"></property>
+                                                            <property name="name">m_lblAreaFudgeYLabel</property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pos"></property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <property name="subclass"></property>
+                                                            <property name="tooltip"></property>
+                                                            <property name="validator_data_type"></property>
+                                                            <property name="validator_style">wxFILTER_NONE</property>
+                                                            <property name="validator_type">wxDefaultValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="1">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="1">
+                                                            <property name="bg"></property>
+                                                            <property name="context_help"></property>
+                                                            <property name="context_menu">1</property>
+                                                            <property name="enabled">1</property>
+                                                            <property name="fg"></property>
+                                                            <property name="font"></property>
+                                                            <property name="hidden">0</property>
+                                                            <property name="id">wxID_ANY</property>
+                                                            <property name="label"></property>
+                                                            <property name="maximum_size"></property>
+                                                            <property name="minimum_size"></property>
+                                                            <property name="name">m_lblAreaFudgeY</property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pos"></property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <property name="subclass"></property>
+                                                            <property name="tooltip"></property>
+                                                            <property name="validator_data_type"></property>
+                                                            <property name="validator_style">wxFILTER_NONE</property>
+                                                            <property name="validator_type">wxDefaultValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
                                                             <event name="OnUpdateUI"></event>
                                                         </object>
                                                     </object>
diff --git a/plugins/PhylogeneticDistance/PhylogeneticDistance.fbp b/plugins/PhylogeneticDistance/PhylogeneticDistance.fbp
new file mode 100644
index 00000000..b61fe77e
--- /dev/null
+++ b/plugins/PhylogeneticDistance/PhylogeneticDistance.fbp
@@ -0,0 +1,1166 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="10" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration"></property>
+        <property name="code_generation">Python</property>
+        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_python_events">0</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file">PhylogeneticDistanceLayout</property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">0</property>
+        <property name="name">PhylogeneticDistanceLayout</property>
+        <property name="namespace"></property>
+        <property name="path">.</property>
+        <property name="precompiled_header"></property>
+        <property name="relative_path">1</property>
+        <property name="skip_python_events">1</property>
+        <property name="use_enum">0</property>
+        <property name="use_microsoft_bom">0</property>
+        <object class="Frame" expanded="1">
+            <property name="bg">wxSYS_COLOUR_BTNFACE</property>
+            <property name="center">wxBOTH</property>
+            <property name="context_help"></property>
+            <property name="context_menu">1</property>
+            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
+            <property name="extra_style"></property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">PhylogeneticDistanceLayout</property>
+            <property name="pos"></property>
+            <property name="size">650,600</property>
+            <property name="style">wxDEFAULT_FRAME_STYLE</property>
+            <property name="subclass"></property>
+            <property name="title">Phylogenetic Distance Calculator</property>
+            <property name="tooltip"></property>
+            <property name="validator_data_type"></property>
+            <property name="validator_style">wxFILTER_NONE</property>
+            <property name="validator_type">wxDefaultValidator</property>
+            <property name="validator_variable"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style">wxTAB_TRAVERSAL</property>
+            <property name="xrc_skip_sizer">1</property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <event name="OnChar"></event>
+            <event name="OnClose">OnClose</event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bSizer9</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">bSizer5</property>
+                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxBoxSizer" expanded="0">
+                                <property name="minimum_size"></property>
+                                <property name="name">bSizer4</property>
+                                <property name="orient">wxVERTICAL</property>
+                                <property name="permission">none</property>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxFlexGridSizer" expanded="0">
+                                        <property name="cols">2</property>
+                                        <property name="flexible_direction">wxBOTH</property>
+                                        <property name="growablecols">1</property>
+                                        <property name="growablerows"></property>
+                                        <property name="hgap">0</property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">fgSizer2</property>
+                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                        <property name="permission">none</property>
+                                        <property name="rows">2</property>
+                                        <property name="vgap">0</property>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticText" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Measure:</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">m_staticText7</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <property name="wrap">-1</property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxChoice" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="choices"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">m_cboMeasure</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="selection">0</property>
+                                                <property name="size"></property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnChoice">OnMeasureChanged</event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticText" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Location Layer:</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">m_staticText8</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <property name="wrap">-1</property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxChoice" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="choices"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">m_cboLocationLayerField</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="selection">0</property>
+                                                <property name="size"></property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnChoice"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticText" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Tree Layer:</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">m_staticText3</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <property name="wrap">-1</property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxChoice" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="choices"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">m_cboTreeLayerField</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="selection">0</property>
+                                                <property name="size"></property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnChoice"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">1</property>
+                            <object class="wxStaticBoxSizer" expanded="1">
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Details</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">sbSizer1</property>
+                                <property name="orient">wxVERTICAL</property>
+                                <property name="permission">none</property>
+                                <event name="OnUpdateUI"></event>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND</property>
+                                    <property name="proportion">1</property>
+                                    <object class="wxFlexGridSizer" expanded="0">
+                                        <property name="cols">2</property>
+                                        <property name="flexible_direction">wxBOTH</property>
+                                        <property name="growablecols">1</property>
+                                        <property name="growablerows">2</property>
+                                        <property name="hgap">0</property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">fgSizer21</property>
+                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                        <property name="permission">none</property>
+                                        <property name="rows">3</property>
+                                        <property name="vgap">0</property>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticText" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Full name:</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">m_staticText4</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <property name="wrap">-1</property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxTextCtrl" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="maxlength">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">txtFullName</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="size"></property>
+                                                <property name="style">wxTE_READONLY</property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="value"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnText"></event>
+                                                <event name="OnTextEnter"></event>
+                                                <event name="OnTextMaxLen"></event>
+                                                <event name="OnTextURL"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticText" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Formula:</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">m_staticText5</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <property name="wrap">-1</property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxTextCtrl" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="maxlength">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">txtFormula</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="size"></property>
+                                                <property name="style">wxTE_READONLY</property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="value"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnText"></event>
+                                                <event name="OnTextEnter"></event>
+                                                <event name="OnTextMaxLen"></event>
+                                                <event name="OnTextURL"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticText" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Description:</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">m_staticText6</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <property name="wrap">-1</property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxTextCtrl" expanded="0">
+                                                <property name="bg"></property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="font"></property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="maxlength">0</property>
+                                                <property name="minimum_size">-1,75</property>
+                                                <property name="name">txtDescription</property>
+                                                <property name="permission">protected</property>
+                                                <property name="pos"></property>
+                                                <property name="size"></property>
+                                                <property name="style">wxTE_MULTILINE|wxTE_READONLY|wxTE_WORDWRAP</property>
+                                                <property name="subclass"></property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="value"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnText"></event>
+                                                <event name="OnTextEnter"></event>
+                                                <event name="OnTextMaxLen"></event>
+                                                <event name="OnTextURL"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">1</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">bSizer6</property>
+                        <property name="orient">wxVERTICAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="0">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default">0</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Calculate</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">btnCalculate</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnButtonClick">OnCalculate</event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">1</property>
+                            <object class="wxTextCtrl" expanded="0">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="maximum_size"></property>
+                                <property name="maxlength">0</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">txtLog</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style">wxTE_MULTILINE</property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
+                                <property name="value"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnText"></event>
+                                <event name="OnTextEnter"></event>
+                                <event name="OnTextMaxLen"></event>
+                                <event name="OnTextURL"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxBoxSizer" expanded="1">
+                                <property name="minimum_size"></property>
+                                <property name="name">bSizer2</property>
+                                <property name="orient">wxHORIZONTAL</property>
+                                <property name="permission">none</property>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxButton" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default">0</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">?</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_btnHelp</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style">wxBU_EXACTFIT</property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip">Help</property>
+                                        <property name="validator_data_type"></property>
+                                        <property name="validator_style">wxFILTER_NONE</property>
+                                        <property name="validator_type">wxDefaultValidator</property>
+                                        <property name="validator_variable"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnButtonClick">OnHelp</event>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxButton" expanded="0">
+                                        <property name="bg"></property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default">0</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Add To GenGIS</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">btnSaveDissMatrix</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
+                                        <property name="validator_style">wxFILTER_NONE</property>
+                                        <property name="validator_type">wxDefaultValidator</property>
+                                        <property name="validator_variable"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnButtonClick">OnAddToGenGIS</event>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND</property>
+                                    <property name="proportion">1</property>
+                                    <object class="spacer" expanded="0">
+                                        <property name="height">0</property>
+                                        <property name="permission">protected</property>
+                                        <property name="width">0</property>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxButton" expanded="0">
+                                        <property name="bg"></property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default">0</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">OK</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">btnOK</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
+                                        <property name="validator_style">wxFILTER_NONE</property>
+                                        <property name="validator_type">wxDefaultValidator</property>
+                                        <property name="validator_variable"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnButtonClick">OnOK</event>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>
diff --git a/plugins/PhylogeneticDistance/PhylogeneticDistance.py b/plugins/PhylogeneticDistance/PhylogeneticDistance.py
new file mode 100644
index 00000000..8b59c576
--- /dev/null
+++ b/plugins/PhylogeneticDistance/PhylogeneticDistance.py
@@ -0,0 +1,245 @@
+# execfile("C:\Users\Admin\Documents\PEscript.py")
+from PhylogeneticDistanceLayout import PhylogeneticDistanceLayout
+import GenGIS
+import wx
+from scipy.spatial import Delaunay
+import dendropy
+
+
+class PhylogeneticDistance( PhylogeneticDistanceLayout ):
+	
+	combinationMethods = {"Average(Local)": "AVGLOCAL", "Average(Global)": "AVGGLOBAL", "Sum": "SUM"}
+	
+	def __init__(self, parent=None):
+		PhylogeneticDistanceLayout.__init__( self, parent )
+		self.SetIcon(wx.Icon(GenGIS.mainWindow.GetExeDir() + "images/CrazyEye.ico", wx.BITMAP_TYPE_ICO))
+		
+		if GenGIS.layerTree.GetNumMapLayers() == 0 or GenGIS.layerTree.GetNumLocationSetLayers() == 0 or GenGIS.layerTree.GetNumTreeLayers() == 0:
+			wx.MessageBox("This plugin requires map, location, and tree data to be loaded.", "Additional data required.")
+			self.Close()
+			return
+		# load up measure options
+		for keys in self.combinationMethods.keys():
+			self.m_cboMeasure.Append(keys)
+		self.m_cboMeasure.SetSelection(0)
+		# load up location layers
+		for locLayer in GenGIS.layerTree.GetLocationSetLayers():
+			self.m_cboLocationLayerField.Append(locLayer.GetName())
+		self.m_cboLocationLayerField.SetSelection(0)
+		# load up tree layers
+		for treeIndex in range(0,GenGIS.layerTree.GetNumTreeLayers()):
+			tree = GenGIS.layerTree.GetTreeLayer(treeIndex)
+			self.m_cboTreeLayerField.Append(tree.GetName())
+		self.m_cboTreeLayerField.SetSelection(0)
+		self.OnMeasureChanged("fake")
+	
+	def OnOK(self, event):
+		self.Close()
+	
+	def OnMeasureChanged(self, event):
+		if self.m_cboMeasure.GetStringSelection() == "Average(Local)":
+			self.txtFullName.SetValue("Average(Local)")
+			self.txtFormula.SetValue("(a + b)/count(a,b)")
+			self.txtDescription.SetValue("This option combines edge weights by averaging every edge associated with a location. The sum of all associated weights is divided by the number of branches associated with that location. This accounts more strongly for differing edge counts between nodes.")
+	
+		elif self.m_cboMeasure.GetStringSelection() == "Average(Global)":
+			self.txtFullName.SetValue("Average(Global)")
+			self.txtFormula.SetValue("(a + b)/ (Number of Locations)")
+			self.txtDescription.SetValue("This option combines edge weights by averaging every edge associated with a location. The sum of all associated weights is divided by the number of locations. This more strongly preserves network like signal")
+		
+		elif self.m_cboMeasure.GetStringSelection() == "Sum":
+			self.txtFullName.SetValue("Sum")
+			self.txtFormula.SetValue(" a + b ")
+			self.txtDescription.SetValue("This option combines edge weights by summing every edge associated with a location.")
+	
+	def OnCalculate(self, event):
+		# get selected location layer
+		self.locSetIndex = self.m_cboLocationLayerField.GetSelection()
+		# get selected tree layer
+		self.treeIndex = self.m_cboTreeLayerField.GetSelection()
+		# get selected combination method
+		selectedMethod = self.m_cboMeasure.GetStringSelection()
+		
+		self.locWeights = self.Main( self.locSetIndex, self.treeIndex, self.combinationMethods[selectedMethod] )
+		self.PrintWeights(self.locSetIndex, self.locWeights)
+	
+	def PrintWeights(self, locSetIndex, locWeights):
+		locSet = GenGIS.layerTree.GetLocationSetLayer(locSetIndex)
+		for i in range(0, locSet.GetNumLocationLayers() ):
+			loc = locSet.GetLocationLayer(i)
+			if i in locWeights.keys():
+				value = locWeights[i]
+			else:
+				continue
+			
+			printStr = "%s: %s\n" %(loc.GetName(), value)
+			self.txtLog.AppendText(printStr)
+		self.txtLog.AppendText("\n\n")
+		
+	
+	def OnAddToGenGIS(self, event):
+		self.AddDataToLocationLayer()
+	
+	def CombineWeights(self, phyloWeights, comb):
+		final = {}
+		if comb == "SUM":
+			for key in phyloWeights.keys():
+				val = sum(phyloWeights[key])
+				final[key] = val
+				
+		elif comb == "AVGLOCAL":
+			for key in phyloWeights.keys():
+				sm = sum(phyloWeights[key])
+			#	leng = len(phyloWeights[key])
+				leng = len(phyloWeights[key]) if len(phyloWeights[key])!=0 else 1
+				val = sm/leng
+				final[key]= val
+				
+		elif comb == "AVGGLOBAL":
+			leng = 0
+			for key in phyloWeights.keys():
+				sm = sum(phyloWeights[key])
+				leng = leng + len(phyloWeights[key])
+				final[key] = sm
+			for key,val in final.items():
+				final[key] = val/leng
+		return final
+
+	# distribute all the edge weights to locations
+	def WeightsToLocations(self, phyloWeights ):
+		locations={}	
+		for key,value in phyloWeights.items():
+			loc1 = key[0]
+			loc2 = key[1]
+			if loc1 in locations.keys():
+				locations[loc1] += value * .5
+			else:
+				locations[loc1] = value *.5
+			
+			if loc2 in locations.keys():
+				locations[loc2] += value * .5
+			else:
+				locations[loc2] = value *.5
+		return locations
+			
+	def AddDataToLocationLayer(self):
+		# ADD DATA BACK TO LOCATIONS METADATA
+		
+		val = []
+		name = "PhylogeneticDistance"
+		for i in range(0,GenGIS.layerTree.GetNumLocationLayers()):
+			if i in self.locWeights.keys():
+				if isinstance(self.locWeights[i],float):
+					val.append("%0.15f" %self.locWeights[i])
+				else:
+					val.append(str(self.locWeights[i]))
+			#	val.append(""self.locWeights[i])
+			else:
+				val.append("0")
+		GenGIS.layerTree.GetLocationSetLayer(self.locSetIndex).GetController().AddMetadata( name , val )
+
+	def Main(self,locationLayer, treeLayer, combinationMethod):	
+		#need at least location, and tree layers.
+		# check required data has been loaded		
+	#	treeLayer = 0
+	#	locationLayer = 0
+	#	combinationMethod = "AVG"
+		
+		# weights of every leaf node against every other
+		newick = GenGIS.layerTree.GetTreeLayer(treeLayer).GetGeoTreeView().GetNewickString()
+		leafNames = GenGIS.layerTree.GetTreeLayer(0).GetGeoTreeView().GetLeafNames()
+		tree = dendropy.Tree.get_from_string(newick,schema="newick")
+		pdm = dendropy.treecalc.PatristicDistanceMatrix(tree)
+			
+		# make array of points
+		points = []
+		treeLocationMap = {}
+		PhyloDistance = {}
+		activeLocations = GenGIS.layerTree.GetLocationSetLayer(locationLayer).GetAllActiveLocationLayers()
+		i=0
+		
+		# map leaf names to nodes for easy use
+		leafMap = {}
+		for taxon in tree.taxon_set:
+			for leaf in leafNames:
+				if leaf == taxon.label:
+					leafMap[leaf] = taxon
+					continue
+		
+		for loc in activeLocations:
+			taxonObjects = []
+			
+			east = loc.GetController().GetEasting()
+			north = loc.GetController().GetNorthing()
+			points.append([east,north])
+			
+			if loc.GetName() in leafNames:
+				taxonObjects.append( leafMap[ loc.GetName() ] )
+			# translate sequence ID to taxon objects
+			if loc.GetNumSequenceLayers() > 0:
+				for seq in loc.GetAllActiveSequenceLayers():
+					if seq.GetName() in leafNames:
+						taxonObjects.append( leafMap[ seq.GetName() ] )
+						continue
+			
+			treeLocationMap[i] = taxonObjects	
+			i += 1
+
+		tri = Delaunay(points)
+		# indices are in the same order as stored by GenGIS in the Active Location Layer Set
+		
+		indices = tri.simplices
+		pairs = []
+		for line in indices:
+			pairs.append((line[0],line[1]))
+			pairs.append((line[0],line[2]))
+			pairs.append((line[1],line[2]))
+
+		# total weight to divide pairwise weights by (0-1 metric)
+		totalWeight = tree.length()
+
+		max = 0
+		for pair in pairs:
+			a = pair[0]
+			b = pair[1]
+			dist = 0
+			'''
+			if (a,b) in PhyloDistance.keys():
+				weights = []
+				for t1 in treeLocationMap[a]:
+					for t2 in treeLocationMap[b]:
+						weights.append(1-pdm(t1, t2))
+				PhyloDistance[a,b].extend(weights)
+			else:
+				weights = []
+				for t1 in treeLocationMap[a]:
+					for t2 in treeLocationMap[b]:
+						weights.append(1-pdm(t1, t2))
+				if len(weights) > 0:
+					PhyloDistance[a,b] = weights
+			'''
+			weights = []
+			for t1 in treeLocationMap[a]:
+				for t2 in treeLocationMap[b]:
+					dist = pdm(t1,t2)
+					weights.append(dist)
+					if dist > max:
+						max = dist
+			if (a,b) in PhyloDistance.keys():
+				PhyloDistance[a,b].extend(weights)
+			else:
+				PhyloDistance[a,b] = weights
+		flipWeights = True
+		if flipWeights:
+			# flip PD so that closely related things have the largest values
+			for key, val in PhyloDistance.iteritems():
+				weights = []
+				for wght in val:
+					wght = max - wght
+					weights.append(wght)
+			
+				PhyloDistance[key] = weights
+		phyloDistComb = self.CombineWeights(PhyloDistance, combinationMethod)
+	#	print phyloDistComb
+		locationWeights = self.WeightsToLocations(phyloDistComb)
+		return locationWeights
diff --git a/plugins/PhylogeneticDistance/PhylogeneticDistanceLayout.py b/plugins/PhylogeneticDistance/PhylogeneticDistanceLayout.py
new file mode 100644
index 00000000..baf2c561
--- /dev/null
+++ b/plugins/PhylogeneticDistance/PhylogeneticDistanceLayout.py
@@ -0,0 +1,167 @@
+# -*- coding: utf-8 -*- 
+
+###########################################################################
+## Python code generated with wxFormBuilder (version Sep  8 2010)
+## http://www.wxformbuilder.org/
+##
+## PLEASE DO "NOT" EDIT THIS FILE!
+###########################################################################
+
+import wx
+
+###########################################################################
+## Class PhylogeneticDistanceLayout
+###########################################################################
+
+class PhylogeneticDistanceLayout ( wx.Frame ):
+	
+	def __init__( self, parent ):
+		wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u"Phylogenetic Distance Calculator", pos = wx.DefaultPosition, size = wx.Size( 650,600 ), style = wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL )
+		
+		self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize )
+		self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) )
+		
+		bSizer9 = wx.BoxSizer( wx.VERTICAL )
+		
+		bSizer5 = wx.BoxSizer( wx.HORIZONTAL )
+		
+		bSizer4 = wx.BoxSizer( wx.VERTICAL )
+		
+		fgSizer2 = wx.FlexGridSizer( 2, 2, 0, 0 )
+		fgSizer2.AddGrowableCol( 1 )
+		fgSizer2.SetFlexibleDirection( wx.BOTH )
+		fgSizer2.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED )
+		
+		self.m_staticText7 = wx.StaticText( self, wx.ID_ANY, u"Measure:", wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticText7.Wrap( -1 )
+		fgSizer2.Add( self.m_staticText7, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+		
+		m_cboMeasureChoices = []
+		self.m_cboMeasure = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_cboMeasureChoices, 0 )
+		self.m_cboMeasure.SetSelection( 0 )
+		fgSizer2.Add( self.m_cboMeasure, 1, wx.ALL|wx.EXPAND, 5 )
+		
+		self.m_staticText8 = wx.StaticText( self, wx.ID_ANY, u"Location Layer:", wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticText8.Wrap( -1 )
+		fgSizer2.Add( self.m_staticText8, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+		
+		m_cboLocationLayerFieldChoices = []
+		self.m_cboLocationLayerField = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_cboLocationLayerFieldChoices, 0 )
+		self.m_cboLocationLayerField.SetSelection( 0 )
+		fgSizer2.Add( self.m_cboLocationLayerField, 1, wx.ALL|wx.EXPAND, 5 )
+		
+		self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, u"Tree Layer:", wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticText3.Wrap( -1 )
+		fgSizer2.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+		
+		m_cboTreeLayerFieldChoices = []
+		self.m_cboTreeLayerField = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_cboTreeLayerFieldChoices, 0 )
+		self.m_cboTreeLayerField.SetSelection( 0 )
+		fgSizer2.Add( self.m_cboTreeLayerField, 0, wx.ALL|wx.EXPAND, 5 )
+		
+		bSizer4.Add( fgSizer2, 0, wx.EXPAND, 5 )
+		
+		bSizer5.Add( bSizer4, 0, wx.EXPAND, 5 )
+		
+		sbSizer1 = wx.StaticBoxSizer( wx.StaticBox( self, wx.ID_ANY, u"Details" ), wx.VERTICAL )
+		
+		fgSizer21 = wx.FlexGridSizer( 3, 2, 0, 0 )
+		fgSizer21.AddGrowableCol( 1 )
+		fgSizer21.AddGrowableRow( 2 )
+		fgSizer21.SetFlexibleDirection( wx.BOTH )
+		fgSizer21.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED )
+		
+		self.m_staticText4 = wx.StaticText( self, wx.ID_ANY, u"Full name:", wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticText4.Wrap( -1 )
+		fgSizer21.Add( self.m_staticText4, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+		
+		self.txtFullName = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.TE_READONLY )
+		fgSizer21.Add( self.txtFullName, 1, wx.ALL|wx.EXPAND, 5 )
+		
+		self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Formula:", wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticText5.Wrap( -1 )
+		fgSizer21.Add( self.m_staticText5, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+		
+		self.txtFormula = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.TE_READONLY )
+		fgSizer21.Add( self.txtFormula, 1, wx.ALL|wx.EXPAND, 5 )
+		
+		self.m_staticText6 = wx.StaticText( self, wx.ID_ANY, u"Description:", wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticText6.Wrap( -1 )
+		fgSizer21.Add( self.m_staticText6, 0, wx.ALL, 5 )
+		
+		self.txtDescription = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.TE_MULTILINE|wx.TE_READONLY|wx.TE_WORDWRAP )
+		self.txtDescription.SetMinSize( wx.Size( -1,75 ) )
+		
+		fgSizer21.Add( self.txtDescription, 1, wx.ALL|wx.EXPAND, 5 )
+		
+		sbSizer1.Add( fgSizer21, 1, wx.EXPAND, 5 )
+		
+		bSizer5.Add( sbSizer1, 1, wx.ALL|wx.EXPAND, 5 )
+		
+		bSizer9.Add( bSizer5, 0, wx.EXPAND, 5 )
+		
+		bSizer6 = wx.BoxSizer( wx.VERTICAL )
+		
+		self.btnCalculate = wx.Button( self, wx.ID_ANY, u"Calculate", wx.DefaultPosition, wx.DefaultSize, 0 )
+		bSizer6.Add( self.btnCalculate, 0, wx.ALL, 5 )
+		
+		self.txtLog = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.TE_MULTILINE )
+		bSizer6.Add( self.txtLog, 1, wx.ALL|wx.EXPAND, 5 )
+		
+		bSizer2 = wx.BoxSizer( wx.HORIZONTAL )
+		
+		self.m_btnHelp = wx.Button( self, wx.ID_ANY, u"?", wx.DefaultPosition, wx.DefaultSize, wx.BU_EXACTFIT )
+		self.m_btnHelp.SetToolTipString( u"Help" )
+		
+		bSizer2.Add( self.m_btnHelp, 0, wx.ALL, 5 )
+		
+		self.btnSaveDissMatrix = wx.Button( self, wx.ID_ANY, u"Add To GenGIS", wx.DefaultPosition, wx.DefaultSize, 0 )
+		bSizer2.Add( self.btnSaveDissMatrix, 0, wx.ALL, 5 )
+		
+		
+		bSizer2.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 )
+		
+		self.btnOK = wx.Button( self, wx.ID_ANY, u"OK", wx.DefaultPosition, wx.DefaultSize, 0 )
+		bSizer2.Add( self.btnOK, 0, wx.ALL, 5 )
+		
+		bSizer6.Add( bSizer2, 0, wx.EXPAND, 5 )
+		
+		bSizer9.Add( bSizer6, 1, wx.EXPAND, 5 )
+		
+		self.SetSizer( bSizer9 )
+		self.Layout()
+		
+		self.Centre( wx.BOTH )
+		
+		# Connect Events
+		self.Bind( wx.EVT_CLOSE, self.OnClose )
+		self.m_cboMeasure.Bind( wx.EVT_CHOICE, self.OnMeasureChanged )
+		self.btnCalculate.Bind( wx.EVT_BUTTON, self.OnCalculate )
+		self.m_btnHelp.Bind( wx.EVT_BUTTON, self.OnHelp )
+		self.btnSaveDissMatrix.Bind( wx.EVT_BUTTON, self.OnAddToGenGIS )
+		self.btnOK.Bind( wx.EVT_BUTTON, self.OnOK )
+	
+	def __del__( self ):
+		pass
+	
+	
+	# Virtual event handlers, overide them in your derived class
+	def OnClose( self, event ):
+		event.Skip()
+	
+	def OnMeasureChanged( self, event ):
+		event.Skip()
+	
+	def OnCalculate( self, event ):
+		event.Skip()
+	
+	def OnHelp( self, event ):
+		event.Skip()
+	
+	def OnAddToGenGIS( self, event ):
+		event.Skip()
+	
+	def OnOK( self, event ):
+		event.Skip()
+	
+
diff --git a/plugins/PhylogeneticDistance/__init__.py b/plugins/PhylogeneticDistance/__init__.py
new file mode 100644
index 00000000..43726c77
--- /dev/null
+++ b/plugins/PhylogeneticDistance/__init__.py
@@ -0,0 +1,27 @@
+def name():
+	return "Phylogenetic Distance"
+
+def version():
+	return "Version 1.0"
+
+def description():
+	return "Perform phylogenetic distance calculation for use with cartograms."
+
+def authors():
+	return "Alexander Keddy"
+
+def publicationDate():
+	return "September 9, 2015"
+
+def minimumVersionOfGenGIS():
+	return "2.4.2"
+
+def requireR():
+	return False
+
+def rDependencies():
+	return ""
+
+# Specifies the destination plugin menu (plugins or data) within GenGIS
+def pluginMenu():
+	return "plugins"
diff --git a/src/core/App.cpp b/src/core/App.cpp
index 5ca93dba..f1946de4 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.5.1" ) )
+	m_appVersion( wxT( "2.5.3" ) )
 
 {
 	m_colourMapManager.reset(new ColourMapManager());
diff --git a/src/core/App.hpp b/src/core/App.hpp
index f733c96f..c6969725 100644
--- a/src/core/App.hpp
+++ b/src/core/App.hpp
@@ -73,9 +73,11 @@ namespace GenGIS
 			V2_42 = 15,
 			V2_50 = 16,
 			V2_51= 17,
-			//V2_52=18,
+			V2_52=18,
+			V2_53=19,
+			//V2_54=20,
 			//
-			GENGIS_VERSION = V2_51,
+			GENGIS_VERSION = V2_53,
 			SAVE_VERSION   = V2_50 /* For serialization: The last version of GenGIS
 			                          whose session file is compatible with this release. */
 		};
diff --git a/src/core/Cartogram.cpp b/src/core/Cartogram.cpp
index 43574255..7c33cdf8 100644
--- a/src/core/Cartogram.cpp
+++ b/src/core/Cartogram.cpp
@@ -31,6 +31,8 @@
 #include "../core/LocationLayer.hpp"
 #include "../core/TreeLayer.hpp"
 #include "../core/GeoTreeView.hpp"
+#include "../core/PolygonModel.hpp"
+#include "../core/LocationPolygons.hpp"
 
 #include <iostream>
 #include <fstream>
@@ -117,7 +119,7 @@ template void Cartogram::serialize<boost::archive::text_wiarchive>(boost::archiv
 
 Cartogram::Cartogram()
 {	
-	valFudge=30;
+	valFudge=10;
 	areaFudge=5;
 	m_originalGrid = NULL;
 	m_originalLocations = NULL;
@@ -190,6 +192,7 @@ void Cartogram::MakeCartogram()
 		int load = App::Inst().GetLayerTreeController()->GetNumLocationSetLayers();
 		if (load > 0)
 			m_originalLocations = new Point3D*[App::Inst().GetLayerTreeController()->GetNumLocationSetLayers()];
+		
 		// need to account for No vector map
 		load = App::Inst().GetLayerTreeController()->GetNumVectorMapLayers();
 		if ( load > 0 )
@@ -321,6 +324,10 @@ void Cartogram::UndoCartogram()
 		std::vector<LocationLayerPtr> locationLayers = locationSetLayer->GetAllActiveLocationLayers();
 		LocationLayerPtr loc;
 		
+		if( i == 0 )
+		{
+			locationSetLayer->GetLocationPolygons()->SetPolygons(m_originalPolys);
+		}
 		for( uint l = 0; l < locationLayers.size() ; l++)
 		{
 			loc = locationLayers[l];
@@ -539,7 +546,7 @@ void Cartogram::PopulateRho(double **rho)
 	//			prime[y][x] += val*valFudge;
 				if(m_invert)
 				{
-					rho[y][x] += abs( invertValue - val*valFudge );
+						rho[y][x] += abs( invertValue - val ) *valFudge ;
 				}
 				else
 					rho[y][x] += val*valFudge;
@@ -641,13 +648,13 @@ void Cartogram::InterpolateVector(Matrix gridx, Matrix gridy, VectorMapControlle
 	
 	// code to write the vector points before and after the interpolation
 	int names = 0;
-	std::ofstream myfile;
+//	std::ofstream myfile;
 	std::string fileName = "C:/Users/Admin/Documents/GCPDPaper/Distance/252ReducedRunVectorPoints.csv";
-	try{
-	myfile.open(fileName.c_str(), std::ofstream::out);
-	}catch(std::ifstream::failure &writeErr){
-		Log::Inst().Warning("Could not open RHO file.");
-	}
+//	try{
+//	myfile.open(fileName.c_str(), std::ofstream::out);
+//	}catch(std::ifstream::failure &writeErr){
+//		Log::Inst().Warning("Could not open RHO file.");
+//	}
 
 	// g for geometries
 	for( uint g = 0; g< vMapModel->GetNumberOfGeometries(); g++ )
@@ -665,19 +672,91 @@ void Cartogram::InterpolateVector(Matrix gridx, Matrix gridy, VectorMapControlle
 				Xout  = nX/xsize*width + minWidth;
 				Zout = (nZ)/ysize*height + minHeight;
 
-				myfile << names + "," +
+/*				myfile << names + "," +
 					boost::lexical_cast<std::string>(geoVector->pointX[p]) + "," +
 					boost::lexical_cast<std::string>(geoVector->pointY[p]) + "," +
 					boost::lexical_cast<std::string>(Xout) + "," +
 					boost::lexical_cast<std::string>(Zout) + "\n";
-
+*/
 				geoVector->pointX[p] = Xout;
 				geoVector->pointY[p] = Zout;
 			}
-			myfile.flush();
+//			myfile.flush();
 		}
 	}
-	myfile.close();
+//	myfile.close();
+}
+
+void Cartogram::InterpolatePolygons(double* gridx, double* gridy, LocationPolygonsPtr locationGons, bool resize = false)
+{
+	double width = m_mapController->GetMapModel()->GetWidth();
+	double height = m_mapController->GetMapModel()->GetHeight();
+	double minWidth = -1*width/2;
+	double minHeight = -1*height/2;
+	int index = 0;
+	float X,Z,nX,nZ,Xout,Zout;
+
+	std::vector<PolygonModelPtr> polys = locationGons->GetPolygons();
+	for(int i=0; i< boost::size(polys); i++)
+	{
+		std::vector<Point3D> verts = polys[i]->modifiedVertices;
+		for(int vert=0; vert < boost::size(verts); vert++)
+		{
+			//warp the modified vertices and we're golden!		
+			Point3D gridCell = verts[vert];
+		
+			X = (gridCell.x - minWidth) / width * xsize;
+			Z = (gridCell.z - minHeight) / height *ysize;
+			if( X < xsize && X >=0 && Z < ysize && Z >= 0 )
+			{	
+				index = floor(Z)*(xsize+1) + floor(X);
+				nX = gridx[index];
+				nZ = gridy[index];
+				Xout  = nX/xsize*width + minWidth;
+				Zout = (nZ)/ysize*height + minHeight;
+				verts[vert].x = Xout;
+				verts[vert].z = Zout;
+			}
+		}
+		polys[i]->modifiedVertices = verts;
+	}
+	locationGons->SetPolygons(polys);
+}
+
+template< typename Matrix >
+void Cartogram::InterpolatePolygons(Matrix gridx, Matrix gridy, LocationPolygonsPtr locationGons, bool resize = false)
+{
+	double width = m_mapController->GetMapModel()->GetWidth();
+	double height = m_mapController->GetMapModel()->GetHeight();
+	double minWidth = -1*width/2;
+	double minHeight = -1*height/2;
+
+	float X,Z,nX,nZ,Xout,Zout;
+
+	std::vector<PolygonModelPtr> polys = locationGons->GetPolygons();
+	for(int i=0; i< boost::size(polys); i++)
+	{
+		std::vector<Point3D> verts = polys[i]->modifiedVertices;
+		for(int vert=0; vert < boost::size(verts); vert++)
+		{
+			//warp the modified vertices and we're golden!		
+			Point3D gridCell = verts[vert];
+		
+			X = (gridCell.x - minWidth) / width * xsize;
+			Z = (gridCell.z - minHeight) / height *ysize;
+			if( X < xsize && X >=0 && Z < ysize && Z >= 0 )
+			{	
+				nX = gridx[X][Z];
+				nZ = gridy[X][Z];
+				Xout  = nX/xsize*width + minWidth;
+				Zout = (nZ)/ysize*height + minHeight;
+				verts[vert].x = Xout;
+				verts[vert].z = Zout;
+			}
+		}
+		polys[i]->modifiedVertices = verts;
+	}
+	locationGons->SetPolygons(polys);
 }
 
 void Cartogram::InterpolateVector(double* gridx, double* gridy, VectorMapControllerPtr vectorMap)
@@ -693,13 +772,13 @@ void Cartogram::InterpolateVector(double* gridx, double* gridy, VectorMapControl
 	int index = 0;
 	// code to write the vector points before and after the interpolation
 	int names = 0;
-	std::ofstream myfile;
-	std::string fileName = "C:/Users/Admin/Documents/GCPDPaper/Distance/FullRunVectorPoints.csv";
-	try{
-	myfile.open(fileName.c_str(), std::ofstream::out);
-	}catch(std::ifstream::failure &writeErr){
-		Log::Inst().Warning("Could not open RHO file.");
-	}
+//	std::ofstream myfile;
+//	std::string fileName = "C:/Users/Admin/Documents/GCPDPaper/Distance/FullRunVectorPoints.csv";
+//	try{
+//	myfile.open(fileName.c_str(), std::ofstream::out);
+//	}catch(std::ifstream::failure &writeErr){
+//		Log::Inst().Warning("Could not open RHO file.");
+//	}
 
 	// g for geometries
 	for( uint g = 0; g< vMapModel->GetNumberOfGeometries(); g++ )
@@ -718,18 +797,18 @@ void Cartogram::InterpolateVector(double* gridx, double* gridy, VectorMapControl
 				
 				Xout  = nX/xsize*width + minWidth;
 				Zout = (nZ)/ysize*height + minHeight;
-				myfile << names + "," +
+			/*	myfile << names + "," +
 					boost::lexical_cast<std::string>(geoVector->pointX[p]) + "," +
 					boost::lexical_cast<std::string>(geoVector->pointY[p]) + "," +
 					boost::lexical_cast<std::string>(Xout) + "," +
 					boost::lexical_cast<std::string>(Zout) + "\n";
-				geoVector->pointX[p] = Xout;
+			*/	geoVector->pointX[p] = Xout;
 				geoVector->pointY[p] = Zout;
 			}
-			myfile.flush();
+		//	myfile.flush();
 		}
 	}
-	myfile.close();
+//	myfile.close();
 }
 
 
@@ -914,17 +993,18 @@ void Cartogram::WriteMatrix(Matrix rho, int row, int col, std::string name)
 	{
 		fileName = "C:/Users/Admin/Desktop/" + name + ".txt";
 	}
-	
+	/*
 	try{
 	myfile.open(fileName.c_str(), std::ofstream::out);
 	}catch(std::ifstream::failure &writeErr){
 		Log::Inst().Warning("Could not open RHO file.");
 	}
+
 	if(!myfile)
 	{
 		Log::Inst().Warning("Could not open RHO file.");
 	}
-
+	*/
 	for(int i = 0; i < row; i++)
 	{
 		for( int j = 0; j < col; j++)
@@ -1070,9 +1150,14 @@ void Cartogram::StdMain(double **rho)
 	{
 		locationSetLayer = App::Inst().GetLayerTreeController()->GetLocationSetLayer( m_locationSetLayerIndex[i] );
 	//	InterpolateLocations(gridx2d, gridy2d, locationSetLayer);
+	//	WriteLocations(locationSetLayer, "preDistort.txt");
 		InterpolateLocations(gridx, gridy, locationSetLayer);
+	//	WriteLocations(locationSetLayer, "postDistort.txt");
+
+		LocationPolygonsPtr locationsGons = locationSetLayer->GetLocationPolygons();
+		InterpolatePolygons(gridx, gridy,locationsGons);
+		locationsGons->Render();
 	}
-	WriteLocations(locationSetLayer,"DistortedLocations.txt");
 	// If there's a vector map, transform it!
 	VectorMapControllerPtr vectorController;
 	if( App::Inst().GetLayerTreeController()->GetNumVectorMapLayers() > 0 || boost::size(m_vectorMapIndex) > 0 )
@@ -1153,8 +1238,13 @@ void Cartogram::StdMain(double **rho, int origXSize, int origYSize)
 	{
 		locationSetLayer = App::Inst().GetLayerTreeController()->GetLocationSetLayer( m_locationSetLayerIndex[i] );	
 		InterpolateLocations(origXGrid, origYGrid, locationSetLayer,true);
+
+		LocationPolygonsPtr locationsGons = locationSetLayer->GetLocationPolygons();
+		InterpolatePolygons(origXGrid, origYGrid,locationsGons);
+		locationsGons->Render();
+
 	}
-	WriteLocations(locationSetLayer,"FasterDistortedLocations.txt");
+
 	// If there's a vector map, transform it!
 	VectorMapControllerPtr vectorController;
 	if( App::Inst().GetLayerTreeController()->GetNumVectorMapLayers() > 0 || boost::size(m_vectorMapIndex) > 0 )
@@ -1165,7 +1255,7 @@ void Cartogram::StdMain(double **rho, int origXSize, int origYSize)
 			InterpolateVector(origXGrid, origYGrid, vectorController);
 		}
 	}
-
+	
 	// free up space again
 //	free(origXGrid);
 //	free(origYGrid);
@@ -1241,8 +1331,13 @@ void Cartogram::SaveOriginalProjection()
 		m_originalLocations[i] = new Point3D[App::Inst().GetLayerTreeController()->GetLocationSetLayer(0)->GetNumLocationLayers()];
 		LocationSetLayerPtr locationSetLayer = App::Inst().GetLayerTreeController()->GetLocationSetLayer(i);
 		std::vector<LocationLayerPtr> locationLayers = locationSetLayer->GetAllActiveLocationLayers();
-		LocationLayerPtr loc;
-		
+		LocationLayerPtr loc;	
+
+		if( i == 0 )
+		{
+			std::vector<PolygonModelPtr> polys = locationSetLayer->GetLocationPolygons()->GetPolygons();
+			m_originalPolys = polys;
+		}
 		for( uint l = 0; l < locationLayers.size() ; l++)
 		{
 			loc = locationLayers[l];
@@ -1524,7 +1619,7 @@ void Cartogram::WriteLocations(LocationSetLayerPtr locationSetLayer,std::string
 	{
 		fileName = "C:/Users/Admin/Desktop/" + fh + ".txt";
 	}
-	
+	/*
 	try{
 	myfile.open(fileName.c_str(), std::ofstream::out);
 	}catch(std::ifstream::failure &writeErr){
@@ -1534,7 +1629,7 @@ void Cartogram::WriteLocations(LocationSetLayerPtr locationSetLayer,std::string
 	{
 		Log::Inst().Warning("Could not open RHO file.");
 	}
-
+	*/
 	std::vector<LocationLayerPtr> locationLayers = locationSetLayer->GetAllActiveLocationLayers();
 	LocationLayerPtr loc;
 	double easting;
diff --git a/src/core/Cartogram.hpp b/src/core/Cartogram.hpp
index 780d6bc9..87f5bbc7 100644
--- a/src/core/Cartogram.hpp
+++ b/src/core/Cartogram.hpp
@@ -108,6 +108,8 @@ namespace GenGIS
 		// save all vector layers
 		Point3D*** m_originalVector;
 
+		std::vector<PolygonModelPtr> m_originalPolys; 
+
 		template< typename Matrix >
 		double Combine(Matrix mat,int xsize, int ysize, std::string method);
 	
@@ -162,6 +164,10 @@ namespace GenGIS
 		void InterpolateVector(Matrix gridx, Matrix gridy, VectorMapControllerPtr vectorMap);
 		void InterpolateVector(double* gridx, double* gridy, VectorMapControllerPtr vectorMap);
 
+		template< typename Matrix >
+		void InterpolatePolygons(Matrix gridx, Matrix gridy, LocationPolygonsPtr locationGons, bool resize);
+		void InterpolatePolygons(double * gridx, double* gridy, LocationPolygonsPtr locationGons, bool resize);
+
 		/** Transform a 1D array to a 2D array in order to move between Cart and Interp steps. */
 		std::vector<std::vector<double>> ArrayTransform(double * grid);
 		template< typename Matrix >
diff --git a/src/core/PolygonModel.hpp b/src/core/PolygonModel.hpp
index 5cba04bd..eccbadfb 100644
--- a/src/core/PolygonModel.hpp
+++ b/src/core/PolygonModel.hpp
@@ -94,7 +94,11 @@ namespace GenGIS
 
 		//Draws a bezier curve using points p1 and p4 as anchor points and points p2 and p3 as control points
 		void DrawBezier(Point3D p1, Point3D p2, Point3D p3, Point3D p4, GLenum mode);
+		/*
+		std::vector<Point3D> getModifiedVertices(){return modifiedVertices;}
 
+		void setMoodifiedVerticies( std::vector<Point3D> mV ) { modifiedVertices = mV; }
+		*/
 	private:
 		/** Serialization. */
 		friend class boost::serialization::access;
diff --git a/src/gui/MapPropertiesDlg.cpp b/src/gui/MapPropertiesDlg.cpp
index ead9e5b6..48f89c31 100644
--- a/src/gui/MapPropertiesDlg.cpp
+++ b/src/gui/MapPropertiesDlg.cpp
@@ -149,10 +149,22 @@ void MapPropertiesDlg::InitColourMap()
 }
 
 void MapPropertiesDlg::InitCartogram()
-{
+{	
 	m_spinAreaFudge->SetValue(_T("5"));
 	m_spinValueFudge->SetValue(_T("10"));
 	
+	// X/Y size stuff
+	FileHeader* header =  m_mapLayer->GetMapController()->GetMapModel()->GetHeader();	
+	int xsize = header->nCols;
+	int ysize = header->nRows;
+
+	int areaFudge = m_spinAreaFudge->GetValue();
+	
+	std::wstring xFudge = StringTools::ToStringW(areaFudge) + _T('/') + StringTools::ToStringW(xsize);
+	std::wstring yFudge = StringTools::ToStringW(areaFudge) + _T('/') + StringTools::ToStringW(ysize);
+	m_lblAreaFudgeX->SetLabel(xFudge.c_str());
+	m_lblAreaFudgeY->SetLabel(yFudge.c_str());
+
 	// set up location set selection
 	int numSelections = App::Inst().GetLayerTreeController()->GetNumLocationSetLayers(); 
 //	m_cboSelectLocation->Append(_T("None"));
@@ -405,6 +417,24 @@ void MapPropertiesDlg::OnUndoCartogram( wxCommandEvent& event )
 {
 	m_cartogram->UndoCartogram();
 }
+
+
+// Change the Value of Area Fudge
+void MapPropertiesDlg::OnAreaFudge( wxCommandEvent& event )
+{
+// X/Y size stuff
+	FileHeader* header =  m_mapLayer->GetMapController()->GetMapModel()->GetHeader();	
+	int xsize = header->nCols;
+	int ysize = header->nRows;
+	
+	int areaFudge = m_spinAreaFudge->GetValue();
+	
+	std::wstring xFudge = StringTools::ToStringW(areaFudge) + _T('/') + StringTools::ToStringW(xsize);
+	std::wstring yFudge = StringTools::ToStringW(areaFudge) + _T('/') + StringTools::ToStringW(ysize);
+	m_lblAreaFudgeX->SetLabel(xFudge.c_str());
+	m_lblAreaFudgeY->SetLabel(yFudge.c_str());
+}
+
 // Toggle wether the density matrix is resized
 void MapPropertiesDlg::OnResizeToggle(wxCommandEvent& event)
 {
diff --git a/src/gui/MapPropertiesDlg.hpp b/src/gui/MapPropertiesDlg.hpp
index 3eb1f165..568a77c8 100644
--- a/src/gui/MapPropertiesDlg.hpp
+++ b/src/gui/MapPropertiesDlg.hpp
@@ -114,7 +114,7 @@ namespace GenGIS
 
 	//	void SetValueFudge( wxCommandEvent& event );
 		
-	//	void SetAreaFudge( wxCommandEvent& event );
+		void OnAreaFudge( wxCommandEvent& event );
 		
 		/** Select Which Location Set should be used for distortion. */
 		void OnCartogramSelectLocationSet( wxCommandEvent& event );
diff --git a/src/gui/MapPropertiesLayout.cpp b/src/gui/MapPropertiesLayout.cpp
index 79afb5a2..407e2ac9 100644
--- a/src/gui/MapPropertiesLayout.cpp
+++ b/src/gui/MapPropertiesLayout.cpp
@@ -235,7 +235,7 @@ MapPropertiesLayout::MapPropertiesLayout( wxWindow* parent, wxWindowID id, const
 	m_pnlSymbology->SetSizer( bSizer22 );
 	m_pnlSymbology->Layout();
 	bSizer22->Fit( m_pnlSymbology );
-	m_notebook->AddPage( m_pnlSymbology, wxT("Symbology"), true );
+	m_notebook->AddPage( m_pnlSymbology, wxT("Symbology"), false );
 	m_pnlCartogram = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer23;
 	bSizer23 = new wxBoxSizer( wxVERTICAL );
@@ -244,15 +244,31 @@ MapPropertiesLayout::MapPropertiesLayout( wxWindow* parent, wxWindowID id, const
 	sbSizer5 = new wxStaticBoxSizer( new wxStaticBox( m_pnlCartogram, wxID_ANY, wxT("Location Properties") ), wxVERTICAL );
 	
 	wxGridSizer* gSizer1;
-	gSizer1 = new wxGridSizer( 2, 2, 0, 0 );
+	gSizer1 = new wxGridSizer( 4, 2, 0, 0 );
 	
-	m_lblAreaFudge = new wxStaticText( m_pnlCartogram, wxID_ANY, wxT("Location Radius"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_lblAreaFudge = new wxStaticText( m_pnlCartogram, wxID_ANY, wxT("Location Radius (UTM)"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_lblAreaFudge->Wrap( -1 );
 	gSizer1->Add( m_lblAreaFudge, 0, wxALL, 5 );
 	
-	m_spinAreaFudge = new wxSpinCtrl( m_pnlCartogram, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 4 );
+	m_spinAreaFudge = new wxSpinCtrl( m_pnlCartogram, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 5 );
 	gSizer1->Add( m_spinAreaFudge, 0, wxALL, 5 );
 	
+	m_lblAreaFudgeXLabel = new wxStaticText( m_pnlCartogram, wxID_ANY, wxT("X:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
+	m_lblAreaFudgeXLabel->Wrap( -1 );
+	gSizer1->Add( m_lblAreaFudgeXLabel, 0, wxALL|wxALIGN_RIGHT, 5 );
+	
+	m_lblAreaFudgeX = new wxStaticText( m_pnlCartogram, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_lblAreaFudgeX->Wrap( -1 );
+	gSizer1->Add( m_lblAreaFudgeX, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_lblAreaFudgeYLabel = new wxStaticText( m_pnlCartogram, wxID_ANY, wxT("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_lblAreaFudgeYLabel->Wrap( -1 );
+	gSizer1->Add( m_lblAreaFudgeYLabel, 0, wxALL|wxALIGN_RIGHT, 5 );
+	
+	m_lblAreaFudgeY = new wxStaticText( m_pnlCartogram, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_lblAreaFudgeY->Wrap( -1 );
+	gSizer1->Add( m_lblAreaFudgeY, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
 	m_lblValueFudge = new wxStaticText( m_pnlCartogram, wxID_ANY, wxT("Variable Multiplier"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_lblValueFudge->Wrap( -1 );
 	gSizer1->Add( m_lblValueFudge, 0, wxALL, 5 );
@@ -345,7 +361,7 @@ MapPropertiesLayout::MapPropertiesLayout( wxWindow* parent, wxWindowID id, const
 	m_pnlCartogram->SetSizer( bSizer23 );
 	m_pnlCartogram->Layout();
 	bSizer23->Fit( m_pnlCartogram );
-	m_notebook->AddPage( m_pnlCartogram, wxT("Cartogram"), false );
+	m_notebook->AddPage( m_pnlCartogram, wxT("Cartogram"), true );
 	m_pnlMetadata = new wxPanel( m_notebook, ID_PNL_METADATA, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* m_sizerMetadata;
 	m_sizerMetadata = new wxBoxSizer( wxVERTICAL );
@@ -412,6 +428,8 @@ MapPropertiesLayout::MapPropertiesLayout( wxWindow* parent, wxWindowID id, const
 	m_cboInterpolation->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MapPropertiesLayout::OnInterpolationChange ), NULL, this );
 	m_spinNumEntries->Connect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( MapPropertiesLayout::OnNumEntriesChange ), NULL, this );
 	m_btnEvenlySpace->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MapPropertiesLayout::OnEvenlySpace ), NULL, this );
+	m_spinAreaFudge->Connect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( MapPropertiesLayout::OnAreaFudge ), NULL, this );
+	m_spinAreaFudge->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( MapPropertiesLayout::OnAreaFudge ), NULL, this );
 	m_radioOne->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( MapPropertiesLayout::OnCartValueToggle ), NULL, this );
 	m_radioTwo->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( MapPropertiesLayout::OnCartValueToggle ), NULL, this );
 	m_checkResize->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MapPropertiesLayout::OnResizeToggle ), NULL, this );
@@ -434,6 +452,8 @@ MapPropertiesLayout::~MapPropertiesLayout()
 	m_cboInterpolation->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MapPropertiesLayout::OnInterpolationChange ), NULL, this );
 	m_spinNumEntries->Disconnect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( MapPropertiesLayout::OnNumEntriesChange ), NULL, this );
 	m_btnEvenlySpace->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MapPropertiesLayout::OnEvenlySpace ), NULL, this );
+	m_spinAreaFudge->Disconnect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( MapPropertiesLayout::OnAreaFudge ), NULL, this );
+	m_spinAreaFudge->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( MapPropertiesLayout::OnAreaFudge ), NULL, this );
 	m_radioOne->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( MapPropertiesLayout::OnCartValueToggle ), NULL, this );
 	m_radioTwo->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( MapPropertiesLayout::OnCartValueToggle ), NULL, this );
 	m_checkResize->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MapPropertiesLayout::OnResizeToggle ), NULL, this );
diff --git a/src/gui/MapPropertiesLayout.h b/src/gui/MapPropertiesLayout.h
index 8ef3948b..e8966166 100644
--- a/src/gui/MapPropertiesLayout.h
+++ b/src/gui/MapPropertiesLayout.h
@@ -112,6 +112,10 @@ namespace GenGIS
 			wxPanel* m_pnlCartogram;
 			wxStaticText* m_lblAreaFudge;
 			wxSpinCtrl* m_spinAreaFudge;
+			wxStaticText* m_lblAreaFudgeXLabel;
+			wxStaticText* m_lblAreaFudgeX;
+			wxStaticText* m_lblAreaFudgeYLabel;
+			wxStaticText* m_lblAreaFudgeY;
 			wxStaticText* m_lblValueFudge;
 			wxSpinCtrl* m_spinValueFudge;
 			wxStaticText* m_lblSelectLocation;
@@ -145,6 +149,8 @@ namespace GenGIS
 			virtual void OnInterpolationChange( wxCommandEvent& event ) { event.Skip(); }
 			virtual void OnNumEntriesChange( wxSpinEvent& event ) { event.Skip(); }
 			virtual void OnEvenlySpace( wxCommandEvent& event ) { event.Skip(); }
+			virtual void OnAreaFudge( wxSpinEvent& event ) { event.Skip(); }
+			virtual void OnAreaFudge( wxCommandEvent& event ) { event.Skip(); }
 			virtual void OnCartValueToggle( wxCommandEvent& event ) { event.Skip(); }
 			virtual void OnResizeToggle( wxCommandEvent& event ) { event.Skip(); }
 			virtual void OnSetResizePercent( wxSpinEvent& event ) { event.Skip(); }
diff --git a/win32/InnoInstaller/GenGIS.iss b/win32/InnoInstaller/GenGIS.iss
index 66bc7235..da06f503 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={{4E7EA3FD-F4D5-489B-9471-63722BA8912A}
+AppId={{67994071-4E1E-4B1A-9F89-DDD17D6EC03B}
 AppName=GenGIS
-AppVerName=GenGIS v2.5.1
+AppVerName=GenGIS v2.5.3
 ; 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.5.1
-DefaultGroupName=GenGIS2.5.1
+DefaultDirName={pf}\GenGIS2.5.3
+DefaultGroupName=GenGIS2.5.3
 AllowNoIcons=yes
 LicenseFile=..\..\bin\license.txt
 OutputDir=..\..\win32\InnoInstaller\Setup