Skip to content

Commit

Permalink
Merge branch 'master' into video
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexsielicki
alexsielicki committed Feb 8, 2017
2 parents fe0d481 + 9bc92d8 commit 0ce4264
Show file tree
Hide file tree
Showing 7 changed files with 140 additions and 98 deletions.
19 changes: 17 additions & 2 deletions web-server/plugins/slycat-back-button-test/js/color-switcher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ define("slycat-color-switcher", ["d3"], function(d3)
},
"rainbow":
{
"label": "Rainbow",
"label": "Rainbow Night",
"background": d3.rgb(128, 128, 128),
"null_color": "rgb(75,75,75)",
"opacity": "0.6",
Expand All @@ -121,6 +121,21 @@ define("slycat-color-switcher", ["d3"], function(d3)
d3.rgb(255, 0, 0),
]
},
"rainbow_day":
{
"label": "Rainbow Day",
"background": d3.rgb(255, 255, 255),
"null_color": "gray",
"opacity": "0.7",
"colors":
[
d3.rgb(0, 0, 255),
d3.rgb(0, 255, 0),
d3.rgb(0, 255, 255),
d3.rgb(255, 255, 0),
d3.rgb(255, 0, 0),
]
},
};

this.button = $('<button class="btn btn-xs btn-default dropdown-toggle" type="button" id="colors-dropdown" data-toggle="dropdown" aria-expanded="true" title="Scatterplot Color Theme"> \
Expand Down Expand Up @@ -166,6 +181,7 @@ define("slycat-color-switcher", ["d3"], function(d3)
"background-size" : "5px 75%, 50px 100%",
"background-position" : "right 10px center, right 5px center",
"background-repeat" : "no-repeat, no-repeat",
"padding-right" : "70px",
})
)
;
Expand All @@ -182,7 +198,6 @@ define("slycat-color-switcher", ["d3"], function(d3)
{
this.list.find(".color").removeClass("active");
this.list.find("[data-colormap='" + this.options.colormap + "']").addClass("active");

}
},

Expand Down
19 changes: 17 additions & 2 deletions web-server/plugins/slycat-cca/js/color-switcher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ define("slycat-color-switcher", ["d3"], function(d3)
},
"rainbow":
{
"label": "Rainbow",
"label": "Rainbow Night",
"background": d3.rgb(128, 128, 128),
"null_color": "rgb(75,75,75)",
"opacity": "0.6",
Expand All @@ -121,6 +121,21 @@ define("slycat-color-switcher", ["d3"], function(d3)
d3.rgb(255, 0, 0),
]
},
"rainbow_day":
{
"label": "Rainbow Day",
"background": d3.rgb(255, 255, 255),
"null_color": "gray",
"opacity": "0.7",
"colors":
[
d3.rgb(0, 0, 255),
d3.rgb(0, 255, 0),
d3.rgb(0, 255, 255),
d3.rgb(255, 255, 0),
d3.rgb(255, 0, 0),
]
},
};

this.button = $('<button class="btn btn-xs btn-default dropdown-toggle" type="button" id="colors-dropdown" data-toggle="dropdown" aria-expanded="true" title="Scatterplot Color Theme"> \
Expand Down Expand Up @@ -166,6 +181,7 @@ define("slycat-color-switcher", ["d3"], function(d3)
"background-size" : "5px 75%, 50px 100%",
"background-position" : "right 10px center, right 5px center",
"background-repeat" : "no-repeat, no-repeat",
"padding-right" : "70px",
})
)
;
Expand All @@ -182,7 +198,6 @@ define("slycat-color-switcher", ["d3"], function(d3)
{
this.list.find(".color").removeClass("active");
this.list.find("[data-colormap='" + this.options.colormap + "']").addClass("active");

}
},

Expand Down
17 changes: 16 additions & 1 deletion web-server/plugins/slycat-parameter-image-plus-model/js/color-switcher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ $.widget("slycat.colorswitcher",
},
"rainbow":
{
"label": "Rainbow",
"label": "Rainbow Night",
"background": d3.rgb(128, 128, 128),
"null_color": "rgb(75,75,75)",
"opacity": "0.6",
Expand All @@ -118,6 +118,21 @@ $.widget("slycat.colorswitcher",
d3.rgb(255, 0, 0),
]
},
"rainbow_day":
{
"label": "Rainbow Day",
"background": d3.rgb(255, 255, 255),
"null_color": "gray",
"opacity": "0.7",
"colors":
[
d3.rgb(0, 0, 255),
d3.rgb(0, 255, 0),
d3.rgb(0, 255, 255),
d3.rgb(255, 255, 0),
d3.rgb(255, 0, 0),
]
},
};

this.container = $("<div>")
Expand Down
18 changes: 17 additions & 1 deletion web-server/plugins/slycat-parameter-image/js/color-switcher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ define("slycat-color-switcher", ["d3"], function(d3)
},
"rainbow":
{
"label": "Rainbow",
"label": "Rainbow Night",
"background": d3.rgb(128, 128, 128),
"null_color": "rgb(75,75,75)",
"opacity": "0.6",
Expand All @@ -121,6 +121,21 @@ define("slycat-color-switcher", ["d3"], function(d3)
d3.rgb(255, 0, 0),
]
},
"rainbow_day":
{
"label": "Rainbow Day",
"background": d3.rgb(255, 255, 255),
"null_color": "gray",
"opacity": "0.7",
"colors":
[
d3.rgb(0, 0, 255),
d3.rgb(0, 255, 0),
d3.rgb(0, 255, 255),
d3.rgb(255, 255, 0),
d3.rgb(255, 0, 0),
]
},
};

this.button = $('<button class="btn btn-xs btn-default dropdown-toggle" type="button" id="colors-dropdown" data-toggle="dropdown" aria-expanded="true" title="Scatterplot Color Theme"> \
Expand Down Expand Up @@ -166,6 +181,7 @@ define("slycat-color-switcher", ["d3"], function(d3)
"background-size" : "5px 75%, 50px 100%",
"background-position" : "right 10px center, right 5px center",
"background-repeat" : "no-repeat, no-repeat",
"padding-right" : "70px",
})
)
;
Expand Down
18 changes: 17 additions & 1 deletion web-server/plugins/slycat-timeseries-model/js/color-switcher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ define("slycat-color-switcher", ["d3"], function(d3)
},
"rainbow":
{
"label": "Rainbow",
"label": "Rainbow Night",
"background": d3.rgb(128, 128, 128),
"null_color": "rgb(75,75,75)",
"opacity": "0.6",
Expand All @@ -121,6 +121,21 @@ define("slycat-color-switcher", ["d3"], function(d3)
d3.rgb(255, 0, 0),
]
},
"rainbow_day":
{
"label": "Rainbow Day",
"background": d3.rgb(255, 255, 255),
"null_color": "gray",
"opacity": "0.7",
"colors":
[
d3.rgb(0, 0, 255),
d3.rgb(0, 255, 0),
d3.rgb(0, 255, 255),
d3.rgb(255, 255, 0),
d3.rgb(255, 0, 0),
]
},
};

this.button = $('<button class="btn btn-xs btn-default dropdown-toggle" type="button" id="colors-dropdown" data-toggle="dropdown" aria-expanded="true" title="Line Color Theme"> \
Expand Down Expand Up @@ -166,6 +181,7 @@ define("slycat-color-switcher", ["d3"], function(d3)
"background-size" : "5px 75%, 50px 100%",
"background-position" : "right 10px center, right 5px center",
"background-repeat" : "no-repeat, no-repeat",
"padding-right" : "70px",
})
)
;
Expand Down
57 changes: 10 additions & 47 deletions web-server/plugins/slycat-timeseries-model/js/ui.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,60 +15,14 @@ define("slycat-timeseries-model", ["slycat-server-root", "slycat-bookmark-manage
// Setup the resizing layout ...
var bodyLayout = $("#timeseries-model").layout({
applyDefaultStyles: false,
north:
{
initClosed : true,
resizeWhileDragging : false,
// onresize: function()
// {
// console.log('resized bodyLayout north');
// },
},
center:
{
resizeWhileDragging : false,
// onresize: function()
// {
// console.log('resized bodyLayout center');
// },
},
south:
{
size: $(window).height() / 3,
//size: $("body").height() / 3,
resizeWhileDragging : false,
onresize: function()
{
$("#table").table("resize_canvas");
//console.log('resized bodyLayout south');
},
},
});

var contentPaneLayout = $("#content-pane").layout({
north :
{
size: 28,
resizeWhileDragging : false,
// onresize: function()
// {
// console.log('resized contentPaneLayout north');
// },
},
center :
{
resizeWhileDragging : false,
// onresize: function()
// {
// console.log('resized contentPaneLayout center');
// },
},
});

var modelPaneLayout = $("#model-pane").layout({
west :
{
size : $("#model-pane").width() / 2,
size : $("#timeseries-model").width() / 2,
resizeWhileDragging : false,
onresize: function()
{
Expand All @@ -89,6 +43,15 @@ var modelPaneLayout = $("#model-pane").layout({
resizeWhileDragging: false,
onresize: function() { $("#legend").legend("option", {width: $("#legend-pane").width(), height: $("#legend-pane").height()}); },
},
south:
{
size: $("#timeseries-model").height() / 3,
resizeWhileDragging : false,
onresize: function()
{
$("#table").table("resize_canvas");
},
},
});

//////////////////////////////////////////////////////////////////////////////////////////
Expand Down
90 changes: 46 additions & 44 deletions web-server/plugins/slycat-timeseries-model/ui.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,53 +32,55 @@

<div id="timeseries-model" style="-webkit-flex:1; flex:1;">
<slycat-job-checker></slycat-job-checker>
<div id="content-pane" class="ui-layout-center">
<div id="cluster-pane" class="ui-layout-north">
<div class="center bootstrap-styles" id="controls">
<div id="general-controls" class="btn-group btn-group-xs"></div>
<div id="color-switcher" class="btn-group btn-group-xs"></div>
</div>
<div class="load-status"></div>
</div>
<div id="model-pane" class="ui-layout-center">
<div id="dendrogram-pane" class="ui-layout-west">
<div id="dendrogram-sparkline-backdrop"></div>
<div class="load-status"></div>
<svg id="dendrogram-viewer" width="100%" height="100%">
<defs>
<linearGradient id="subtree-gradient" x1="0%" y1="0%" x2="100%" y2="0%">
<stop offset="0%" stop-color="#7767b0" stop-opacity="1" />
<stop offset="100%" stop-color="#ffffff" stop-opacity="1" />
</linearGradient>
</defs>
</svg>
</div>
<div id="waveform-pane" class="ui-layout-center">
<div class="load-status"></div>
<svg id="waveform-viewer" width="100%" height="100%" style="position: absolute;">
</svg>
<div id="waveform-progress">
<input class="waveformPie" value="1" />
</div>
<div id="waveform-selection-progress">
<input class="waveformPie" value="1" />
</div>
<div id="waveform-selector-progress-wrapper">
<div id="waveform-selector-progress">
<input class="waveformPie" value="1" />
Please wait while we prepare the ability to select waveforms...
</div>
</div>
</div>
<div id="legend-pane" class="ui-layout-east">
<div class="load-status"></div>
<div id="legend"></div>
</div>

<div id="cluster-pane" class="ui-layout-north">
<div class="center bootstrap-styles" id="controls">
<div id="general-controls" class="btn-group btn-group-xs"></div>
<div id="color-switcher" class="btn-group btn-group-xs"></div>
</div>
<div class="load-status"></div>
</div>

<div id="dendrogram-pane" class="ui-layout-west">
<div id="dendrogram-sparkline-backdrop"></div>
<div class="load-status"></div>
<svg id="dendrogram-viewer" width="100%" height="100%">
<defs>
<linearGradient id="subtree-gradient" x1="0%" y1="0%" x2="100%" y2="0%">
<stop offset="0%" stop-color="#7767b0" stop-opacity="1" />
<stop offset="100%" stop-color="#ffffff" stop-opacity="1" />
</linearGradient>
</defs>
</svg>
</div>

<div id="waveform-pane" class="ui-layout-center">
<div class="load-status"></div>
<svg id="waveform-viewer" width="100%" height="100%" style="position: absolute;">
</svg>
<div id="waveform-progress">
<input class="waveformPie" value="1" />
</div>
<div id="waveform-selection-progress">
<input class="waveformPie" value="1" />
</div>
<div id="waveform-selector-progress-wrapper">
<div id="waveform-selector-progress">
<input class="waveformPie" value="1" />
Please wait while we prepare the ability to select waveforms...
</div>
</div>
</div>
<div id="table-pane" class="ui-layout-south" style="overflow: auto">
</div>

<div id="legend-pane" class="ui-layout-east">
<div class="load-status"></div>
<div id="legend"></div>
</div>

<div id="table-pane" class="ui-layout-south" style="overflow: auto">
<div class="load-status"></div>
<div id="table">
</div>
</div>

</div>

0 comments on commit 0ce4264

Please sign in to comment.