Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bring development branch up to date with master #3

Merged
merged 11 commits into from
Aug 29, 2016
Merged

bring development branch up to date with master #3

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
30e4001
Merge pull request #2 from bhofmei/development
bhofmei Aug 11, 2016
62bc2d1
added compressed main for deployment
bhofmei Aug 12, 2016
7c9d0c1
v0.1.1
bhofmei Aug 12, 2016
4d3b05d
build version of js code
bhofmei Aug 12, 2016
a360885
build version again
bhofmei Aug 12, 2016
c96090e
build version...again
bhofmei Aug 12, 2016
f0ab894
added gitignore and corrected methylation checkboxes
bhofmei Aug 13, 2016
225dbd2
removed built files; added print statement for debugging purposes
bhofmei Aug 28, 2016
7bce85e
updated main built
bhofmei Aug 28, 2016
54cbfff
added print statement for debugging purposes
bhofmei Aug 29, 2016
fdad6c7
fixed track-specific setting issue for tracks 10+
bhofmei Aug 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
v0.1.1 
includes compressed main
  • Loading branch information
@bhofmei
bhofmei committed Aug 12, 2016
commit 7c9d0c1ed82879a460ed8e50d5361c2272efc3f1
40 changes: 20 additions & 20 deletions js/View/Dialog/ScreenShotDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ return declare (ActionBarDialog,{
var mainPaneRight = mainPaneRightM.containerNode;
thisB._paneTracks( mainPaneRight );

var paneFooter = dom.create('div',{class:'screenshot-dialog-pane-bottom-warning',innerHTML:'Local configuration changes will be ignored. Default configuration will be used unless specified in this dialog.<br>Rendering will open a new window.'});
var paneFooter = dom.create('div',{className:'screenshot-dialog-pane-bottom-warning',innerHTML:'Local configuration changes will be ignored. Default configuration will be used unless specified in this dialog.<br>Rendering will open a new window.'});

this.set('content', [
mainPaneLeft,
Expand All @@ -127,19 +127,19 @@ return declare (ActionBarDialog,{
var viewParam = thisB.parameters.view;
var param;
dom.create('h2',{'innerHTML':'General configuration options'}, obj);
var table = dom.create('table',{'class':'screenshot-dialog-opt-table'}, obj);
var table = dom.create('table',{className:'screenshot-dialog-opt-table'}, obj);
// check box parameters -> location overview, tracklist, nav, menu bars
for(param in viewParam){
var data = viewParam[param];
var row = dom.create('tr',{'id':'screenshot-dialog-row-'+param},table);
dom.create('td',{'innerHTML':(param === 'labels' ? '' : data.title),'class':'screenshot-dialog-pane-label'}, row);
var td = dom.create('td',{'class':'screenshot-dialog-pane-input'},row);
var row = dom.create('tr',{id:'screenshot-dialog-row-'+param},table);
dom.create('td',{innerHTML:(param === 'labels' ? '' : data.title),'class':'screenshot-dialog-pane-label'}, row);
var td = dom.create('td',{className:'screenshot-dialog-pane-input'},row);
var input;
if(param === 'trackSpacing'){
input = new dijitNumberSpinner({
id:'screenshot-dialog-'+param+'-spinner',
value: data.value,
_prop:param,
'_prop':param,
constraints: {min:0,max:40},
smallDelta:5,
intermediateChanges:true,
Expand All @@ -152,7 +152,7 @@ return declare (ActionBarDialog,{
}else{
input = new dijitCheckBox({
id:'screenshot-dialog-opt-box-'+param,
_prop: param,
'_prop': param,
checked: data.value
});
}
Expand All @@ -164,19 +164,19 @@ return declare (ActionBarDialog,{
} // end for param
if(thisB.browser.plugins.hasOwnProperty('MethylationPlugin')){
var row = dom.create('tr',{'id':'screenshot-dialog-row-methyl'},table);
dom.create('td',{innerHTML:'Methylation',class:'screenshot-dialog-pane-label', 'colspan':2},row);
dom.create('td',{innerHTML:'Methylation',className:'screenshot-dialog-pane-label', 'colspan':2},row);
var row2 = dom.create('tr',{'id':'screenshot-dialog-row-methyl-boxes'},table);
var methylD = dom.create('td',{'colspan':2},row2);
var m;
for (m in thisB.parameters.methylation){
var mbox = new dijitCheckBox({
id:'screenshot-dialog-methyl-'+m,
class:m+'-checkbox',
_prop:m,
className:m+'-checkbox',
'_prop':m,
checked: thisB.parameters.methylation[m]
});
mbox.onClick = dojo.hitch(thisB, '_setMethylation', mbox);
dom.create('span',{innerHTML:m,class:'screenshot-dialog-opt-span'},methylD);
dom.create('span',{innerHTML:m,className:'screenshot-dialog-opt-span'},methylD);
methylD.appendChild(mbox.domNode);
}
}
Expand Down Expand Up @@ -205,7 +205,7 @@ return declare (ActionBarDialog,{
id: 'screenshot-dialog-output-'+f,
checked: f === thisB.parameters.output.format.value,
value: f,
_prop: param
'_prop': param
});
btn.onClick = dojo.hitch(thisB, '_setParameter', btn);
dom.create('span',{innerHTML:f, className:'screenshot-dialog-opt-span',title:formatTypeTitles[f]},outD);
Expand All @@ -221,7 +221,7 @@ return declare (ActionBarDialog,{
var widget = new dijitNumberSpinner({
id:'screenshot-dialog-'+param+'-spinner',
value: data.value,
_prop:param,
'_prop':param,
//constraints: (param === 'zoom' ? {min:1,max:10} : {min:100,max:10000,pattern:'###0'}),
constraints: {min: data.min, max: data.max},
smallDelta:data.delta,
Expand Down Expand Up @@ -286,18 +286,18 @@ return declare (ActionBarDialog,{
var locOver = { value: config.show_overview, title:'Show location overview' };
var trackList = { value: config.show_tracklist, title:'Show track list' };
var nav = { value: config.show_nav, title:'Show navigation bar' };
var menu = { value: config.show_menu, title:'Show menu bar' }
var labels = {value:true, title:'Show track labels'}
var menu = { value: config.show_menu, title:'Show menu bar' };
var labels = {value: true, title:'Show track labels'};
// output parameters
zoom['min'] = 0;
zoom['max'] = 10;
zoom['delta'] = 1;
var format = {value: 'JPG', title: 'Output format'}
var width = {value: 3300, title: 'Width (px)', min:100, max:10000, delta:100}
var height = {value: 2400, title: 'Height (px)', min:100, max:10000, delta:100}
var quality = {value: 70, title: 'Render quality', min:0, max:100, delta:10}
var format = {value: 'JPG', title: 'Output format'};
var width = {value: 3300, title: 'Width (px)', min:100, max:10000, delta:100};
var height = {value: 2400, title: 'Height (px)', min:100, max:10000, delta:100};
var quality = {value: 70, title: 'Render quality', min:0, max:100, delta:10};

return { view:{trackSpacing, locOver, trackList, nav, menu, labels}, methylation:{CG:true, CHG:true, CHH:true}, output: {format, zoom, quality, width, height} }
return { view:{trackSpacing: trackSpacing, locOver: locOver, trackList: trackList, nav:nav, menu:menu, labels:labels}, methylation:{CG:true, CHG:true, CHH:true}, output: {format:format, zoom:zoom, quality:quality, width:width, height:height} };
},

_getPhantomJSUrl: function(scParams, jsParams){
Expand Down