Commit b8bac284 authored by liyang's avatar liyang

fix:debug

parent b3961490
Pipeline #657 failed with stages
console.log("------ datav3.q.common.js debug ------")
var map = null; var map = null;
var phyTopoin =null; var phyTopoin =null;
var phyInterRouter =null; var phyInterRouter =null;
......
console.log("------ datav3.q.exportdata.js debug ------")
$('#logic-export').click(function(){ $('#logic-export').click(function(){
var inputValue = $(this).siblings('input').val(); var inputValue = $(this).siblings('input').val();
......
console.log("------ datav3.q.initwebgl.js debug ------")
// 声明变量,用于存储渲染器、场景、相机、容器宽高、控制器和克隆相机 // 声明变量,用于存储渲染器、场景、相机、容器宽高、控制器和克隆相机
var renderer; var renderer;
var scene; var scene;
......
console.log("------ datav3.q.left.js debug ------")
$(function(){ $(function(){
var leftinfo = $('.leftinfo'); var leftinfo = $('.leftinfo');
var leftinfoR =$('.right'); var leftinfoR =$('.right');
......
This diff is collapsed.
//自动执行函数 //自动执行函数
(function () { (function () {
console.log("------ datav3.q.map debug ------") console.log("------ datav3.q.map debug ------");
// 公共鼠标拾取变量 // 公共鼠标拾取变量
var raycaster = new THREE.Raycaster(); var raycaster = new THREE.Raycaster();
var mouse = new THREE.Vector2(); var mouse = new THREE.Vector2();
...@@ -492,7 +492,10 @@ ...@@ -492,7 +492,10 @@
transformSVGPathExposed(path(feature)), transformSVGPathExposed(path(feature)),
extrudeSettings extrudeSettings
), ),
new THREE.MeshLambertMaterial({ color: 0xffffff, depthTest: true }) new THREE.MeshLambertMaterial({
color: 0xffffff,
depthTest: true,
})
); );
map_mesh.name = "map_" + country_code; map_mesh.name = "map_" + country_code;
country_geomap_map.add(map_mesh); country_geomap_map.add(map_mesh);
...@@ -525,7 +528,7 @@ ...@@ -525,7 +528,7 @@
country_AScount_list.push(_.size(country_ASes)); country_AScount_list.push(_.size(country_ASes));
} }
var country_AScount_max = _.max(country_AScount_list); var country_AScount_max = _.max(country_AScount_list);
console.log("------------") console.log("------------");
// 点处理 // 点处理
var Land_points = new THREE.Geometry(); var Land_points = new THREE.Geometry();
valid_country_names = []; // 实际有效的绘图国家列表 valid_country_names = []; // 实际有效的绘图国家列表
......
console.log("------ datav3.q.right.js debug ------");
//***********右侧信息展示中供index调用的接口封装***********/ //***********右侧信息展示中供index调用的接口封装***********/
// 右下按钮动画 // 右下按钮动画
$(function(){ $(function () {
var right_btm = $('.right-btm'); var right_btm = $(".right-btm");
var content = right_btm.find('.content'); var content = right_btm.find(".content");
var content_list = content.find('.content-list'); var content_list = content.find(".content-list");
right_btm.find('.rb-btn').each(function(){ right_btm.find(".rb-btn").each(function () {
rbBtnAnimate($(this)); rbBtnAnimate($(this));
}) });
// rbBtnAnimate(right_btm.find('.rb-btn2')); // rbBtnAnimate(right_btm.find('.rb-btn2'));
function rbBtnAnimate($ele){ function rbBtnAnimate($ele) {
var btn_country = $ele.find(".rb-btn-center");
var btn_country = $ele.find('.rb-btn-center'); var rb_btn_outer = $ele.find(".rb-btn-outer");
var rb_btn_outer = $ele.find('.rb-btn-outer');
var btn_transition_time = 500; var btn_transition_time = 500;
var img_len = rb_btn_outer.find('img').length; var img_len = rb_btn_outer.find("img").length;
var per_deg = 360/img_len; var per_deg = 360 / img_len;
// var init_rotate = 140; // var init_rotate = 140;
if(img_len == 2){ if (img_len == 2) {
btn_country.click(function(){ btn_country.click(function () {
$_this = $(this); $_this = $(this);
var anim1 = scaleBtnCountry($_this); var anim1 = scaleBtnCountry($_this);
anim1.then(function(){ anim1.then(function () {
resetBtnCountry($_this); ; resetBtnCountry($_this);
}) });
}) });
}else{ } else {
btn_country.click(function(){ btn_country.click(function () {
$_this = $(this); $_this = $(this);
var anim1 = transiteBtnOuterDown($_this,-200); var anim1 = transiteBtnOuterDown($_this, -200);
anim1.then(function(){ anim1.then(function () {
resetBtnOuter($_this); ; resetBtnOuter($_this);
}) });
}) });
} }
function scaleBtnCountry($_el){ function scaleBtnCountry($_el) {
var dtd = $.Deferred(); var dtd = $.Deferred();
$_el.transition({ $_el.transition(
transform: 'scale(0.8) rotate(-40deg)' {
},btn_transition_time,function(){ transform: "scale(0.8) rotate(-40deg)",
},
btn_transition_time,
function () {
dtd.resolve(); dtd.resolve();
}) }
);
return dtd.promise(); return dtd.promise();
} }
function resetBtnCountry($_el){ function resetBtnCountry($_el) {
var dtd = $.Deferred(); var dtd = $.Deferred();
$_el.transition({ $_el.transition(
transform: 'scale(1) rotate(-40deg)' {
},btn_transition_time,function(){ transform: "scale(1) rotate(-40deg)",
},
btn_transition_time,
function () {
dtd.resolve(); dtd.resolve();
}) }
);
return dtd.promise(); return dtd.promise();
} }
rb_btn_outer.find('img').each(function(i,d){ rb_btn_outer.find("img").each(function (i, d) {
$(this).on("click.animate", function () {
$(this).on('click.animate',function(){
var $_this = $(this); var $_this = $(this);
var rotate_deg = i*per_deg; var rotate_deg = i * per_deg;
var anim1 = transiteBtnOuterDown($_this); var anim1 = transiteBtnOuterDown($_this);
anim1 .then(function(){ anim1
transiteBtnOuterUp($_this) .then(function () {
return rotateBtn($_this,rotate_deg); transiteBtnOuterUp($_this);
}).then(function(){ return rotateBtn($_this, rotate_deg);
resetBtnOuter($_this);
}) })
.then(function () {
resetBtnOuter($_this);
});
// $_this.addClass('active'); // $_this.addClass('active');
}) });
}) });
function transiteBtnOuterDown($_el,transZ){ function transiteBtnOuterDown($_el, transZ) {
var dtd = $.Deferred(); var dtd = $.Deferred();
var transZ = transZ || -40; var transZ = transZ || -40;
$_el.transition({ $_el.transition(
transform: 'translate3d(0px,0px,'+transZ+'px)' {
},btn_transition_time,function(){ transform: "translate3d(0px,0px," + transZ + "px)",
},
btn_transition_time,
function () {
dtd.resolve(); dtd.resolve();
}) }
);
return dtd.promise(); return dtd.promise();
} }
function transiteBtnOuterUp($_el,transZ){ function transiteBtnOuterUp($_el, transZ) {
var dtd = $.Deferred(); var dtd = $.Deferred();
var transZ = transZ || 50; var transZ = transZ || 50;
$_el.transition({ $_el.transition(
transform: 'translate3d(0px,0px,'+transZ+'px)' {
},btn_transition_time,function(){ transform: "translate3d(0px,0px," + transZ + "px)",
},
btn_transition_time,
function () {
dtd.resolve(); dtd.resolve();
}) }
);
return dtd.promise(); return dtd.promise();
} }
function rotateBtn($_el,rotate_deg){ function rotateBtn($_el, rotate_deg) {
var dtd = $.Deferred(); var dtd = $.Deferred();
$_el.parent().transition({ $_el.parent().transition(
transform: 'rotate(-'+rotate_deg+'deg)' {
},btn_transition_time,function(){ transform: "rotate(-" + rotate_deg + "deg)",
},
btn_transition_time,
function () {
dtd.resolve(); dtd.resolve();
}) }
);
return dtd.promise(); return dtd.promise();
} }
function resetBtnOuter($_el){ function resetBtnOuter($_el) {
$_el.transition(
$_el.transition({ {
transform: 'translate3d(0px,0px,0px)' transform: "translate3d(0px,0px,0px)",
},btn_transition_time) },
btn_transition_time
);
} }
} }
//右下信息中交互操作 //右下信息中交互操作
$('.aslist .content-list').each(function(){ $(".aslist .content-list").each(function () {
$(this).hover(function(){ $(this).hover(
function () {
$(this).addClass('active'); $(this).addClass("active");
},function(){ },
$(this).removeClass('active') function () {
}) $(this).removeClass("active");
}) }
);
}) });
});
This diff is collapsed.
console.log("------ q/json.js debug ------");
/** @license /** @license
* RequireJS plugin for loading JSON files * RequireJS plugin for loading JSON files
* - depends on Text plugin and it was HEAVILY "inspired" by it as well. * - depends on Text plugin and it was HEAVILY "inspired" by it as well.
...@@ -5,31 +7,44 @@ ...@@ -5,31 +7,44 @@
* Version: 0.4.0 (2014/04/10) * Version: 0.4.0 (2014/04/10)
* Released under the MIT license * Released under the MIT license
*/ */
define(['text'], function(text){ define(["text"], function (text) {
var CACHE_BUST_QUERY_PARAM = "bust",
var CACHE_BUST_QUERY_PARAM = 'bust', CACHE_BUST_FLAG = "!bust",
CACHE_BUST_FLAG = '!bust', jsonParse =
jsonParse = (typeof JSON !== 'undefined' && typeof JSON.parse === 'function')? JSON.parse : function(val){ typeof JSON !== "undefined" && typeof JSON.parse === "function"
return eval('('+ val +')'); //quick and dirty ? JSON.parse
: function (val) {
return eval("(" + val + ")"); //quick and dirty
}, },
buildMap = {}; buildMap = {};
function cacheBust(url){ function cacheBust(url) {
url = url.replace(CACHE_BUST_FLAG, ''); url = url.replace(CACHE_BUST_FLAG, "");
url += (url.indexOf('?') < 0)? '?' : '&'; url += url.indexOf("?") < 0 ? "?" : "&";
return url + CACHE_BUST_QUERY_PARAM +'='+ Math.round(2147483647 * Math.random()); return (
url +
CACHE_BUST_QUERY_PARAM +
"=" +
Math.round(2147483647 * Math.random())
);
} }
//API //API
return { return {
load: function (name, req, onLoad, config) {
load : function(name, req, onLoad, config) { if (
if (( config.isBuild && (config.inlineJSON === false || name.indexOf(CACHE_BUST_QUERY_PARAM +'=') !== -1)) || (req.toUrl(name).indexOf('empty:') === 0)) { (config.isBuild &&
(config.inlineJSON === false ||
name.indexOf(CACHE_BUST_QUERY_PARAM + "=") !== -1)) ||
req.toUrl(name).indexOf("empty:") === 0
) {
//avoid inlining cache busted JSON or if inlineJSON:false //avoid inlining cache busted JSON or if inlineJSON:false
//and don't inline files marked as empty! //and don't inline files marked as empty!
onLoad(null); onLoad(null);
} else { } else {
text.get(req.toUrl(name), function(data){ text.get(
req.toUrl(name),
function (data) {
var parsed; var parsed;
if (config.isBuild) { if (config.isBuild) {
buildMap[name] = data; buildMap[name] = data;
...@@ -43,14 +58,15 @@ define(['text'], function(text){ ...@@ -43,14 +58,15 @@ define(['text'], function(text){
onLoad(parsed); onLoad(parsed);
} }
}, },
onLoad.error, { onLoad.error,
accept: 'application/json' {
accept: "application/json",
} }
); );
} }
}, },
normalize : function (name, normalize) { normalize: function (name, normalize) {
// used normalize to avoid caching references to a "cache busted" request // used normalize to avoid caching references to a "cache busted" request
if (name.indexOf(CACHE_BUST_FLAG) !== -1) { if (name.indexOf(CACHE_BUST_FLAG) !== -1) {
name = cacheBust(name); name = cacheBust(name);
...@@ -61,12 +77,19 @@ define(['text'], function(text){ ...@@ -61,12 +77,19 @@ define(['text'], function(text){
//write method based on RequireJS official text plugin by James Burke //write method based on RequireJS official text plugin by James Burke
//https://github.com/jrburke/requirejs/blob/master/text.js //https://github.com/jrburke/requirejs/blob/master/text.js
write : function(pluginName, moduleName, write){ write: function (pluginName, moduleName, write) {
if(moduleName in buildMap){ if (moduleName in buildMap) {
var content = buildMap[moduleName]; var content = buildMap[moduleName];
write('define("'+ pluginName +'!'+ moduleName +'", function(){ return '+ content +';});\n'); write(
} 'define("' +
pluginName +
"!" +
moduleName +
'", function(){ return ' +
content +
";});\n"
);
} }
},
}; };
}); });
var SvgHeader = function(el,textid){ console.log("------ q/svgHeader2.js debug ------");
var SvgHeader = function (el, textid) {
var el = el; var el = el;
var width = 180; var width = 180;
...@@ -8,34 +10,33 @@ var SvgHeader = function(el,textid){ ...@@ -8,34 +10,33 @@ var SvgHeader = function(el,textid){
var xlinkNS = "http://www.w3.org/1999/xlink"; var xlinkNS = "http://www.w3.org/1999/xlink";
var svg = document.createElementNS(NS, "svg"); var svg = document.createElementNS(NS, "svg");
// var rec1 = document.createElementNS(NS, "path"); // var rec1 = document.createElementNS(NS, "path");
// var rec2 = document.createElementNS(NS, "path"); // var rec2 = document.createElementNS(NS, "path");
var circle= document.createElementNS(NS, "path"); var circle = document.createElementNS(NS, "path");
var text = document.createElementNS(NS, "text"); var text = document.createElementNS(NS, "text");
var textPath = document.createElementNS(NS, "textPath"); var textPath = document.createElementNS(NS, "textPath");
svg.setAttribute("viewBox", "0 0"+' '+width+' '+height); svg.setAttribute("viewBox", "0 0" + " " + width + " " + height);
circle.setAttribute("d", "m 90,12 A 78,78 0 1,0 91,12"); circle.setAttribute("d", "m 90,12 A 78,78 0 1,0 91,12");
circle.setAttribute("id", textid); circle.setAttribute("id", textid);
circle.setAttribute("class", "text_circle"); circle.setAttribute("class", "text_circle");
textPath.setAttributeNS(xlinkNS, "xlink:href", "#"+textid); textPath.setAttributeNS(xlinkNS, "xlink:href", "#" + textid);
textPath.setAttribute('id','textpath'+textid); textPath.setAttribute("id", "textpath" + textid);
text.appendChild(textPath); text.appendChild(textPath);
svg.appendChild(circle); svg.appendChild(circle);
svg.appendChild(text); svg.appendChild(text);
textPath.textContent = ''; textPath.textContent = "";
el.appendChild(svg); el.appendChild(svg);
var textend_deg = 120; var textend_deg = 120;
var r_text = 80; var r_text = 80;
svg.querySelectorAll('.circle') svg.querySelectorAll(".circle");
function setContent(content){ function setContent(content) {
// textPath.textContent = ''; // textPath.textContent = '';
textPath.textContent = content; textPath.textContent = content;
// console.log('content') // console.log('content')
...@@ -46,27 +47,24 @@ var SvgHeader = function(el,textid){ ...@@ -46,27 +47,24 @@ var SvgHeader = function(el,textid){
// console.log(text.getNumberOfChars()) // console.log(text.getNumberOfChars())
// var textstart_deg =text.textLength.animVal.value; //使用svg内部精确的计算值计算 // var textstart_deg =text.textLength.animVal.value; //使用svg内部精确的计算值计算
var textstart_deg =186-content.length*9/2; // 每个字符按10度计算 var textstart_deg = 186 - (content.length * 9) / 2; // 每个字符按10度计算
// console.log(textstart_deg) // console.log(textstart_deg)
function degToArc(deg){ function degToArc(deg) {
return deg*2*Math.PI*r_text/360; return (deg * 2 * Math.PI * r_text) / 360;
} }
// var m=document.querySelectorAll("circle")[3]; // var m=document.querySelectorAll("circle")[3];
circle.setAttribute('transform','rotate(-'+textstart_deg+' 90 90)'); circle.setAttribute("transform", "rotate(-" + textstart_deg + " 90 90)");
// midcircle.setAttribute('stroke-dasharray', arc_length+' '+(2*Math.PI*r_text-arc_length)); // midcircle.setAttribute('stroke-dasharray', arc_length+' '+(2*Math.PI*r_text-arc_length));
textstart_deg = 0; textstart_deg = 0;
} }
return { return {
setContent: setContent setContent: setContent,
} };
} };
// var circular_as = $('.circular').eq(0).get()[0]; // var circular_as = $('.circular').eq(0).get()[0];
// var svgHeaderAs = new SvgHeader(circular_as,'textcircleas'); // var svgHeaderAs = new SvgHeader(circular_as,'textcircleas');
// svgHeaderAs.setContent('333333333333') // svgHeaderAs.setContent('333333333333')
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment