Skip to content

F
freecad_x3d
Commit 27cda95d authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files
Options

1.fixed odd buttons 2.fixed left click over part with copies

parent 1f976f01
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 12 deletions
x3d_web_viewer/viewmodel.js
View file @ 27cda95d
...@@ -204,7 +204,7 @@ function prerun(){ ...@@ -204,7 +204,7 @@ function prerun(){
</tr>\ </tr>\
<tr>\ <tr>\
<td valign='top'>&nbsp;&nbsp;&nbsp;&nbsp;<b>&#8226; dbl-left-click:</b></td>\ <td valign='top'>&nbsp;&nbsp;&nbsp;&nbsp;<b>&#8226; dbl-left-click:</b></td>\
<td valign='top'>set center of rotation but <span style='color:rgba(255,100,100,1)'><b>interferes with left-click</b></span></td>\ <td valign='top'>hide part and its copies, <span style='color:rgba(255,100,100,1)'><b>interferes with center of rotation</b></span></td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td valign='top'>&nbsp;&nbsp;&nbsp;&nbsp;<b>&#8226; dbl-middle-click:</b></td>\ <td valign='top'>&nbsp;&nbsp;&nbsp;&nbsp;<b>&#8226; dbl-middle-click:</b></td>\
...@@ -449,6 +449,7 @@ function showBOM(){ ...@@ -449,6 +449,7 @@ function showBOM(){
ele_ul = $("<ul>",{class:"dropdown-menu","data-toggle":"dropdown"}).css({padding:"10px","min-width":"100px",border:"1px solid rgba(50,50,50,0.5)"}); ele_ul = $("<ul>",{class:"dropdown-menu","data-toggle":"dropdown"}).css({padding:"10px","min-width":"100px",border:"1px solid rgba(50,50,50,0.5)"});
btn_part = $("<button>",{class:"btn-part btn btn-default btn-sm btn-success "+odd_group}).css({"min-width":"100px"}).html(tmp_nsn); btn_part = $("<button>",{class:"btn-part btn btn-default btn-sm btn-success "+odd_group}).css({"min-width":"100px"}).html(tmp_nsn);
btn_part.attr("odd",odd_group_en);
btn_part.attr("nsn",tmp_nsn); btn_part.attr("nsn",tmp_nsn);
btn_part.attr("state","normal"); btn_part.attr("state","normal");
...@@ -599,8 +600,8 @@ function bindCanvas(){ ...@@ -599,8 +600,8 @@ function bindCanvas(){
if (!blockclick){ if (!blockclick){
if ((switch_click_time-old_time)<400){ if ((switch_click_time-old_time)<400){
if (event.which==1){ if (event.which==1){
model_run_cmd(pn,"normalize"); if (pn_arr[pn_arr.length-1]=="0") model_run_cmd(pn,"normalize");
model_run_cmd(pn,"right-click"); if (pn_arr[pn_arr.length-1]=="0") model_run_cmd(pn,"right-click");
} }
}else{ }else{
if (event.which==1){ if (event.which==1){
...@@ -627,7 +628,7 @@ function touchstarted(){ ...@@ -627,7 +628,7 @@ function touchstarted(){
function touchmoved(){ function touchmoved(){
//blockclick = true; //blockclick = true;
if ((getTimeStamp()-moveTimeStamp)>100){ if ((getTimeStamp()-moveTimeStamp)>200){
blockclick = true; blockclick = true;
} }
} }
...@@ -701,6 +702,9 @@ function update_info(name,state,cmd){ ...@@ -701,6 +702,9 @@ function update_info(name,state,cmd){
case "click-ext": case "click-ext":
update_info(name,"normal","left-click"); update_info(name,"normal","left-click");
break; break;
case "normalize0.9":
update_info(name,"normal","left-click");
break;
default: return false; default: return false;
} }
} }
...@@ -720,29 +724,30 @@ function model_run_cmd(name,cmd){ ...@@ -720,29 +724,30 @@ function model_run_cmd(name,cmd){
//ext buttons - white //ext buttons - white
$(".btn-part[nsn="+name+"]").removeClass("btn-success") $(".btn-part[nsn="+name+"]").removeClass("btn-success")
.removeClass("btn-primary").css({opacity:"1.0"}); .removeClass("btn-primary").css({opacity:"1.0"});
if ($(".btn-part[nsn="+name+"]").attr("odd")=="true"){
$(".btn-part[nsn="+name+"]").removeClass("btn-odd-success");
}
//int buttons - white //int buttons - white
$(".btn-subpart[nsn="+name+"]").removeClass("btn-success"); $(".btn-subpart[nsn="+name+"]").removeClass("btn-success");
//other buttons - untouched //other buttons - untouched
break; break;
case "left-click": case "left-click":
console.log("left-click!");
if (state=="normal"){ if (state=="normal"){
//other buttons - deselect! //other buttons - deselect!
//other states to normal //other states to normal
//make others who are visible - almost transparent //make others who are visible - almost transparent
$("Switch").each(function(){ model_run_cmd(name,"normalize0.9");
$(this).find("Material").attr("transparency",0.9);
if (($(this).attr("state")=="selected")||($(this).attr("state")=="superselected")) {
$(this).attr("state","normal");
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").removeClass("btn-primary");
}
$(".btn-part[nsn="+$(this).attr("nsn")+"]").css({opacity:"1.0"});
});
//update status to "selected" //update status to "selected"
$("Switch[nsn="+name+"]").attr("state","selected"); $("Switch[nsn="+name+"]").attr("state","selected");
$("Switch[nsn="+name+"]").find("Material").attr("transparency",0.0); $("Switch[nsn="+name+"]").find("Material").attr("transparency",0.0);
//ext button - blue //ext button - blue
$(".btn-part[nsn="+name+"]").addClass("btn-primary").removeClass("btn-success").css({opacity:"1.0"}); $(".btn-part[nsn="+name+"]").addClass("btn-primary").removeClass("btn-success").css({opacity:"1.0"});
if ($(".btn-part[nsn="+name+"]").attr("odd")=="true"){
$(".btn-part[nsn="+name+"]").removeClass("btn-odd-success");
}
//int buttons - green //int buttons - green
$(".btn-subpart[nsn="+name+"]").addClass("btn-success"); $(".btn-subpart[nsn="+name+"]").addClass("btn-success");
} }
...@@ -758,6 +763,9 @@ function model_run_cmd(name,cmd){ ...@@ -758,6 +763,9 @@ function model_run_cmd(name,cmd){
$("Switch[nsn="+name+"]").attr("whichChoice",0); $("Switch[nsn="+name+"]").attr("whichChoice",0);
//ext button - green //ext button - green
$(".btn-part[nsn="+name+"]").addClass("btn-success"); $(".btn-part[nsn="+name+"]").addClass("btn-success");
if ($(".btn-part[nsn="+name+"]").attr("odd")=="true"){
$(".btn-part[nsn="+name+"]").addClass("btn-odd-success");
}
//int buttons - green //int buttons - green
$(".btn-subpart[nsn="+name+"]").addClass("btn-success"); $(".btn-subpart[nsn="+name+"]").addClass("btn-success");
//other buttons - untouched //other buttons - untouched
...@@ -792,6 +800,9 @@ function model_run_cmd(name,cmd){ ...@@ -792,6 +800,9 @@ function model_run_cmd(name,cmd){
if ($(this).attr("state")=="selected") { if ($(this).attr("state")=="selected") {
$(this).attr("state","normal"); $(this).attr("state","normal");
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").removeClass("btn-primary"); $(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").removeClass("btn-primary");
if ($(".btn-part[nsn="+$(this).attr("nsn")+"]").attr("odd")=="true"){
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-odd-success");
}
} }
if ($(this).attr("state")!="disabled") $(".btn-part[nsn="+$(this).attr("nsn")+"]").css({opacity:"0.5"}); if ($(this).attr("state")!="disabled") $(".btn-part[nsn="+$(this).attr("nsn")+"]").css({opacity:"0.5"});
}); });
...@@ -800,6 +811,9 @@ function model_run_cmd(name,cmd){ ...@@ -800,6 +811,9 @@ function model_run_cmd(name,cmd){
$("Switch[nsn="+name+"]").find("Material").attr("transparency",0.0); $("Switch[nsn="+name+"]").find("Material").attr("transparency",0.0);
$(".btn-part[nsn="+name+"]").removeClass("btn-success").addClass("btn-primary").css({opacity:"1.0"}); $(".btn-part[nsn="+name+"]").removeClass("btn-success").addClass("btn-primary").css({opacity:"1.0"});
if ($(".btn-part[nsn="+name+"]").attr("odd")=="true"){
$(".btn-part[nsn="+name+"]").removeClass("btn-odd-success");
}
//selected? //selected?
// superselected // superselected
// update status to superselected // update status to superselected
...@@ -822,6 +836,9 @@ function model_run_cmd(name,cmd){ ...@@ -822,6 +836,9 @@ function model_run_cmd(name,cmd){
if (($(this).attr("state")=="selected")||($(this).attr("state")=="superselected")) { if (($(this).attr("state")=="selected")||($(this).attr("state")=="superselected")) {
$(this).attr("state","normal"); $(this).attr("state","normal");
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").removeClass("btn-primary"); $(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").removeClass("btn-primary");
if ($(".btn-part[nsn="+$(this).attr("nsn")+"]").attr("odd")=="true"){
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-odd-success");
}
} }
$(".btn-part[nsn="+$(this).attr("nsn")+"]").css({opacity:"1.0"}); $(".btn-part[nsn="+$(this).attr("nsn")+"]").css({opacity:"1.0"});
}); });
...@@ -838,16 +855,35 @@ function model_run_cmd(name,cmd){ ...@@ -838,16 +855,35 @@ function model_run_cmd(name,cmd){
if (($(this).attr("state")=="selected")||($(this).attr("state")=="superselected")){ if (($(this).attr("state")=="selected")||($(this).attr("state")=="superselected")){
$(this).attr("state","normal"); $(this).attr("state","normal");
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").removeClass("btn-primary"); $(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").removeClass("btn-primary");
if ($(".btn-part[nsn="+$(this).attr("nsn")+"]").attr("odd")=="true"){
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-odd-success");
}
} }
$(".btn-part[nsn="+$(this).attr("nsn")+"]").css({opacity:"1.0"}); $(".btn-part[nsn="+$(this).attr("nsn")+"]").css({opacity:"1.0"});
}); });
break; break;
case "normalize0.9":
$("Switch").each(function(){
$(this).find("Material").attr("transparency",0.9);
if (($(this).attr("state")=="selected")||($(this).attr("state")=="superselected")){
$(this).attr("state","normal");
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").removeClass("btn-primary");
if ($(".btn-part[nsn="+$(this).attr("nsn")+"]").attr("odd")=="true"){
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-odd-success");
}
}
$(".btn-part[nsn="+$(this).attr("nsn")+"]").css({opacity:"1.0"});
});
break;
case "reset": case "reset":
$("Switch").each(function(){ $("Switch").each(function(){
$(this).attr("whichChoice",0); $(this).attr("whichChoice",0);
$(this).find("Material").attr("transparency",0.1); $(this).find("Material").attr("transparency",0.1);
$(this).attr("state","normal"); $(this).attr("state","normal");
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").removeClass("btn-primary"); $(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").removeClass("btn-primary");
if ($(".btn-part[nsn="+$(this).attr("nsn")+"]").attr("odd")=="true"){
$(".btn-part[nsn="+$(this).attr("nsn")+"]").addClass("btn-odd-success");
}
$(".btn-part[nsn="+$(this).attr("nsn")+"]").css({opacity:"1.0"}); $(".btn-part[nsn="+$(this).attr("nsn")+"]").css({opacity:"1.0"});
$(".btn-subpart[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").attr("selected",true); $(".btn-subpart[nsn="+$(this).attr("nsn")+"]").addClass("btn-success").attr("selected",true);
}); });
......
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