v 0.8.19b

This commit is contained in:
Azgaar 2019-05-09 23:59:27 +03:00
parent 3e4c2662ef
commit f7a9485da4
2 changed files with 15 additions and 3 deletions

View file

@ -370,6 +370,18 @@ function parseLoadedData(data) {
if (scaleBar.style("display") !== "none") turnButtonOn("toggleScaleBar"); else turnButtonOff("toggleScaleBar"); if (scaleBar.style("display") !== "none") turnButtonOn("toggleScaleBar"); else turnButtonOff("toggleScaleBar");
}() }()
void function restoreRulersEvents() {
ruler.selectAll("g").call(d3.drag().on("start", dragRuler));
ruler.selectAll("text").on("click", removeParent);
ruler.selectAll("g.ruler circle").call(d3.drag().on("drag", dragRulerEdge));
ruler.selectAll("g.ruler circle").call(d3.drag().on("drag", dragRulerEdge));
ruler.selectAll("g.ruler rect").call(d3.drag().on("start", rulerCenterDrag));
ruler.selectAll("g.opisometer circle").call(d3.drag().on("start", dragOpisometerEnd));
ruler.selectAll("g.opisometer circle").call(d3.drag().on("start", dragOpisometerEnd));
}()
changeMapSize(); changeMapSize();
restoreDefaultEvents(); restoreDefaultEvents();
invokeActiveZooming(); invokeActiveZooming();

View file

@ -8,7 +8,7 @@ function addRuler(x1, y1, x2, y2) {
const dash = rn(30 / distanceScale.value, 2); const dash = rn(30 / distanceScale.value, 2);
// body // body
const rulerNew = ruler.append("g").call(d3.drag().on("start", dragRuler)); const rulerNew = ruler.append("g").attr("class", "ruler").call(d3.drag().on("start", dragRuler));
rulerNew.append("line").attr("x1", x1).attr("y1", y1).attr("x2", x2).attr("y2", y2).attr("class", "white").attr("stroke-width", size); rulerNew.append("line").attr("x1", x1).attr("y1", y1).attr("x2", x2).attr("y2", y2).attr("class", "white").attr("stroke-width", size);
rulerNew.append("line").attr("x1", x1).attr("y1", y1).attr("x2", x2).attr("y2", y2).attr("class", "gray").attr("stroke-width", size).attr("stroke-dasharray", dash); rulerNew.append("line").attr("x1", x1).attr("y1", y1).attr("x2", x2).attr("y2", y2).attr("class", "gray").attr("stroke-width", size).attr("stroke-dasharray", dash);
rulerNew.append("circle").attr("r", 2 * size).attr("stroke-width", .5 * size).attr("cx", x1).attr("cy", y1).attr("data-edge", "left").call(d3.drag().on("drag", dragRulerEdge)); rulerNew.append("circle").attr("r", 2 * size).attr("stroke-width", .5 * size).attr("cx", x1).attr("cy", y1).attr("data-edge", "left").call(d3.drag().on("drag", dragRulerEdge));
@ -115,7 +115,7 @@ function drawOpisometer() {
const points = [[p0[0], p0[1]]]; const points = [[p0[0], p0[1]]];
let length = 0; let length = 0;
const rulerNew = ruler.append("g").call(d3.drag().on("start", dragRuler)); const rulerNew = ruler.append("g").attr("class", "opisometer").call(d3.drag().on("start", dragRuler));
const curve = rulerNew.append("path").attr("class", "white").attr("stroke-width", size); const curve = rulerNew.append("path").attr("class", "white").attr("stroke-width", size);
const curveGray = rulerNew.append("path").attr("class", "gray").attr("stroke-width", size).attr("stroke-dasharray", dash); const curveGray = rulerNew.append("path").attr("class", "gray").attr("stroke-width", size).attr("stroke-dasharray", dash);
const text = rulerNew.append("text").attr("dy", "-.3em").attr("font-size", 10 * size).on("click", removeParent); const text = rulerNew.append("text").attr("dy", "-.3em").attr("font-size", 10 * size).on("click", removeParent);
@ -198,7 +198,7 @@ function drawPlanimeter() {
const p0 = d3.mouse(this); const p0 = d3.mouse(this);
const points = [[p0[0], p0[1]]]; const points = [[p0[0], p0[1]]];
const rulerNew = ruler.append("g").call(d3.drag().on("start", dragRuler)); const rulerNew = ruler.append("g").attr("class", "planimeter").call(d3.drag().on("start", dragRuler));
const curve = rulerNew.append("path").attr("class", "planimeter").attr("stroke-width", size); const curve = rulerNew.append("path").attr("class", "planimeter").attr("stroke-width", size);
const text = rulerNew.append("text").attr("font-size", 10 * size).on("click", removeParent); const text = rulerNew.append("text").attr("font-size", 10 * size).on("click", removeParent);