Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[557] JSFloorPlan/trunk
|
From: <ma...@us...> - 2011-12-09 12:49:30
|
Revision: 557
http://openautomation.svn.sourceforge.net/openautomation/?rev=557&view=rev
Author: mayerch
Date: 2011-12-09 12:49:24 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Fix UI (but it's not linked to the display yet...)
Modified Paths:
--------------
JSFloorPlan/trunk/index.html
JSFloorPlan/trunk/jsfloorplan.js
JSFloorPlan/trunk/jsfloorplan_example_helper.js
Modified: JSFloorPlan/trunk/index.html
===================================================================
--- JSFloorPlan/trunk/index.html 2011-12-09 10:36:54 UTC (rev 556)
+++ JSFloorPlan/trunk/index.html 2011-12-09 12:49:24 UTC (rev 557)
@@ -49,7 +49,7 @@
</pre>
<hr />
<h2>Einstellungen:</h2>
-<form name="settings" method="get">
+<form>
<table>
<tr>
<td>
@@ -59,31 +59,31 @@
</tr>
<tr>
<td>
- Zeige Wände: <input type="checkbox" name="showWallSides" onclick="check('showWallSides',true)" checked="checked" />
+ Zeige Wände: <input type="checkbox" name="showWallSides" checked="checked" />
</td><td>
- Zeige Deckel: <input type="checkbox" name="showWallTop" onclick="check('showWallTop',true)" checked="checked" />
+ Zeige Deckel: <input type="checkbox" name="showWallTop" checked="checked" />
</td><td>
- Zeige Rückseite: <input type="checkbox" name="showBackside" onclick="check('showBackside',true)" checked="checked" />
+ Zeige Rückseite: <input type="checkbox" name="showBackside" checked="checked" />
</td><td>
- Zeige MouseOver: <input type="checkbox" name="wallMouseOver" onclick="check('wallMouseOver',true)" />
+ Zeige MouseOver: <input type="checkbox" name="wallMouseOver" />
</td>
</tr>
<tr>
<td>
- Wand-Umrandung: <input type="checkbox" name="showSideLines" onclick="check('showSideLines',true)" checked="checked" />
+ Wand-Umrandung: <input type="checkbox" name="showSideLines" checked="checked" />
</td><td>
- Deckel-Umrandung: <input type="checkbox" name="showTopLines" onclick="check('showTopLines',true)" checked="checked" />
+ Deckel-Umrandung: <input type="checkbox" name="showTopLines" checked="checked" />
</td><td>
- Zeige "Löcher": <input type="checkbox" name="showHoles" onclick="check('showHoles',true)" checked="checked" />
+ Zeige "Löcher": <input type="checkbox" name="showHoles" checked="checked" />
</td><td>
- Erzeuge Zonen: <input type="checkbox" name="showZones" onclick="check('showZones',true)" checked="checked" />
+ Erzeuge Zonen: <input type="checkbox" name="showZones" checked="checked" />
</td><td>
- Zeige Zonen: <input type="checkbox" name="showVisibleZones" onclick="check('showVisibleZones',true)" checked="checked" />
+ Zeige Zonen: <input type="checkbox" name="showVisibleZones" checked="checked" />
</td>
</tr>
<tr>
<td>
- Transparenz: <select size="1" name="fillOpacity" onchange="selectValue('fillOpacity',true)">
+ Transparenz: <select size="1" name="fillOpacity">
<option value="0.1">0.1 - sehr transparent</option>
<option value="0.2">0.2</option>
<option value="0.3">0.3</option>
@@ -96,7 +96,7 @@
<option value="1.0">1.0 - undurchsichtig</option>
</select>
</td><td>
- Farbe: <select size="1" name="fillColor" onchange="selectValue('fillColor',true)">
+ Farbe: <select size="1" name="fillColor">
<option value="black" selected="selected">Schwarz</option>
<option value="grey">Grau</option>
<option value="white">Weiß</option>
@@ -105,7 +105,7 @@
<option value="green">Grün</option>
</select>
</td><td>
- Stockwerk: <select size="1" name="showFloor" onchange="selectValue('showFloor',true)">
+ Stockwerk: <select size="1" name="showFloor">
<option value="0" selected="selected">0</option>
<option value="1">1</option>
</select>
Modified: JSFloorPlan/trunk/jsfloorplan.js
===================================================================
--- JSFloorPlan/trunk/jsfloorplan.js 2011-12-09 10:36:54 UTC (rev 556)
+++ JSFloorPlan/trunk/jsfloorplan.js 2011-12-09 12:49:24 UTC (rev 557)
@@ -77,6 +77,7 @@
/*******************************************************************/
/* IE compatability stuff starts here */
/*******************************************************************/
+/*
// Fix problems of IE that it doesn't support the
// createElementNS method
function createSVGElement( element )
@@ -93,6 +94,7 @@
{
return element.setAttributeNS( XLINK_NS, attribute, value );
}
+*/
/*******************************************************************/
/* IE compatability stuff ends here */
@@ -120,7 +122,7 @@
noFloorplan = false;
// create the SVG node where all elements are collected in
//var plan = document.createElementNS( SVG_NS, "g" );
- var plan = createSVGElement( "g" );
+ //var plan = createSVGElement( "g" );
// basic check if the document seems right
// this could be avoided if the XML file would be validated
@@ -310,7 +312,7 @@
imageCenter.y = buildingProperties.y_center;
imageCenter.z = buildingProperties.z_max / 2;
- show3D( 35*Math.PI/180, 30*Math.PI/180, plan );
+ show3D( 35*Math.PI/180, 30*Math.PI/180 );
//document.getElementById( "top_level" ).appendChild( plan );
}
@@ -458,6 +460,7 @@
document.getElementById( "top_level" ).appendChild( defs );
}
+/*
//var wrapper = document.createElementNS( SVG_NS, "g" );
var wrapper = createSVGElement( "g" );
wrapper.setAttribute( "fill", fillColor );
@@ -474,6 +477,7 @@
var poly_only = createSVGElement( "path" );
var poly_clear = createSVGElement( "path" );
poly_clear.setAttribute( "style", "stroke:none;fill:none;" );
+*/
run_count = 5;
// show the diagram in a 2.5D perspective, i.e. isometric
@@ -736,6 +740,7 @@
////t_25d_end = new Date;
}
+/*
plan = createSVGElement( "g" );
function replaceSVG( SVGelement )
{
@@ -743,6 +748,7 @@
delete plan;
plan = createSVGElement( "g" );
}
+*/
var noSetup = true;
function setup3D()
@@ -750,6 +756,8 @@
if( noFloorplan ) return;
noSetup = false;
+ var showFloor = showStates.showFloor;
+
for( var i=0; i<lines[showFloor].length; )
{
//console.log(i);
@@ -878,7 +886,7 @@
}
-function show3D( rotation, tilt, plan )
+function show3D( rotation, tilt )
{
if( noSetup ) setup3D();
Modified: JSFloorPlan/trunk/jsfloorplan_example_helper.js
===================================================================
--- JSFloorPlan/trunk/jsfloorplan_example_helper.js 2011-12-09 10:36:54 UTC (rev 556)
+++ JSFloorPlan/trunk/jsfloorplan_example_helper.js 2011-12-09 12:49:24 UTC (rev 557)
@@ -57,6 +57,7 @@
ASPECT,
NEAR,
FAR );
+/*
var controls = new THREE.TrackballControls( camera );
//controls.rotateSpeed = 1.0;
//controls.zoomSpeed = 1.2;
@@ -69,7 +70,7 @@
controls.dynamicDampingFactor = 0.3;
controls.keys = [ 65, 83, 68 ];
-
+*/
var scene = new THREE.Scene();
// the camera starts at 0,0,0 so pull it back
@@ -145,7 +146,7 @@
function animate() {
requestAnimationFrame( animate );
//render();
- show3D();
+ show3D( roll, tilt );
//stats.update();
}
@@ -163,6 +164,8 @@
/////////////////////////////////////////////////////////////////////////////
// setup script here:
var sc = 40; // overall scaling
+var showStates = {};
+/*
var showWallSides = true;
var showWallTop = true;
var showSideLines = true;
@@ -175,6 +178,7 @@
var wallMouseOver = true;
var fillOpacity = 0.5;
var fillColor = 'black';
+*/
var redrawInterval = 50; // in milliseconds; = 20 fps
var roll = 35*Math.PI/180;
@@ -194,21 +198,20 @@
function init()
{
- check( 'showWallSides' , false );
- check( 'showWallTop' , false );
- check( 'showSideLines' , false );
- check( 'showTopLines' , false );
- check( 'showBackside' , false );
- check( 'showHoles' , false );
- check( 'showZones' , false );
- check( 'showVisibleZones' , false );
- check( 'wallMouseOver' , false );
- selectValue( 'fillOpacity', false );
- selectValue( 'fillColor' , false );
- selectValue( 'showFloor' , false );
-
+ $('input').change(function(e){
+ showStates[ e.target.name ] = e.target.checked;
+ show3D( roll, tilt );
+ }).each(function(){
+ showStates[ this.name ] = this.checked; // init
+ });
+ $('select').change(function(e){
+ showStates[ e.target.name ] = e.target.value;
+ show3D( roll, tilt );
+ }).each(function(){
+ showStates[ this.name ] = this.value; // init
+ });
+
loadFloorplan();
-
createSlider();
}
@@ -224,6 +227,7 @@
animation = setInterval(move, redrawInterval);
toggle = true;
}
+ return true;
}
function move()
@@ -239,7 +243,7 @@
if( tilt < 0 )
tilt_dir = 1;
- show3D( roll, tilt, plan );
+ show3D( roll, tilt );
//////
var middle = new Date();
@@ -285,6 +289,7 @@
document.getElementById('status').firstChild.data = text;
}
+/*
function set_color( event )
{
if( 'blue' != fillColor )
@@ -297,7 +302,8 @@
{
event.setAttribute( 'fill', fillColor );
}
-
+*/
+/*
function check( what, redraw )
{
eval( what +' = document.forms[0].elements[what].checked' );
@@ -321,7 +327,9 @@
show3D( roll, tilt, plan );
}
}
+*/
+/*
function selectValue( what, redraw )
{
var val = document.forms[0].elements[what].options[ document.forms[0].elements[what].selectedIndex ].value;
@@ -343,6 +351,7 @@
show3D( roll, tilt, plan );
}
}
+*/
// Create the little graphics for the roll and the tilt angle
// as well as the buttons to manipulate them
@@ -350,7 +359,7 @@
{
$( "#rollSlider" ).slider({ min: 0, max: 360, change: rollChange, slide: rollChange});
$( "#tiltSlider" ).slider({ min: 0, max: 90, change: tiltChange, slide: tiltChange});
- $( "#distSlider" ).slider({ min: 5, max: 30, change: distChange, slide: distChange});
+ $( "#distSlider" ).slider({ min: 5, max: 30, change: distChange, slide: distChange});
updateSlider();
}
@@ -368,21 +377,21 @@
function rollChange( event, ui )
{
- if( globalInUpdateSlider ) return;
+ if( globalInUpdateSlider ) return true;
roll = ui.value * Math.PI / 180;
- show3D( roll, tilt, plan );
+ show3D( roll, tilt );
}
function tiltChange( event, ui )
{
- if( globalInUpdateSlider ) return;
+ if( globalInUpdateSlider ) return true;
tilt = ui.value * Math.PI / 180;
- show3D( roll, tilt, plan );
+ show3D( roll, tilt );
}
function distChange( event, ui )
{
- if( globalInUpdateSlider ) return;
+ if( globalInUpdateSlider ) return true;
dist = ui.value;
- show3D( roll, tilt, plan );
+ show3D( roll, tilt );
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
