diff --git a/Leaflet.PithEstimate.js b/Leaflet.PithEstimate.js index abed716..e7769af 100644 --- a/Leaflet.PithEstimate.js +++ b/Leaflet.PithEstimate.js @@ -1079,8 +1079,8 @@ function NewCcmEstimate(Inte) { * @param {object} Inte - PithEstimateInterface object. Allows access to all other tools. */ function NewCcmEstimateDialog(Inte) { - let minWidth = 320; - let minHeight = 500; + let minWidth = 324; + let minHeight = 400; this.size = [minWidth, minHeight]; this.anchor = [50, 0]; @@ -1146,6 +1146,12 @@ function NewCcmEstimateDialog(Inte) { } NewCcmEstimateDialog.prototype.createEventListeners = function() { + $("#PithEstimate-instruction-button").on("click", () => { + $("#PithEstimate-instruction-container").toggle(); + $("#PithEstimate-instruction-icon-plus").toggle(); + $("#PithEstimate-instruction-icon-minus").toggle(); + }); + $("#PithEstimate-numShownCircles-input").on("input", () => { Inte.newCcmEstimate.numShownCircles = $("#PithEstimate-numShownCircles-input").val(); diff --git a/Style.PithEstimate.css b/Style.PithEstimate.css index b118b12..da86f3d 100644 --- a/Style.PithEstimate.css +++ b/Style.PithEstimate.css @@ -26,7 +26,7 @@ } .PithEstimate-table th { - background-color: #d9f0a3; + background-color: #eeffc6; } .PithEstimate-table tr:nth-child(even) { @@ -158,3 +158,27 @@ font-weight: normal; } +.PithEstimate-text-background { + background-color: #f3f3f3; + border-radius: 10px; + margin-bottom: 8px; + padding: 6px; +} + +.PithEstimate-instruction-text { + margin-bottom: 6px; +} + +#PithEstimate-instruction-button { + border: none; + border-radius: 4px; + background-color: #eeffc6; + + font-weight: bold; + + margin-bottom: 6px; +} + +#PithEstimate-instruction-button:hover { + background-color: #e1fca4; +} \ No newline at end of file diff --git a/Template.PithEstimate.html b/Template.PithEstimate.html index 1987669..5b7caf0 100644 --- a/Template.PithEstimate.html +++ b/Template.PithEstimate.html @@ -88,9 +88,32 @@

Estimate pith offset dynamically using concentric circles, after Applequist 1958, Journal of Forestry.
- See instructions below.

-
+ +
+ + +
+ +
Number of rings used for estimation: @@ -125,30 +148,30 @@
- +
+ + + + + + + + + + + + + +
AttributePresentEst. MissingEst. Total
Radius
Years
Radius %
Years %
+ +
\ No newline at end of file diff --git a/_site/leaflet-treering.js b/_site/leaflet-treering.js index c7a1d71..3109220 100644 --- a/_site/leaflet-treering.js +++ b/_site/leaflet-treering.js @@ -155,7 +155,7 @@ function LTreering (viewer, basePath, options, base_layer, gl_layer, fullJSON) { $(map.getContainer()).css('cursor', 'default'); L.control.layers(this.baseLayer, this.overlay).addTo(this.viewer); - $(".leaflet-control-layers-selector")[0].click(); + //$(".leaflet-control-layers-selector")[0].click(); // if popout is opened display measuring tools if (window.name.includes('popout')) { diff --git a/leaflet-treering.js b/leaflet-treering.js index c7a1d71..3109220 100644 --- a/leaflet-treering.js +++ b/leaflet-treering.js @@ -155,7 +155,7 @@ function LTreering (viewer, basePath, options, base_layer, gl_layer, fullJSON) { $(map.getContainer()).css('cursor', 'default'); L.control.layers(this.baseLayer, this.overlay).addTo(this.viewer); - $(".leaflet-control-layers-selector")[0].click(); + //$(".leaflet-control-layers-selector")[0].click(); // if popout is opened display measuring tools if (window.name.includes('popout')) {