Skip to content
This repository has been archived by the owner on May 11, 2021. It is now read-only.

Commit

Permalink
changed triangle highlighting to not rely on triangle proof objects
Browse files Browse the repository at this point in the history
  • Loading branch information
@mwittels
mwittels committed Jul 9, 2012
1 parent aefe1ef commit 9dc99f3
Show file tree
Hide file tree
Showing 3 changed files with 152 additions and 278 deletions.
283 changes: 109 additions & 174 deletions exercises/geometry_proofs_1.html
View file
Expand Up @@ -255,191 +255,126 @@
}); });


for(var line in graph.congruency.lines){ for(var line in graph.congruency.lines){
for(var line2 in graph.congruency.lines){ for(var line2 in graph.congruency.lines){


$(function(){ $(function(){
var $statement = $("."+line+"-"+line2); var $statement = $("."+line+"-"+line2);
var firstLine = graph.congruency.lines[line]; var firstLine = graph.congruency.lines[line];
var secondLine = graph.congruency.lines[line2]; var secondLine = graph.congruency.lines[line2];


if($statement.length > 0){ if($statement.length > 0){
$statement.bind("vmouseover", function(event) { $statement.bind("vmouseover", function(event) {
firstLine.setHighlighted({ firstLine.setHighlighted({
stroke: ORANGE, stroke: ORANGE,
"stroke-width": 3 "stroke-width": 3
}); });
secondLine.setHighlighted({ secondLine.setHighlighted({
stroke: BLUE, stroke: BLUE,
"stroke-width": 3 "stroke-width": 3
}); });
$(this).bind("vmouseout", function(event) { $(this).bind("vmouseout", function(event) {
firstLine.unsetHighlighted({ firstLine.unsetHighlighted({
stroke: "black", stroke: "black",
"stroke-width": 2 "stroke-width": 2
});
secondLine.unsetHighlighted({
stroke: "black",
"stroke-width": 2
});
});
}); });

secondLine.unsetHighlighted({
} stroke: "black",
"stroke-width": 2
});
});
}); });

} }
} });
}
}


for(var angle in graph.congruency.angles){ for(var angle in graph.congruency.angles){
for(var angle2 in graph.congruency.angles){ for(var angle2 in graph.congruency.angles){
$(function(){ $(function(){
var $statement = $("."+angle+"-"+angle2); var $statement = $("."+angle+"-"+angle2);
var firstAngle = graph.congruency.angles[angle]; var firstAngle = graph.congruency.angles[angle];
var secondAngle = graph.congruency.angles[angle2]; var secondAngle = graph.congruency.angles[angle2];


if($statement.length > 0){ if($statement.length > 0){
$statement.bind("vmouseover", function(event) { $statement.bind("vmouseover", function(event) {
var firstState = firstAngle.state; var firstState = firstAngle.state;
var secondState = secondAngle.state; var secondState = secondAngle.state;
var maxState = Math.max(firstState,secondState); var maxState = Math.max(firstState,secondState);


firstAngle.setHighlighted({ firstAngle.setHighlighted({
stroke: ORANGE, stroke: ORANGE,
"stroke-width": 3 "stroke-width": 3
}); });
secondAngle.setHighlighted({ secondAngle.setHighlighted({
stroke: BLUE, stroke: BLUE,
"stroke-width": 3 "stroke-width": 3
}); });
firstAngle.setState(maxState > 0 ? maxState : 1); firstAngle.setState(maxState > 0 ? maxState : 1);
secondAngle.setState(maxState > 0 ? maxState : 1); secondAngle.setState(maxState > 0 ? maxState : 1);
$(this).bind("vmouseout", function(event) { $(this).bind("vmouseout", function(event) {
firstAngle.unsetHighlighted({ firstAngle.unsetHighlighted({
stroke: "black", stroke: "black",
"stroke-width": 2 "stroke-width": 2
});
secondAngle.unsetHighlighted({
stroke: "black",
"stroke-width": 2
});
firstAngle.setState(firstState);
secondAngle.setState(secondState);
});
}); });
} secondAngle.unsetHighlighted({
stroke: "black",
"stroke-width": 2
});
firstAngle.setState(firstState);
secondAngle.setState(secondState);
});
}); });
} }
});
}
}

for(var line in graph.congruency.lines){
$(function(){
var $statements = $("."+line);
for(var i = 0; i<$statements.length; i++){
var highlightLine = graph.congruency.lines[line];
var highlightDiv = $($statements[i]);

highlightDiv.bind("vmouseover", function(event) {
highlightLine.setHighlighted({
stroke: ORANGE,
"stroke-width": 3
});
$(this).bind("vmouseout", function(event) {
highlightLine.unsetHighlighted({
stroke: "black",
"stroke-width": 2
});
});
});
} }
});
}


for(var i=0; i<(TRIANGLES.length); i++){ for(var line in graph.congruency.lines){
for(var j=0; j<(TRIANGLES.length); j++){ $(function(){
for(var k=0; k<3; k++){ var $statements = $("."+line + "2");
// > for(var i = 0; i&lt;$statements.length; i++){
$(function(){ var highlightLine = graph.congruency.lines[line];
var triangle = TRIANGLES[i]; var highlightDiv = $($statements[i]);
var triangle2 = TRIANGLES[j];

highlightDiv.bind("vmouseover", function(event) {
var seg1_1 = triangle.segs[k].toString().substring(3,5); highlightLine.setHighlighted({
var seg1_2 = triangle.segs[(k+1) % 3].toString().substring(3,5); stroke: BLUE,
var seg1_3 = triangle.segs[(k+2) % 3].toString().substring(3,5); "stroke-width": 3

});
var seg2_1 = triangle2.segs[k].toString().substring(3,5); $(this).bind("vmouseout", function(event) {
var seg2_2 = triangle2.segs[(k+1) % 3].toString().substring(3,5); highlightLine.unsetHighlighted({
var seg2_3 = triangle2.segs[(k+2) % 3].toString().substring(3,5); stroke: "black",

"stroke-width": 2
var triangleSegs = [seg1_1, seg1_2, seg1_3];
var triangle2Segs = [seg2_1, seg2_2, seg2_3];
var sharedSeg = [-1, -1];

for(var l=0; l<3; l++){
for(var m=0; m<3; m++){
// >
if(triangleSegs[l] === triangle2Segs[m]){
sharedSeg = [l,m];
}
}
}


var $statement = $("."+seg1_1+"-"+seg1_2+"-"+seg1_3+"-"+seg2_1+"-"+seg2_2+"-"+seg2_3);

var line1_1 = graph.congruency.lines[seg1_1];
var line1_2 = graph.congruency.lines[seg1_2];
var line1_3 = graph.congruency.lines[seg1_3];

var line2_1 = graph.congruency.lines[seg2_1];
var line2_2 = graph.congruency.lines[seg2_2];
var line2_3 = graph.congruency.lines[seg2_3];

var triangleLines = [line1_1, line1_2, line1_3];
var triangle2Lines = [line2_1, line2_2, line2_3];

if($statement.length > 0){
$statement.bind("vmouseover", function(event) {
for(var l=0; l<3; l++){
// >
if(sharedSeg[0] != l){
triangleLines[l].setUnselectedStyle({
stroke: ORANGE,
"stroke-width": 3
});
}
else{
triangleLines[l].setUnselectedStyle({
stroke: "black",
"stroke-width": 3
});
}
}

for(var l=0; l<3; l++){
// >
if(sharedSeg[1] != l){
triangle2Lines[l].setUnselectedStyle({
stroke: BLUE,
"stroke-width": 3
});
}
else{
triangle2Lines[l].setUnselectedStyle({
stroke: "black",
"stroke-width": 3
});
}
}

$(this).bind("vmouseout", function(event) {
line1_1.setUnselectedStyle({
stroke: "black",
"stroke-width": 2
});
line1_2.setUnselectedStyle({
stroke: "black",
"stroke-width": 2
});
line1_3.setUnselectedStyle({
stroke: "black",
"stroke-width": 2
});

line2_1.setUnselectedStyle({
stroke: "black",
"stroke-width": 2
});
line2_2.setUnselectedStyle({
stroke: "black",
"stroke-width": 2
});
line2_3.setUnselectedStyle({
stroke: "black",
"stroke-width": 2
});
});
});
}
}); });
} });
} });
} }
});
}


</div> </div>
</div> </div>
Expand Down

0 comments on commit 9dc99f3

Please sign in to comment.