Karin.hedin@osteraker.se (Diskussion | bidrag) | Karin.hedin@osteraker.se (Diskussion | bidrag) |
| Rad 45: |
Rad 45: |
| | //Drag mig! för funktionerna | | //Drag mig! för funktionerna |
| | var dragMe2 = b.textA(1.9,0.6, 'Dra mig!'); | | var dragMe2 = b.textA(1.9,0.6, 'Dra mig!'); |
| − | var dragMeE = b.textA(1.3,1.1, 'Dra mig!'); | + | var dragMeE = b.textA(1.3,1.1, 'Dra mig!',{opacity:0, transitionDuration:0}); |
| − | var dragMeS = b.textA(0.75,-0.35, 'Dra mig!'); | + | var dragMeS = b.textA(0.75,-0.35, 'Dra mig!',{opacity:0, transitionDuration:0}); |
| | | | |
| − | b.hide([dragMeE, dragMeS]); | + | //b.hide([dragMeE, dragMeS]); |
| | | | |
| | //Skapa en tangentpunkt och tangenten | | //Skapa en tangentpunkt och tangenten |
| Rad 59: |
Rad 59: |
| | | | |
| | var lf2 = b.func('2.5', 'blue', {visible:false}); | | var lf2 = b.func('2.5', 'blue', {visible:false}); |
| − | var sinLegend = b.legend(lf2, -2.25,'y=\\sin(x)'); | + | var sinLegend = b.legend(lf2, -2.25,'y=\\sin(x)',{opacity:0, transitionDuration:0}); |
| | | | |
| | var lf3 = b.func('4.5', 'blue', {visible:false}); | | var lf3 = b.func('4.5', 'blue', {visible:false}); |
| − | var expLegend = b.legend(lf3, -2.25,'y=2^x'); | + | var expLegend = b.legend(lf3, -2.25,'y=2^x',{opacity:0, transitionDuration:0}); |
| | | | |
| − | b.hide([sinLegend, expLegend]); | + | //b.hide([sinLegend, expLegend]); |
| | | | |
| | | | |
| Rad 79: |
Rad 79: |
| | var circleAngle = b.angle(circleNode1, circleTangentPoint, helpPoint, {radius:0.4, orthoType:'square', layer:7, fillOpacity:1.0, strokeColor:'#666666', fillColor:'#B2B2B2'}); | | var circleAngle = b.angle(circleNode1, circleTangentPoint, helpPoint, {radius:0.4, orthoType:'square', layer:7, fillOpacity:1.0, strokeColor:'#666666', fillColor:'#B2B2B2'}); |
| | var tangent2 = b.board.create('tangent', [circleTangentPoint], {strokeColor:'red'}); | | var tangent2 = b.board.create('tangent', [circleTangentPoint], {strokeColor:'red'}); |
| − | b.circle(circleNode1, b.node(20.04,20.04), {strokeColor:'black', fillcolor:'black!60', strokeWidth:1, layer:9}); | + | b.circle(circleNode1, b.node(20.04,20.04), {strokeColor:'black', fillcolor:'black!60', strokeWidth:1, layer:9,opacity:0, transitionDuration:0}); |
| | | | |
| | | | |
| Rad 87: |
Rad 87: |
| | | | |
| | //Förbered för visning | | //Förbered för visning |
| − | b.hide(tangent2); | + | //b.hide(tangent2); |
| | | | |
| | //Sätt gränser för var punkten får vara | | //Sätt gränser för var punkten får vara |
| | tangentPoint.on('drag', function () { | | tangentPoint.on('drag', function () { |
| − | b.hide([dragMeE, dragMe2, dragMeS]); | + | b.hide([dragMeE, dragMe2, dragMeS],0); |
| | if (tangentPoint.X() > 4.2) { | | if (tangentPoint.X() > 4.2) { |
| | tangentPoint.moveTo([4.2, tangentPoint.Y()]); | | tangentPoint.moveTo([4.2, tangentPoint.Y()]); |
| Rad 104: |
Rad 104: |
| | | | |
| | circleTangentPoint.on('drag', function () { | | circleTangentPoint.on('drag', function () { |
| − | b.hide(dragMeC); | + | b.hide(dragMeC,0); |
| | }); | | }); |
| | | | |
| Rad 111: |
Rad 111: |
| | //Sinuskurva | | //Sinuskurva |
| | mlg.af("tangent_illustration_1.sinus", function(){ | | mlg.af("tangent_illustration_1.sinus", function(){ |
| − | b.hide([dragMeE, dragMeC, dragMe2, expLegend, polyLegend, tangent2]); | + | b.hide([dragMeE, dragMeC, dragMe2, expLegend, polyLegend, tangent2],0); |
| − | b.show([dragMeS, sinLegend, tangent1]); | + | b.show([dragMeS, sinLegend, tangent1],0); |
| | whichFunction.moveTo([0,-20]); | | whichFunction.moveTo([0,-20]); |
| | b.board.setBoundingBox([-4.5,3.5,4.5,-3.5]); | | b.board.setBoundingBox([-4.5,3.5,4.5,-3.5]); |
| Rad 121: |
Rad 121: |
| | //Andragradsfunktion | | //Andragradsfunktion |
| | mlg.af("tangent_illustration_1.seconddeg", function(){ | | mlg.af("tangent_illustration_1.seconddeg", function(){ |
| − | b.hide([dragMeE, dragMeS, dragMeC, expLegend, sinLegend, tangent2]); | + | b.hide([dragMeE, dragMeS, dragMeC, expLegend, sinLegend, tangent2],0); |
| − | b.show([dragMe2, polyLegend, tangent1]); | + | b.show([dragMe2, polyLegend, tangent1],0); |
| | whichFunction.moveTo([1,-20]); | | whichFunction.moveTo([1,-20]); |
| | b.board.setBoundingBox([-4.5,5.5,4.5,-1.5]); | | b.board.setBoundingBox([-4.5,5.5,4.5,-1.5]); |
| Rad 131: |
Rad 131: |
| | //Exponentialfunktion | | //Exponentialfunktion |
| | mlg.af("tangent_illustration_1.exponential", function(){ | | mlg.af("tangent_illustration_1.exponential", function(){ |
| − | b.hide([dragMeC, dragMeS, dragMe2, polyLegend, sinLegend, tangent2]); | + | b.hide([dragMeC, dragMeS, dragMe2, polyLegend, sinLegend, tangent2],0); |
| − | b.show([dragMeE, expLegend, tangent1]); | + | b.show([dragMeE, expLegend, tangent1],0); |
| | whichFunction.moveTo([2,-20]); | | whichFunction.moveTo([2,-20]); |
| | b.board.setBoundingBox([-4.5,5.5,4.5,-1.5]); | | b.board.setBoundingBox([-4.5,5.5,4.5,-1.5]); |
| Rad 141: |
Rad 141: |
| | //Cirkel | | //Cirkel |
| | mlg.af("tangent_illustration_1.circle", function(){ | | mlg.af("tangent_illustration_1.circle", function(){ |
| − | b.hide([dragMeE, dragMeS, dragMe2, tangent1]); | + | b.hide([dragMeE, dragMeS, dragMe2, tangent1],0); |
| − | b.show([dragMeC, tangent2]); | + | b.show([dragMeC, tangent2],0); |
| | b.board.setBoundingBox([16,23,24,17]); | | b.board.setBoundingBox([16,23,24,17]); |
| | circleTangentPoint.moveTo([24,16]); | | circleTangentPoint.moveTo([24,16]); |
