MediaWiki:Lipoquality.js - Revision history

Sunflower at 00:04, 25 October 2018

2018-10-25T00:04:50Z

Sunflower at 04:56, 14 November 2017

2017-11-14T04:56:05Z

Show changes

Sunflower at 08:01, 31 March 2017

2017-03-31T08:01:01Z

Sunflower at 06:12, 30 March 2017

2017-03-30T06:12:37Z

Sunflower at 04:07, 15 March 2017

2017-03-15T04:07:03Z

Sunflower at 06:44, 14 March 2017

2017-03-14T06:44:57Z

Sunflower at 04:37, 13 March 2017

2017-03-13T04:37:26Z

Sunflower at 04:36, 13 March 2017

2017-03-13T04:36:37Z

Sunflower at 00:30, 13 March 2017

2017-03-13T00:30:30Z

Sunflower at 23:53, 1 March 2017

2017-03-01T23:53:00Z

Show changes

@@ Line 1: / Line 1: @@
 // html /////////////////////////////////////////////////////////////////////////////////////////////////////////
 // <span id="search"></span><span id="show"></span>
@@ Line 83: / Line 84: @@
 	var lipidClass   = "";
 	var chain        = "";
 	// パラメータの取得
 	// ss = SampleSource - デフォルトはAll
@@ Line 101: / Line 105: @@
 			lipidClass = value;
-		} else if(name == "chain"){ // lipid chain
+		} else if(name == "ct"){ // lipid chain
-			chain = value;
+			chart = value;
+		}
+	}
-	if(chain.length > 0){
+	if(chart == "c" && chain.length > 0){
 		// lipidclass基準の棒グラフを表示
 		selectCombobox([sampleSource, sampleType, lipidClass]);
-		var result = retrieveChainData(sampleSource, sampleType, lipidClass, chain);
+		var result = retrieveChainData(sampleName, sampleSource, sampleType, lipidClass, chain); // speciesからsamplenameに変更
 		if(result.x.length > 0){
 			showChainChart(result);
+		}
-	} else if(lipidClass.length > 0){
+	} else if(chart == "b" && lipidClass.length > 0){
 		// bar(棒グラフ)を表示
 		selectCombobox([sampleSource, sampleType, lipidClass]);

@@ Line 2: / Line 2: @@
 // <span id="search"></span><span id="show"></span>
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // 2017/03/30 ・4行目の項目名を「Mutant type」から「Treatment」に変更
 // 2017/03/15 ・パイチャートのタイトルを「ratio」から「Intensity ratio」へ変更
@@ Line 35: / Line 36: @@
 const MARGIN = 30;
 var barColor = DEFAULT_BAR_COLOR;
-var legendOptions = ["Sample name","Sample source","Sample type","Treatment","Extraction","LC type","MS type","Ion mode","Quantification"];
+var legendOptions = ["Sample name","Sample source","Sample type","Tissue","Treatment","Extraction","LC type","MS type","Ion mode","Quantification"];
 function init()

@@ Line 2: / Line 2: @@
 // <span id="search"></span><span id="show"></span>
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // 2017/03/15 ・パイチャートのタイトルを「ratio」から「Intensity ratio」へ変更
 //            ・パイチャートのサイズ統一をキャンセル
 // 2017/03/13 ・ヒートマップにおいて、カットオフ値が相対値ではなく絶対値で計算していた不具合を修正
 // 2017/03/06 ・カットオフに「%」を追加
@@ Line 32: / Line 35: @@
 const MARGIN = 30;
 var barColor = DEFAULT_BAR_COLOR;
 function init()
+{
@@ Line 90: / Line 95: @@
 		var height   = 300;
 		var pieWidth = 400;
 		var width = $(window).width() - $("#sortableList").width() - $("#mw-panel").width() - pieWidth - MARGIN;
 		if(width < 300)
@@ Line 289: / Line 296: @@
 	for(var i = rateDiv.childNodes.length-1; i >= 0; i --)
 		rateDiv.removeChild(rateDiv.childNodes[i]);
 	if(document.getElementById('bar').checked)
@@ Line 471: / Line 481: @@
+		}
 	});*/
 	// create barchart(s)
@@ Line 479: / Line 512: @@
 	data       = [];
 	srcdata    = [];
 	var root    = document.getElementById('container');
 	var unifiedFlag = true;
@@ Line 505: / Line 539: @@
 			gBarData[i][j] = type + attrEscape(result[0].x[j]).replace("/","-"); // InChIキー
+		}
 		seriesData[i] = {
-			name: attrEscape(result[0].map[i].meta["Sample source"] + '/' + result[0].map[i].meta["Sample type"]),
+			name: attrEscape(result[0].map[i].meta["Treatment"]),
 			data: data[i],
 			events: {
@@ Line 569: / Line 604: @@
 	chart[0].xLabels = xLabels;
 	chart[0].quantification = unitType;
 	// 絶対量か相対量か
@@ Line 734: / Line 771: @@
+		}
 	});
 	// create barchart(s)

@@ Line 3: / Line 3: @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // 2017/03/15 ・パイチャートのタイトルを「ratio」から「Intensity ratio」へ変更
 // 2017/03/13 ・ヒートマップにおいて、カットオフ値が相対値ではなく絶対値で計算していた不具合を修正
 // 2017/03/06 ・カットオフに「%」を追加
@@ Line 871: / Line 872: @@
 					allowPointSelect: true,
 					cursor: 'pointer',
 					dataLabels: {
 						enabled: true,

@@ Line 2: / Line 2: @@
 // <span id="search"></span><span id="show"></span>
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // 2017/03/13 ・ヒートマップにおいて、カットオフ値が相対値ではなく絶対値で計算していた不具合を修正
 // 2017/03/06 ・カットオフに「%」を追加
@@ Line 861: / Line 862: @@
 			},
 			title: {
-				text: (i+1) + '.ratio'
+				text: (i+1) + '.Intensity ratio'
 			},
 			tooltip: {

@@ Line 954: / Line 954: @@
 		var not0 = false;
 		for(var j = 0; j < length; j ++){
 			if(chart[index].data[j][k] >= cutoff){
 				not0 = true;

@@ Line 2: / Line 2: @@
 // <span id="search"></span><span id="show"></span>
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // 2017/03/06 ・カットオフに「%」を追加
 //            ・パイチャートのサイズを統一
@@ Line 950: / Line 951: @@
 	var cutoff = parseInt(document.getElementById("cutoffValue").value);
 	var xLabels = [];
-	for(var k = 0; k < gHeatmapData[index].map[0].data.length; k ++){
+	for(var k = 0; k < chart[index].data[0].length; k ++){
 		var not0 = false;
 		for(var j = 0; j < length; j ++){
-			if(gHeatmapData[index].map[j].data[k][0] >= cutoff){
+console.log(j,chart[index].data[j][k],cutoff);
 				not0 = true;
 				break;
@@ Line 1,019: / Line 1,021: @@
 		var length = result[i].map.length
 		var inchi = [];
 		for(var j = 0; j < length; j ++){
 			inchi[j] = [];
 			for(var k = 0; k < result[i].map[j].data.length; k ++){
 				data[index] = [k, length-j-1, attrEscape(result[i].map[j].data[k][0] * 100 / result[i].map[j].max)];
 //				data[index] = [k, length-j-1, attrEscape(result[i].map[j].data[k][0] * 100 / result[i].maxOfAll)];
 				inchi[j][k] = inchiEscape(result[i].map[j].data[k][2]);
 				index ++;
+			}
@@ Line 1,223: / Line 1,228: @@
 		});
 		chart[i].inchi = inchi;
 		//chart.setSize(600,300,false);
+	}

@@ Line 2: / Line 2: @@
 // <span id="search"></span><span id="show"></span>
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // 2017/01/31 ・ひとまとめにした棒グラフをサポート
 // 2017/01/26 ・棒グラフで絶対量の時に、単位を表示するように変更
@@ Line 338: / Line 341: @@
 	var cutoffText = document.createElement("input");
 	cutoffText.id    = "cutoffValue";
-	cutoffText.type  = "number";
+	cutoffText.type  = "text";
 	cutoffText.value = 0;
 	cutoffText.min   = 0;
 	cutoffText.max   = 80;
 	cutoffText.style.width = "4em";
 	cutoffText.style.textAlign = "right";
@@ Line 351: / Line 355: @@
 */
 	var cutoffButton = document.createElement("input");
-	cutoffButton.value = "< cutoff";
+	cutoffButton.value = "% < cutoff";
 	cutoffButton.type  = "button";
 	cutoff.appendChild(cutoffButton);
@@ Line 865: / Line 869: @@
 					allowPointSelect: true,
 					cursor: 'pointer',
 					dataLabels: {
 						enabled: true,