Skip to content

Commit

Permalink
Merge pull request #6 from MesquiteProject/development
Browse files Browse the repository at this point in the history 
Version 1.51
  • Loading branch information
@DMaddison
DMaddison authored Mar 18, 2017
2 parents 00e9a2b + ba8f2cd commit 1acb590
Show file tree
Hide file tree
Showing 25 changed files with 54 additions and 97 deletions.
2 changes: 1 addition & 1 deletion Source/mesquite/cartographer/ImportLongLats/ImportLongLats.java
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Source/mesquite/cartographer/NodeLocsLongLat/NodeLocsLongLat.java
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/Templates/standard.dwt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<div id="masthead">
<div id="banner"><img src="../splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- TemplateBeginEditable name="subtitle" -->subtitle<!-- TemplateEndEditable --></div>

Expand Down
2 changes: 1 addition & 1 deletion Source/mesquite/cartographer/aCartographerIntro/aCartographerIntro.java
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/* Mesquite.cartographer source code. Copyright 2008-2009 D. Maddison and W. Maddison. Version 1.3, June 2008.Disclaimer: The Mesquite source code is lengthy and we are few. There are no doubt inefficiencies and goofs in this code. The commenting leaves much to be desired. Please approach this source code with the spirit of helping out.Perhaps with your help we can be more than a few, and make Mesquite better.Mesquite is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.Mesquite's web site is http://mesquiteproject.orgThis source code and its compiled class files are free and modifiable under the terms of GNU Lesser General Public License. (http://www.gnu.org/copyleft/lesser.html)*/package mesquite.cartographer.aCartographerIntro;import mesquite.lib.MesquiteTrunk;import mesquite.lib.duties.*;/* ======================================================================== */public class aCartographerIntro extends PackageIntro { /*.................................................................................................................*/ public boolean startJob(String arguments, Object condition, boolean hiredByName) { return true; } public Class getDutyClass(){ return aCartographerIntro.class; } /*.................................................................................................................*/ public String getExplanation() { return "Cartographer is a package of Mesquite modules providing tools for plotting data in geographic space."; } /*.................................................................................................................*/ public String getName() { return "Cartographer Package"; } /*.................................................................................................................*/ /** Returns the name of the package of modules (e.g., "Basic Mesquite Package", "Rhetenor")*/ public String getPackageName(){ return "Cartographer Package"; } /*.................................................................................................................*/ /** Returns citation for a package of modules*/ public String getPackageCitation(){ return "Maddison, D.R., & W.P. Maddison. 2017. Cartographer: A Mesquite package for plotting geographic data. Version " + getPackageVersion() +" http://mesquiteproject.org/packages/cartographer"; } /*.................................................................................................................*/ /** Returns whether there is a splash banner*/ public boolean hasSplash(){ return true; } /*.................................................................................................................*/ /** returns the URL of the notices file for this module so that it can phone home and check for messages */ /*.................................................................................................................*/ public String getHomePhoneNumber(){ if (!isPrerelease()) return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/master/noticesAndUpdates/notices.xml"; else if (MesquiteTrunk.debugMode) return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/development/noticesAndUpdates/noticesDebug.xml"; else return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/development/noticesAndUpdates/notices.xml"; } /*.................................................................................................................*/ public String getPackageURL(){ return "http://mesquiteproject.org/packages/cartographer"; } /*.................................................................................................................*/ /** returns whether this module is a prerelease version. This returns "TRUE" here, forcing modules to override to claim they are not prerelease */ public boolean isPrerelease(){ return false; } /*.................................................................................................................*/ /** Returns version for a package of modules*/ public String getPackageVersion(){ return "1.50"; } /*.................................................................................................................*/ /** Returns version for a package of modules as an integer*/ public int getPackageVersionInt(){ return 150; } public String getPackageDateReleased(){ return "1 January 2017"; } /*.................................................................................................................*/ /** Returns build number for a package of modules as an integer*/ public int getPackageBuildNumber(){ return 30; } /* release dates: v1.0 5 May 2006 v1.2 19 September 2007 v1.3 8 June 2008 v1.31 1 January 2009 v1.4 19 August 2014 v1.41 29 August 2014 v1.50 1 January 2017 (build 30) * */ /*.................................................................................................................*/ public int getVersionOfFirstRelease(){ return 260; }}
/* Mesquite.cartographer source code. Copyright 2008-2009 D. Maddison and W. Maddison. Version 1.3, June 2008.Disclaimer: The Mesquite source code is lengthy and we are few. There are no doubt inefficiencies and goofs in this code. The commenting leaves much to be desired. Please approach this source code with the spirit of helping out.Perhaps with your help we can be more than a few, and make Mesquite better.Mesquite is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.Mesquite's web site is http://mesquiteproject.orgThis source code and its compiled class files are free and modifiable under the terms of GNU Lesser General Public License. (http://www.gnu.org/copyleft/lesser.html)*/package mesquite.cartographer.aCartographerIntro;import mesquite.lib.MesquiteTrunk;import mesquite.lib.duties.*;/* ======================================================================== */public class aCartographerIntro extends PackageIntro { /*.................................................................................................................*/ public boolean startJob(String arguments, Object condition, boolean hiredByName) { return true; } public Class getDutyClass(){ return aCartographerIntro.class; } /*.................................................................................................................*/ public String getExplanation() { return "Cartographer is a package of Mesquite modules providing tools for plotting data in geographic space."; } /*.................................................................................................................*/ public String getName() { return "Cartographer Package"; } /*.................................................................................................................*/ /** Returns the name of the package of modules (e.g., "Basic Mesquite Package", "Rhetenor")*/ public String getPackageName(){ return "Cartographer Package"; } /*.................................................................................................................*/ /** Returns citation for a package of modules*/ public String getPackageCitation(){ return "Maddison, D.R., & W.P. Maddison. 2017. Cartographer: A Mesquite package for plotting geographic data. Version " + getPackageVersion() +" http://mesquiteproject.org/packages/cartographer"; } /*.................................................................................................................*/ /** Returns whether there is a splash banner*/ public boolean hasSplash(){ return true; } /*.................................................................................................................*/ /** returns the URL of the notices file for this module so that it can phone home and check for messages */ /*.................................................................................................................*/ public String getHomePhoneNumber(){ if (!isPrerelease()) return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/master/noticesAndUpdates/notices.xml"; else if (MesquiteTrunk.debugMode) return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/development/noticesAndUpdates/noticesDebug.xml"; else return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/development/noticesAndUpdates/notices.xml"; } /*.................................................................................................................*/ public String getPackageURL(){ return "http://mesquiteproject.org/packages/cartographer"; } /*.................................................................................................................*/ /** returns whether this module is a prerelease version. This returns "TRUE" here, forcing modules to override to claim they are not prerelease */ public boolean isPrerelease(){ return false; } /*.................................................................................................................*/ /** Returns version for a package of modules*/ public String getPackageVersion(){ return "1.51"; } /*.................................................................................................................*/ /** Returns version for a package of modules as an integer*/ public int getPackageVersionInt(){ return 151; } public String getPackageDateReleased(){ return "18 March 2017"; } /*.................................................................................................................*/ /** Returns build number for a package of modules as an integer*/ public int getPackageBuildNumber(){ return 32; } /* release dates: v1.0 5 May 2006 v1.2 19 September 2007 v1.3 8 June 2008 v1.31 1 January 2009 v1.4 19 August 2014 v1.41 29 August 2014 v1.50 1 January 2017 (build 30) * */ /*.................................................................................................................*/ public int getVersionOfFirstRelease(){ return 260; }}
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/acknowledgements.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Acknowledgements</em></font><!-- #EndEditable --></div>

Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/ancestral.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Ancestral
Locations</em></font><!-- #EndEditable --></div>
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/calibration.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Calibration
&amp; Parameters</em></font><!-- #EndEditable --></div>
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/citation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Citing Cartographer</em></font><!-- #EndEditable --></div>

Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/data.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Adding
and Editing Data</em></font><!-- #EndEditable --></div>
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/display.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Display Options</em></font><!-- #EndEditable --></div>

Expand Down
8 changes: 4 additions & 4 deletions Source/mesquite/cartographer/aCartographerIntro/download.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Download</em></font><!-- #EndEditable --></div>

Expand All @@ -36,7 +36,7 @@
<p><font face="Trebuchet MS"> Mesquite Cartographer is free software,
and may be redistributed and modified under the terms of the <a href="http://www.gnu.org/copyleft/lesser.html">GNU
Lesser General Public License</a>. Source code
is available from the GitHub repository at </font><a href="https://github.com/MesquiteProject/Cartographer">https://github.com/MesquiteProject/Cartographer</a>. See the <a href="https://mesquiteproject.wikispaces.com/Source+Code">Mesquite documentation</a> for obtaining the Mesquite source and for installation procedured for sources of other packages such as Cartographer.</p>
is available from the GitHub repository at </font><a href="https://github.com/MesquiteProject/Cartographer">https://github.com/MesquiteProject/Cartographer</a>. See the <a href="https://mesquiteproject.wikispaces.com/Source+Code">Mesquite documentation</a> for obtaining the Mesquite source and for installation procedured for sources of other packages such as Cartographer. </p>
<p><font face="Trebuchet MS">The same license
may also apply to specialized packages of modules. </font></p>
<font face="Trebuchet MS">
Expand All @@ -58,7 +58,7 @@
Cartographer requires <a href="https://mesquiteproject.wikispaces.com">Mesquite
3.2</a> and higher, and Java 1.6
or higher.</font></p>
<p>To download the latest version of Cartographer, go to the <a href="https://github.com/MesquiteProject/Cartographer/releases">releases page</a>, and download the latest release by pressing the appropriate green button. We suggest you download the <strong>zip</strong> version if you have MacOSX or Windows, and the <strong>tgz</strong> version if you have a Linux system. </p>
<p>To download the latest version of Cartographer, go to the <a href="https://github.com/MesquiteProject/Cartographer/releases">releases page</a>, and download the latest release. We suggest you download <strong>cartographer.zip</strong> if you have MacOSX or Windows, and <strong>cartographer</strong>.<strong>tgz</strong> version if you have a Linux system. Note that the source code is not what you want unless you know how to turn it into the working program.</p>
<font face="Trebuchet MS"></font>
<p><font face="Trebuchet MS">To install Cartographer, open up the
downloaded file, find the directory contained therein
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/files.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Saving Graphics Files</em></font><!-- #EndEditable --></div>

Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/gettingStarted.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Getting
Started</em></font><!-- #EndEditable --></div>
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/googleEarth.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Export to Google Earth</em></font><!-- #EndEditable --></div>

Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<div id="masthead">
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
1 January 2017</font><BR>
<font id="version">Version 1.51<br>
18 March 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Introduction</em></font><!-- #EndEditable --></div>

Expand Down
Loading

0 comments on commit 1acb590

Please sign in to comment.