|
-
-
+
+
zRange(Min): |
|
@@ -286,6 +286,17 @@ var zList = []; // for R-Z plot
var rbList = []; // for R-Z plot
var rBList = []; // for R-Z plot
+var color = ['rgb(31,119,180)', // muted blue
+ 'rgb(255,127,14)', // safety orange
+ 'rgb(44,160,44)', // cooked asparagus green
+ 'rgb(214,39,40)', // brick red
+ 'rgb(148,103,189)', // muted purple
+ 'rgb(140,86,75)', // chestnut brown
+ 'rgb(277,119,194)', // raspberry yogurt pink
+ 'rgb(127,127,127)', // middle gray
+ 'rgb(118,189,34)', // curry yellow-green
+ 'rgb(23,190,207)']; // blue-teal
+
function GetMassFromSym(AZ, id){
let str = 'massProxy.py?AZ=' + AZ;
@@ -515,9 +526,15 @@ function PlotEZ(rangeX, rangeY){
let nEx = xList.length;
let data = [];
- for( let i = 0; i < nEx; i++){
+ for( let i = 0; i < nEx; i++){
+ let kaka = color[i%10];
let newData = {
- x : xList[i], y : yList[i], mode:"lines", type:"scatter", name:"Ex="+ExList[i]
+ x : xList[i],
+ y : yList[i],
+ mode:"lines",
+ type:"scatter",
+ name:"Ex="+ExList[i],
+ marker : { color : kaka}
}
data.push(newData);
}
@@ -529,7 +546,7 @@ function PlotEZ(rangeX, rangeY){
legend: {yanchor:"top", xanchor:"left", x:"0.01",y:"0.99" }
};
- Plotly.newPlot( "Plot_EZ", data, layout );
+ Plotly.newPlot( "Plot_EZ", data, layout);
PlotThetaCMLine(document.getElementById('thetaCM').value);
@@ -555,7 +572,7 @@ function PlotThetaCMLine(thetaCM){
eList.push(haha);
}
- Plotly.addTraces("Plot_EZ", {x : zzList, y: eList, name:"thetaCM=" + thetaCM }, 0);
+ Plotly.addTraces("Plot_EZ", {x : zzList, y: eList, name:"thetaCM=" + thetaCM , marker : { color : 'rgb(100,100,100)'}}, 0);
}
function PlotBore(){
@@ -569,7 +586,7 @@ function PlotBore(){
eList.push(haha);
}
- Plotly.addTraces("Plot_EZ", {x : zzList, y: eList, name:"Bore" }, 0);
+ Plotly.addTraces("Plot_EZ", {x : zzList, y: eList, name:"Bore", marker : { color : 'rgb(200,200, 200)'} }, 0);
}
function CalculateRZ(){
@@ -626,16 +643,19 @@ function PlotRZ(){
let nEx = ExList.length;
for(let i = 0 ; i < nEx; i++ ){
+ let kaka = color[i%10];
let newData = {
x : zList,
y : rBList[i],
mode : "lines",
type : "scatter",
name : "Ex="+ExList[i] + ",theta=" + document.getElementById('theta'+(i+1)).value,
+ marker : { color : kaka}
}
data.push(newData);
}
for(let i = 0 ; i < nEx; i++ ){
+ let kaka = color[i%10];
let newData = {
x : zList,
y : rbList[i],
@@ -643,6 +663,7 @@ function PlotRZ(){
line : {dash : 'dashdot', width : 1 },
type : "scatter",
name : "Ex="+ExList[i] + ",theta=" + document.getElementById('theta'+(i+1)).value,
+ marker : { color : kaka}
}
data.push(newData);
}
@@ -740,6 +761,7 @@ document.getElementById('thetaCM').addEventListener('keypress',
CalConstants();
CalculateEZ();
CalculateRZ()
+ AdjustRangeEZ(document.getElementById('posArray').value);
}
}, false
);
@@ -749,6 +771,7 @@ document.getElementById('thetaCMRange').oninput = function(){
CalConstants();
CalculateEZ();
CalculateRZ()
+ AdjustRangeEZ(document.getElementById('posArray').value);
}
function AdjustRangeEZ(value){
| |