Menu
▾
▴
[Sashimi-commit] SF.net SVN: sashimi:[5293] trunk/trans_proteomic_pipeline/src/Visualization /Comet/plot-msms
|
From: <rea...@us...> - 2011-01-27 01:33:59
|
Revision: 5293
http://sashimi.svn.sourceforge.net/sashimi/?rev=5293&view=rev
Author: real_procopio
Date: 2011-01-27 01:33:53 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
[bug] Rolling back incorrect commit!
Modified Paths:
--------------
trunk/trans_proteomic_pipeline/src/Visualization/Comet/plot-msms/css/lorikeet.css
trunk/trans_proteomic_pipeline/src/Visualization/Comet/plot-msms/js/specview.js
Modified: trunk/trans_proteomic_pipeline/src/Visualization/Comet/plot-msms/css/lorikeet.css
===================================================================
--- trunk/trans_proteomic_pipeline/src/Visualization/Comet/plot-msms/css/lorikeet.css 2011-01-27 01:27:40 UTC (rev 5292)
+++ trunk/trans_proteomic_pipeline/src/Visualization/Comet/plot-msms/css/lorikeet.css 2011-01-27 01:33:53 UTC (rev 5293)
@@ -6,7 +6,7 @@
div.lorikeet {
width:100%;
- background-color: #FFFFFF;
+ background-color: #C0C0C0;
color: #000000;
font-family: "Trebuchet MS",Arial,sans-serif;
font-size: 10pt;
@@ -16,18 +16,18 @@
}
div.lorikeet div.bar {
- background-color:#c6c1b8;
+ background-color:#DDDDDD;
color:black;
}
div.lorikeet td.bar {
- background-color:#f3f1e4;
- border:1px solid #c6c1b8;
+ background-color:#EEEEEE;
+ border:2px solid #0e207f;
padding: 5px;
}
div.lorikeet td {
background-color:#FFFFEF;
- border:1px solid #c6c1b8;
+ border:2px solid #0e207f;
padding: 5px;
}
@@ -47,14 +47,14 @@
font-size: 8pt;
}
div.lorikeet .zoom_out_link {
- background-image: url('../images/zoom_out.png');
+ background-image: url('../images/lorikeet/zoom_out.png');
background-repeat: no-repeat;
width:20px;
height:20px;
cursor:pointer;
}
div.lorikeet .zoom_in_link {
- background-image: url('../images/zoom_in.png');
+ background-image: url('../images/lorikeet/zoom_in.png');
background-repeat: no-repeat;
width:20px;
height:20px;
@@ -65,10 +65,10 @@
/* THE FOLLOWING STYLES ARE FOR THE TABLE DISPLAYING THE SEQUENCE AND FRAGMENT ION MASS */
div.lorikeet #ionTable {
border-collapse:collapse;
- border-color:#c6c1b8;
+ border-color:#DDDDDD;
}
div.lorikeet #ionTable th {
- background-color:#c6c1b8;
+ background-color:#DDDDDD;
border: 1px solid #666666;
}
div.lorikeet #ionTable td {
@@ -81,7 +81,7 @@
/* style for a cell containing a residue from the sequence */
div.lorikeet #ionTable td.seq {
font-weight: bold;
- background-color:#c6c1b8;
+ background-color:#DDDDDD;
}
/* style for cell containing a modified residue */
@@ -91,7 +91,7 @@
/* style for cell containing the fragment indices */
div.lorikeet #ionTable td.numCell {
- background-color:#f3f1e4;
+ background-color:#EEEEEE;
color:#575757;
}
@@ -132,7 +132,7 @@
.ui-corner-all { -moz-border-radius: 4px/*{cornerRadius}*/; -webkit-border-radius: 4px/*{cornerRadius}*/; border-radius: 4px/*{cornerRadius}*/; }
.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/;
-background-image: url('../images/slider_handle.png');
+background-image: url('../images/lorikeet/slider_handle.png');
background-repeat: no-repeat;
font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; }
@@ -140,5 +140,5 @@
----------------------------------*/
.ui-widget { }
.ui-widget .ui-widget { }
-.ui-widget-content { border: 1px solid #888888/*{borderColorContent}*/; background: #f3f1e4/*{bgColorContent}*/ ; color: #111111/*{fcContent}*/; }
+.ui-widget-content { border: 1px solid #888888/*{borderColorContent}*/; background: #CFCFCF/*{bgColorContent}*/ ; color: #111111/*{fcContent}*/; }
.ui-widget-content a { color: #000000/*{fcContent}*/; }
Modified: trunk/trans_proteomic_pipeline/src/Visualization/Comet/plot-msms/js/specview.js
===================================================================
--- trunk/trans_proteomic_pipeline/src/Visualization/Comet/plot-msms/js/specview.js 2011-01-27 01:27:40 UTC (rev 5292)
+++ trunk/trans_proteomic_pipeline/src/Visualization/Comet/plot-msms/js/specview.js 2011-01-27 01:33:53 UTC (rev 5293)
@@ -181,7 +181,6 @@
var me = parseFloat(container.find("#massError").val());
if(me != massError) {
massError = me;
- options.sequence = 'LLLGGGHHH'; // test
massErrorChanged = true;
}
else {
@@ -389,9 +388,6 @@
container.find("#update").click(function() {
zoomRange = null; // zoom out fully
setMassError();
-//TEST
-
-//TEST
createPlot(getDatasets());
makeIonTable();
});
@@ -950,10 +946,10 @@
}
else {
if(neutralLoss == 'h2o') {
- matchData[1].push(sion.label+'-H2O');
+ matchData[1].push(sion.label+'º');
}
else if(neutralLoss = 'nh3') {
- matchData[1].push(sion.label+'-NH3');
+ matchData[1].push(sion.label+'*');
}
}
}
@@ -1016,11 +1012,11 @@
// options table
parentTable += '<tr> ';
- parentTable += '<td rowspan="'+rowspan+'" valign="top" id="optionsTable" style="background-color: #f3f1e4"> ';
+ parentTable += '<td rowspan="'+rowspan+'" valign="top" id="optionsTable" style="background-color: #EEEEEE"> ';
parentTable += '</td> ';
// placeholder for sequence, m/z, scan number etc
- parentTable += '<td style="background-color: #c6c1b8; padding:5px; border:1px #c6c1b8;" valign="bottom" align="center"> ';
+ parentTable += '<td style="background-color: #0e207f; padding:5px; border:1px #0e207f;" valign="bottom" align="center"> ';
parentTable += '<div id="seqinfo" style="width:100%;"></div> ';
// placeholder for file name, scan number and charge
parentTable += '<div id="fileinfo" style="width:100%;"></div> ';
@@ -1028,7 +1024,7 @@
// placeholder for the ion table
- parentTable += '<td rowspan="'+rowspan+'" valign="top" id="ionTableLoc1" style="background-color: #f3f1e4"> ';
+ parentTable += '<td rowspan="'+rowspan+'" valign="top" id="ionTableLoc1" style="background-color: #EEEEEE"> ';
parentTable += '<div id="ionTableDiv">';
parentTable += '<span id="moveIonTable" class="font_small link">[Click]</span> <span class="font_small">to move table</span>';
// placeholder for file name, scan number, modifications etc.
@@ -1204,7 +1200,7 @@
if(options.sequence) {
specinfo += '<div>';
- specinfo += '<span style="font-weight: bold; color:#BB0000;">'+getModifiedSequence()+'</span>';
+ specinfo += '<span style="font-weight: bold; color:#FF8700;">'+getModifiedSequence()+'</span>';
var mass = Peptide.getSeqMassMono(options.sequence, options.sequence.length, "n");
// add C-terminal OH
mass = mass + Ion.MASS_O + Ion.MASS_H;
@@ -1213,7 +1209,7 @@
mz = Ion.getMz(mass, options.charge);
}
mass = mass + Ion.MASS_PROTON;
- specinfo += '<span style="font-weight: bold; color: #666;">, MH+ '+mass.toFixed(4);
+ specinfo += '<span style="font-weight: bold; color: #FFFFFF;">, MH+ '+mass.toFixed(4);
if(mz)
specinfo += ', m/z '+mz.toFixed(4);
specinfo += '</span></div>';
@@ -1245,7 +1241,7 @@
var fileinfo = '';
if(options.fileName || options.scanNum) {
- fileinfo += '<div style="margin-top:5px;" class="font_small"><span style="color: #666;">';
+ fileinfo += '<div style="margin-top:5px;" class="font_small"><span style="color: #FFFFFF;">';
if(options.fileName) {
fileinfo += 'File: '+options.fileName;
}
@@ -1468,11 +1464,11 @@
myTable += 'Neutral Loss: ';
myTable += '<div id="nl_choice"> ';
myTable += '<nobr> <input type="checkbox" value="h2o" id="h2o"/> ';
- myTable += ' <b>H<sub>2</sub>O</b> (<b>-18</b>)';
+ myTable += ' <b>H<sub>2</sub>O</b> (<b>º</b>)';
myTable += '</nobr> ';
myTable += '<br> ';
myTable += '<nobr> <input type="checkbox" value="nh3" id="nh3"/> ';
- myTable += ' <b>NH<sub>3</sub></b> (<b>-17</b>)';
+ myTable += ' <b>NH<sub>3</sub></b> (<b>*</b>)';
myTable += '</nobr> ';
myTable += '</div> ';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|