From 67a02ff08da59a9be8d3de02534551933f508ac7 Mon Sep 17 00:00:00 2001 From: "dan.pop" Date: Thu, 12 Oct 2017 14:54:51 +0300 Subject: [PATCH 01/10] TVB-2307 Fixed check button on Simulator - Configure Interface --- tvb/interfaces/web/static/js/bursts.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tvb/interfaces/web/static/js/bursts.js b/tvb/interfaces/web/static/js/bursts.js index f0cc4598e..dafb99c40 100644 --- a/tvb/interfaces/web/static/js/bursts.js +++ b/tvb/interfaces/web/static/js/bursts.js @@ -415,9 +415,9 @@ function configureSimulator(configureHref) { function toggleSimulatorParametersChecks(beChecked) { $(".param-config-checkbox").each(function () { if (beChecked) { - $(this).attr("checked", 'true'); + $(this).prop( "checked", true); } else { - $(this).removeAttr('checked'); + $(this).prop( "checked", false); } }); } From 0e7f7cf580691288413973cf18b77acf04d626b1 Mon Sep 17 00:00:00 2001 From: "dan.pop" Date: Thu, 12 Oct 2017 14:54:51 +0300 Subject: [PATCH 02/10] TVB-2307 Fixed check button on Simulator - Configure Interface --- tvb/interfaces/web/static/js/bursts.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tvb/interfaces/web/static/js/bursts.js b/tvb/interfaces/web/static/js/bursts.js index f0cc4598e..dafb99c40 100644 --- a/tvb/interfaces/web/static/js/bursts.js +++ b/tvb/interfaces/web/static/js/bursts.js @@ -415,9 +415,9 @@ function configureSimulator(configureHref) { function toggleSimulatorParametersChecks(beChecked) { $(".param-config-checkbox").each(function () { if (beChecked) { - $(this).attr("checked", 'true'); + $(this).prop( "checked", true); } else { - $(this).removeAttr('checked'); + $(this).prop( "checked", false); } }); } From e19375909c449a03556d39a5646d13d97ca35e13 Mon Sep 17 00:00:00 2001 From: "dan.pop" Date: Fri, 13 Oct 2017 13:46:11 +0300 Subject: [PATCH 03/10] TVB-2311 added correct offsets and event for the portlet toolTip --- tvb/interfaces/web/static/js/parameterSpace.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tvb/interfaces/web/static/js/parameterSpace.js b/tvb/interfaces/web/static/js/parameterSpace.js index ab7665d93..6c0330af2 100644 --- a/tvb/interfaces/web/static/js/parameterSpace.js +++ b/tvb/interfaces/web/static/js/parameterSpace.js @@ -707,13 +707,23 @@ function d3Plot(placeHolder, data, options, pageParam) { */ d3.selectAll("circle") .on("mouseover", function (d) { + d3.event = window.event; + var offsetX = d3.event.pageX; + var offsetY = d3.event.pageY - 100; + var portletContainer = document.getElementById("section-pse"); + if (portletContainer) { + var relativeOffsetLeft = portletContainer.offsetLeft; + var relativeOffsetTop = portletContainer.offsetTop; + offsetX = offsetX - relativeOffsetLeft; + offsetY = offsetY - relativeOffsetTop; + } var nodeInfo = getNodeInfo(d.coords); var toolTipText = nodeInfo.tooltip.split("&").join("&").split("<").join("<").split(">").join(">"); toolTipDiv.html(toolTipText); toolTipDiv.style({ position: "absolute", - left: (d3.event.pageX) + "px", - top: (d3.event.pageY - 100) + "px", + left: (offsetX) + "px", + top: (offsetY) + "px", display: "block", 'background-color': '#C0C0C0', border: '1px solid #fdd', From f95924158fee5b7572c1d9399f31e285b07914c5 Mon Sep 17 00:00:00 2001 From: "dan.pop" Date: Fri, 13 Oct 2017 14:55:58 +0300 Subject: [PATCH 04/10] TVB-2310 translated svg so values are displayed entirely --- tvb/interfaces/web/static/js/parameterSpace.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tvb/interfaces/web/static/js/parameterSpace.js b/tvb/interfaces/web/static/js/parameterSpace.js index 6c0330af2..c84dbb10b 100644 --- a/tvb/interfaces/web/static/js/parameterSpace.js +++ b/tvb/interfaces/web/static/js/parameterSpace.js @@ -59,7 +59,7 @@ function _updatePlotPSE(canvasId, xLabels, yLabels, xValues, yValues, seriesArra margins: { // is this the correct way to be doing margins? It's just how I have in the past, top: 20, bottom: 40, - left: 20, + left: 50, right: 50 }, xaxis: { @@ -400,7 +400,7 @@ function d3Plot(placeHolder, data, options, pageParam) { yAxisClip = canvas.append("svg:clipPath") .attr("id", "yClip") .append("svg:rect") - .attr("x", -_PSE_plotOptions.margins.left * 2)// these two areas are simply selected for what they accomplish visually. I wonder if there could be a real connection to the values used for arranging the canvas + .attr("x", -_PSE_plotOptions.margins.left)// these two areas are simply selected for what they accomplish visually. I wonder if there could be a real connection to the values used for arranging the canvas .attr("y", _PSE_plotOptions.margins.top) .attr("width", _PSE_plotOptions.margins.right)// .attr("height", innerHeight - _PSE_plotOptions.margins.bottom - _PSE_plotOptions.margins.top); From 3f563e624696deaefd8ad64da4d7444a153a4c0b Mon Sep 17 00:00:00 2001 From: "dan.pop" Date: Fri, 13 Oct 2017 17:37:25 +0300 Subject: [PATCH 05/10] TVB-2300 removed unnecessary scrollbars and moved toolTip on top. --- tvb/interfaces/web/static/js/parameterSpace.js | 18 +++++++++--------- tvb/interfaces/web/static/style/base.css | 7 +++++++ .../web/static/style/section_visualisers.css | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/tvb/interfaces/web/static/js/parameterSpace.js b/tvb/interfaces/web/static/js/parameterSpace.js index c84dbb10b..8c69abde0 100644 --- a/tvb/interfaces/web/static/js/parameterSpace.js +++ b/tvb/interfaces/web/static/js/parameterSpace.js @@ -707,18 +707,17 @@ function d3Plot(placeHolder, data, options, pageParam) { */ d3.selectAll("circle") .on("mouseover", function (d) { - d3.event = window.event; - var offsetX = d3.event.pageX; - var offsetY = d3.event.pageY - 100; - var portletContainer = document.getElementById("section-pse"); + let offsetX = window.event.pageX; + let offsetY = window.event.pageY - 100; + const portletContainer = document.getElementById("section-pse"); if (portletContainer) { - var relativeOffsetLeft = portletContainer.offsetLeft; - var relativeOffsetTop = portletContainer.offsetTop; + let relativeOffsetLeft = portletContainer.offsetLeft; + let relativeOffsetTop = portletContainer.offsetTop; offsetX = offsetX - relativeOffsetLeft; offsetY = offsetY - relativeOffsetTop; } - var nodeInfo = getNodeInfo(d.coords); - var toolTipText = nodeInfo.tooltip.split("&").join("&").split("<").join("<").split(">").join(">"); + let nodeInfo = getNodeInfo(d.coords); + let toolTipText = nodeInfo.tooltip.split("&").join("&").split("<").join("<").split(">").join(">"); toolTipDiv.html(toolTipText); toolTipDiv.style({ position: "absolute", @@ -728,7 +727,8 @@ function d3Plot(placeHolder, data, options, pageParam) { 'background-color': '#C0C0C0', border: '1px solid #fdd', padding: '2px', - opacity: 0.80 + opacity: 0.80, + 'z-index': 999 }) }) .on("mouseout", function (d) { diff --git a/tvb/interfaces/web/static/style/base.css b/tvb/interfaces/web/static/style/base.css index d3bef535c..04ac902ae 100644 --- a/tvb/interfaces/web/static/style/base.css +++ b/tvb/interfaces/web/static/style/base.css @@ -1068,6 +1068,13 @@ top: 75px; height: 100%; } +#section-pse.view-column.col-3{ + overflow-y: hidden !important; +} +#section-portlets.view-column.col-3{ + overflow-y: hidden !important; +} + #main.columnized .view-column { background: rgba(250, 247, 228, 0.1); float: left; diff --git a/tvb/interfaces/web/static/style/section_visualisers.css b/tvb/interfaces/web/static/style/section_visualisers.css index a78e6f01c..9d1bb44a7 100644 --- a/tvb/interfaces/web/static/style/section_visualisers.css +++ b/tvb/interfaces/web/static/style/section_visualisers.css @@ -134,7 +134,7 @@ div.flot-tick-label { height: 85%; position: relative; top: 5%; - overflow: auto; + overflow: hidden; } .topographic_canvas { From 9dd011862a176744a3b6ba2cba6602d4aa8f3ac0 Mon Sep 17 00:00:00 2001 From: Lia Domide Date: Mon, 16 Oct 2017 09:54:50 +0300 Subject: [PATCH 06/10] Revert changes in base.css --- tvb/interfaces/web/static/style/base.css | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tvb/interfaces/web/static/style/base.css b/tvb/interfaces/web/static/style/base.css index 04ac902ae..1e7b1839e 100644 --- a/tvb/interfaces/web/static/style/base.css +++ b/tvb/interfaces/web/static/style/base.css @@ -1068,13 +1068,6 @@ top: 75px; height: 100%; } -#section-pse.view-column.col-3{ - overflow-y: hidden !important; -} -#section-portlets.view-column.col-3{ - overflow-y: hidden !important; -} - #main.columnized .view-column { background: rgba(250, 247, 228, 0.1); float: left; @@ -2678,4 +2671,4 @@ position: absolute; -webkit-box-shadow: 2px 2px 10px 0 rgba(0, 0, 0, 0.7); -moz-box-shadow: 2px 2px 10px 0 rgba(0, 0, 0, 0.7); box-shadow: 2px 2px 10px 0 rgba(0, 0, 0, 0.7); -} \ No newline at end of file +} From 57e4ee005aae49376f74e74cc37d4294253f4440 Mon Sep 17 00:00:00 2001 From: "dan.pop" Date: Fri, 13 Oct 2017 13:46:11 +0300 Subject: [PATCH 07/10] TVB-2311 added correct offsets and event for the portlet toolTip --- tvb/interfaces/web/static/js/parameterSpace.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tvb/interfaces/web/static/js/parameterSpace.js b/tvb/interfaces/web/static/js/parameterSpace.js index ab7665d93..6c0330af2 100644 --- a/tvb/interfaces/web/static/js/parameterSpace.js +++ b/tvb/interfaces/web/static/js/parameterSpace.js @@ -707,13 +707,23 @@ function d3Plot(placeHolder, data, options, pageParam) { */ d3.selectAll("circle") .on("mouseover", function (d) { + d3.event = window.event; + var offsetX = d3.event.pageX; + var offsetY = d3.event.pageY - 100; + var portletContainer = document.getElementById("section-pse"); + if (portletContainer) { + var relativeOffsetLeft = portletContainer.offsetLeft; + var relativeOffsetTop = portletContainer.offsetTop; + offsetX = offsetX - relativeOffsetLeft; + offsetY = offsetY - relativeOffsetTop; + } var nodeInfo = getNodeInfo(d.coords); var toolTipText = nodeInfo.tooltip.split("&").join("&").split("<").join("<").split(">").join(">"); toolTipDiv.html(toolTipText); toolTipDiv.style({ position: "absolute", - left: (d3.event.pageX) + "px", - top: (d3.event.pageY - 100) + "px", + left: (offsetX) + "px", + top: (offsetY) + "px", display: "block", 'background-color': '#C0C0C0', border: '1px solid #fdd', From 17c920c54e1fe6dcbca80c2526ea74d1b29f3a5c Mon Sep 17 00:00:00 2001 From: "dan.pop" Date: Fri, 13 Oct 2017 14:55:58 +0300 Subject: [PATCH 08/10] TVB-2310 translated svg so values are displayed entirely --- tvb/interfaces/web/static/js/parameterSpace.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tvb/interfaces/web/static/js/parameterSpace.js b/tvb/interfaces/web/static/js/parameterSpace.js index 6c0330af2..c84dbb10b 100644 --- a/tvb/interfaces/web/static/js/parameterSpace.js +++ b/tvb/interfaces/web/static/js/parameterSpace.js @@ -59,7 +59,7 @@ function _updatePlotPSE(canvasId, xLabels, yLabels, xValues, yValues, seriesArra margins: { // is this the correct way to be doing margins? It's just how I have in the past, top: 20, bottom: 40, - left: 20, + left: 50, right: 50 }, xaxis: { @@ -400,7 +400,7 @@ function d3Plot(placeHolder, data, options, pageParam) { yAxisClip = canvas.append("svg:clipPath") .attr("id", "yClip") .append("svg:rect") - .attr("x", -_PSE_plotOptions.margins.left * 2)// these two areas are simply selected for what they accomplish visually. I wonder if there could be a real connection to the values used for arranging the canvas + .attr("x", -_PSE_plotOptions.margins.left)// these two areas are simply selected for what they accomplish visually. I wonder if there could be a real connection to the values used for arranging the canvas .attr("y", _PSE_plotOptions.margins.top) .attr("width", _PSE_plotOptions.margins.right)// .attr("height", innerHeight - _PSE_plotOptions.margins.bottom - _PSE_plotOptions.margins.top); From 73f8deb696320f219d09ce7f63a2b256dbfe1165 Mon Sep 17 00:00:00 2001 From: "dan.pop" Date: Fri, 13 Oct 2017 17:37:25 +0300 Subject: [PATCH 09/10] TVB-2300 removed unnecessary scrollbars and moved toolTip on top. --- tvb/interfaces/web/static/js/parameterSpace.js | 18 +++++++++--------- tvb/interfaces/web/static/style/base.css | 7 +++++++ .../web/static/style/section_visualisers.css | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/tvb/interfaces/web/static/js/parameterSpace.js b/tvb/interfaces/web/static/js/parameterSpace.js index c84dbb10b..8c69abde0 100644 --- a/tvb/interfaces/web/static/js/parameterSpace.js +++ b/tvb/interfaces/web/static/js/parameterSpace.js @@ -707,18 +707,17 @@ function d3Plot(placeHolder, data, options, pageParam) { */ d3.selectAll("circle") .on("mouseover", function (d) { - d3.event = window.event; - var offsetX = d3.event.pageX; - var offsetY = d3.event.pageY - 100; - var portletContainer = document.getElementById("section-pse"); + let offsetX = window.event.pageX; + let offsetY = window.event.pageY - 100; + const portletContainer = document.getElementById("section-pse"); if (portletContainer) { - var relativeOffsetLeft = portletContainer.offsetLeft; - var relativeOffsetTop = portletContainer.offsetTop; + let relativeOffsetLeft = portletContainer.offsetLeft; + let relativeOffsetTop = portletContainer.offsetTop; offsetX = offsetX - relativeOffsetLeft; offsetY = offsetY - relativeOffsetTop; } - var nodeInfo = getNodeInfo(d.coords); - var toolTipText = nodeInfo.tooltip.split("&").join("&").split("<").join("<").split(">").join(">"); + let nodeInfo = getNodeInfo(d.coords); + let toolTipText = nodeInfo.tooltip.split("&").join("&").split("<").join("<").split(">").join(">"); toolTipDiv.html(toolTipText); toolTipDiv.style({ position: "absolute", @@ -728,7 +727,8 @@ function d3Plot(placeHolder, data, options, pageParam) { 'background-color': '#C0C0C0', border: '1px solid #fdd', padding: '2px', - opacity: 0.80 + opacity: 0.80, + 'z-index': 999 }) }) .on("mouseout", function (d) { diff --git a/tvb/interfaces/web/static/style/base.css b/tvb/interfaces/web/static/style/base.css index d3bef535c..04ac902ae 100644 --- a/tvb/interfaces/web/static/style/base.css +++ b/tvb/interfaces/web/static/style/base.css @@ -1068,6 +1068,13 @@ top: 75px; height: 100%; } +#section-pse.view-column.col-3{ + overflow-y: hidden !important; +} +#section-portlets.view-column.col-3{ + overflow-y: hidden !important; +} + #main.columnized .view-column { background: rgba(250, 247, 228, 0.1); float: left; diff --git a/tvb/interfaces/web/static/style/section_visualisers.css b/tvb/interfaces/web/static/style/section_visualisers.css index a78e6f01c..9d1bb44a7 100644 --- a/tvb/interfaces/web/static/style/section_visualisers.css +++ b/tvb/interfaces/web/static/style/section_visualisers.css @@ -134,7 +134,7 @@ div.flot-tick-label { height: 85%; position: relative; top: 5%; - overflow: auto; + overflow: hidden; } .topographic_canvas { From eafe57eeb14891b64910d02b4e36279bc3c59bd4 Mon Sep 17 00:00:00 2001 From: Lia Domide Date: Mon, 16 Oct 2017 09:54:50 +0300 Subject: [PATCH 10/10] Revert changes in base.css --- tvb/interfaces/web/static/style/base.css | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tvb/interfaces/web/static/style/base.css b/tvb/interfaces/web/static/style/base.css index 04ac902ae..1e7b1839e 100644 --- a/tvb/interfaces/web/static/style/base.css +++ b/tvb/interfaces/web/static/style/base.css @@ -1068,13 +1068,6 @@ top: 75px; height: 100%; } -#section-pse.view-column.col-3{ - overflow-y: hidden !important; -} -#section-portlets.view-column.col-3{ - overflow-y: hidden !important; -} - #main.columnized .view-column { background: rgba(250, 247, 228, 0.1); float: left; @@ -2678,4 +2671,4 @@ position: absolute; -webkit-box-shadow: 2px 2px 10px 0 rgba(0, 0, 0, 0.7); -moz-box-shadow: 2px 2px 10px 0 rgba(0, 0, 0, 0.7); box-shadow: 2px 2px 10px 0 rgba(0, 0, 0, 0.7); -} \ No newline at end of file +}