truck/Sahli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

visual and some minor code cleanup

Browse source
This commit is contained in:
Iam Naughton Phier 2015-03-23 17:44:56 +02:00
parent 2dc91b14b2
commit 3be3ff8528
3 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sahli.coffee
View file

@ -237,9 +237,9 @@ class @Sahli
zoomee.width '100%' zoomee.width '100%'
$('canvas').width '100%' $('canvas').width '100%'
# calculate # strips - how many times does window height go into full height # create a panel of 'strips' so as to show a very long vertical piece on one
# and then move the canvases into it. - done # big 'plate'
# outbox toggled last to avoid losing width. (prolly need to fix.)
@panelmode = -> @panelmode = ->
$('#panel').toggle() $('#panel').toggle()
canvs = $('canvas') canvs = $('canvas')
@ -267,7 +267,6 @@ class @Sahli
outer = $('<div>') outer = $('<div>')
console.log numcols console.log numcols
# outer.append @createpanel(i,newwidth - 6) for i in [1..numcols-1]
outer.addClass 'nosb' outer.addClass 'nosb'
$('#panel').append outer $('#panel').append outer
$('#outbox').toggle() $('#outbox').toggle()
@ -286,10 +285,10 @@ class @Sahli
if ct < numpanels if ct < numpanels
outer.append @createpanel(drawcol,newwidth - 6) outer.append @createpanel(drawcol,newwidth - 6)
console.log "ww: #{ww} wh: #{wh} numpanels: #{numpanels} x: #{x}" # console.log "ww: #{ww} wh: #{wh} numpanels: #{numpanels} x: #{x}"
console.log "numcols: #{numcols} picdpercol: #{picdpercol}" # console.log "numcols: #{numcols} picdpercol: #{picdpercol}"
console.log "psh: #{panelslotheight} pps: #{panelsperslot}" # console.log "psh: #{panelslotheight} pps: #{panelsperslot}"
console.log "a*b: #{panelsperslot*(numcols-1)}" # console.log "a*b: #{panelsperslot*(numcols-1)}"
else else
$('.scrolly').width @origwidth $('.scrolly').width @origwidth
@ -300,8 +299,7 @@ class @Sahli
@createpanel = (i,amt) -> @createpanel = (i,amt) ->
dcol = $("<div id='column#{i}'>#{i}</div>") dcol = $("<div id='column#{i}' class='panelcolumn'>#{i}</div>")
dcol.addClass 'panelcolumn'
dcol.width amt dcol.width amt
@loadkeys = -> @loadkeys = ->

8
sahli.css
View file

@ -1,3 +1,7 @@
/*
Sahli css
*/
body { body {
background-color: black; background-color: black;
margin: 0; margin: 0;
@ -152,8 +156,8 @@ p.infobox {
} }
.panelcolumn { .panelcolumn {
height: 100%;
color: #00f080; color: transparent;
width: 2em; width: 2em;
background: #082020; background: #082020;
display: inline-table; display: inline-table;

38
sahli.js
View file

@ -281,7 +281,7 @@ l__________/__________|___|______l__________j_____j
}; };
Sahli.panelmode = function() { Sahli.panelmode = function() {
var canvs, colwidth, drawcol, i, level, newheight, newwidth, numcols, numpanels, outer, panelratio, pic, picdpercol, screenratio, wh, ww, x, _i, _j, _k, _len, _len1, _ref; var canvs, ct, drawcol, level, newheight, newwidth, numcols, numpanels, outer, panelratio, panelslotheight, panelsperslot, pic, picdpercol, screenratio, wh, ww, x, _i, _j, _len, _len1, _results;
$('#panel').toggle(); $('#panel').toggle();
canvs = $('canvas'); canvs = $('canvas');
if ($('.scrolly').width() === this.origwidth) { if ($('.scrolly').width() === this.origwidth) {
@ -297,33 +297,42 @@ l__________/__________|___|______l__________j_____j
picdpercol = Math.round(numpanels / numcols); picdpercol = Math.round(numpanels / numcols);
newwidth = ww / numcols; newwidth = ww / numcols;
canvs.width(newwidth); canvs.width(newwidth);
newheight = $(canvs[0]).height(); newheight = canvs.height();
colwidth = ww / numcols; panelsperslot = Math.floor(wh / newheight);
panelslotheight = panelsperslot * newheight;
outer = $('<div>'); outer = $('<div>');
for (i = _i = 1, _ref = numcols - 1; 1 <= _ref ? _i <= _ref : _i >= _ref; i = 1 <= _ref ? ++_i : --_i) { console.log(numcols);
outer.append(this.createpanel(i, colwidth - 6));
}
outer.addClass('nosb'); outer.addClass('nosb');
$('#panel').append(outer); $('#panel').append(outer);
$('#outbox').toggle(); $('#outbox').toggle();
level = 0; level = 0;
drawcol = 1; drawcol = 1;
for (_j = 0, _len = canvs.length; _j < _len; _j++) { ct = 0;
pic = canvs[_j]; outer.append(this.createpanel(1, newwidth - 6));
_results = [];
for (_i = 0, _len = canvs.length; _i < _len; _i++) {
pic = canvs[_i];
$("#column" + drawcol).append(pic); $("#column" + drawcol).append(pic);
level += 1; level += 1;
if (level > picdpercol) { ct += 1;
if (level === panelsperslot) {
level = 0; level = 0;
drawcol = drawcol + 1; drawcol = drawcol + 1;
if (ct < numpanels) {
_results.push(outer.append(this.createpanel(drawcol, newwidth - 6)));
} else {
_results.push(void 0);
}
} else {
_results.push(void 0);
} }
} }
console.log("ww: " + ww + " wh: " + wh + " numpanels: " + numpanels + " x: " + x); return _results;
return console.log("numcols: " + numcols + " picdpercol: " + picdpercol);
} else { } else {
$('.scrolly').width(this.origwidth); $('.scrolly').width(this.origwidth);
$('#outbox').show(); $('#outbox').show();
for (_k = 0, _len1 = canvs.length; _k < _len1; _k++) { for (_j = 0, _len1 = canvs.length; _j < _len1; _j++) {
pic = canvs[_k]; pic = canvs[_j];
$('.scrolly').append(pic); $('.scrolly').append(pic);
} }
canvs.width(this.origwidth); canvs.width(this.origwidth);
@ -333,8 +342,7 @@ l__________/__________|___|______l__________j_____j
Sahli.createpanel = function(i, amt) { Sahli.createpanel = function(i, amt) {
var dcol; var dcol;
dcol = $("<div id='column" + i + "'>" + i + "</div>"); dcol = $("<div id='column" + i + "' class='panelcolumn'>" + i + "</div>");
dcol.addClass('panelcolumn');
return dcol.width(amt); return dcol.width(amt);
}; };