you can now edit multi selected objects properties, does not work with scripts yet. Dynamic variables update rate has been optimized, they will only be updated on change.

MrNothing · MrNothing · commit 4933c2c7c404 · 2017-12-09T14:59:30.000+01:00
diff --git a/Sources/src/Model/UI/CreateScript.js b/Sources/src/Model/UI/CreateScript.js
@@ -129,10 +129,10 @@ export default class CreateProject extends React.Component {
 			<br/>
 			Templates: 
 		  	<div className="list-group">
-				<a className={"list-group-item "+this.isActive("empty_template.py")}  href="#" onClick={this.setTemplate.bind(this, "empty_template.py", "An empty python script", "fa fa-file-code-o", "Empty script")}><span className="fa fa-file-code-o"></span> Empty script</a>
-			    <a className={"list-group-item "+this.isActive("loader_template.py")} href="#" onClick={this.setTemplate.bind(this, "loader_template.py", "Create your own dataset loader.", "fa fa-sort-numeric-asc", "Data loader")}><span className="fa fa-sort-numeric-asc"></span> Data loader</a>
-			    <a className={"list-group-item "+this.isActive("classifier_template.py")} href="#" onClick={this.setTemplate.bind(this, "classifier_template.py", "Create your own trainer!", "fa fa-magic", "Classifier")}><span className="fa fa-magic"></span> Classifier</a>
-			    <a className={"list-group-item "+this.isActive("predictor_template.py")} href="#" onClick={this.setTemplate.bind(this, "predictor_template.py", "Use your trained model!", "fa fa-magic", "Predictor")}><span className="fa fa-magic"></span> Predictor</a>
+				<a className={"list-group-item "+this.isActive("empty_template.py")}  href="#" onClick={this.setTemplate.bind(this, "empty_template.py", "An empty python script", "fa fa-file-code-o", "Empty script")}><span class="fa fa-file-code-o"></span> Empty script</a>
+			    <a className={"list-group-item "+this.isActive("loader_template.py")} href="#" onClick={this.setTemplate.bind(this, "loader_template.py", "Create your own dataset loader.", "fa fa-sort-numeric-asc", "Data loader")}><span class="fa fa-sort-numeric-asc"></span> Data loader</a>
+			    <a className={"list-group-item "+this.isActive("classifier_template.py")} href="#" onClick={this.setTemplate.bind(this, "classifier_template.py", "Create your own trainer!", "fa fa-magic", "Classifier")}><span class="fa fa-magic"></span> Classifier</a>
+			    <a className={"list-group-item "+this.isActive("predictor_template.py")} href="#" onClick={this.setTemplate.bind(this, "predictor_template.py", "Use your trained model!", "fa fa-magic", "Predictor")}><span class="fa fa-magic"></span> Predictor</a>
 			</div> 
 		  	<div className="panel panel-default">
 			  <div className="panel-heading"><span className={this.state.icon}></span> {this.state.templatename}</div>
diff --git a/Sources/src/Model/UI/Modules/AudioViewer.js b/Sources/src/Model/UI/Modules/AudioViewer.js
@@ -21,10 +21,19 @@ export default class AudioViewer extends React.Component {
         }
     }
 
+    edit()
+    {
+        let fullpath = document.getElementById("audio_source_"+this.props.id).src;
+        var open = require("open");
+        open(fullpath);
+    }
+
     render() {
-        return (
-        <audio id={"audio_"+this.props.id} style={{width: "100%"}} className='media-object' controls>
-          <source id={"audio_source_"+this.props.id}/>
-        </audio>);
+        return (<div>
+            <audio id={"audio_"+this.props.id} style={{width: "100%"}} className='media-object' controls>
+              <source id={"audio_source_"+this.props.id}/>
+            </audio>
+            <span onClick={this.edit.bind(this)} className="glyphicon glyphicon-edit" style={{cursor:'pointer'}}></span> 
+        </div>);
     }
 }
diff --git a/Sources/src/Model/UI/Properties.js b/Sources/src/Model/UI/Properties.js
@@ -96,7 +96,8 @@ export default class Properties extends React.Component {
 	  				return this.renderDataGrid(window.service.selectedObject.toJsonDescriptor());
 	  			else
 	  			{
-	  				return <div>{Object.keys(window.service.selectedObjects).length+""} objects selected</div>;
+	  				return this.renderDataGrid(window.service.selectedObject.toJsonDescriptor(), true);
+	  				//<div>{Object.keys(window.service.selectedObjects).length+""} objects selected</div>;
 	  			}
   			}
   			else
@@ -544,6 +545,11 @@ export default class Properties extends React.Component {
   			if(window.service.selectedObject!=null)
   			{
 	  			//update selected object...
+	  			for (let i in window.service.selectedObjects)
+	  			{
+	  				window.service.selectedObjects[i][field] = newVal;
+	  			}
+
 	  			window.service.selectedObject[field] = newVal;
 	  			this.forceUpdate();
 				window.service.sceneUI.forceUpdate();
@@ -564,6 +570,12 @@ export default class Properties extends React.Component {
 		{
 			val = "True"
 		}
+
+		for (let i in window.service.selectedObjects)
+		{
+			window.service.selectedObjects[i][field] = val;
+		}
+
 		window.service.selectedObject[field] = val;
 		this.forceUpdate();
 		window.service.sceneUI.forceUpdate();
@@ -583,6 +595,7 @@ export default class Properties extends React.Component {
 			script.params[field].value = document.getElementById(domID).value;
 		}
 
+		window.service.updatedDynamicVars = true;
 		this.forceUpdate();
 	}
 
@@ -611,6 +624,7 @@ export default class Properties extends React.Component {
 			script.params[field].value = val;
 		}
 
+		window.service.updatedDynamicVars = true;
 		this.forceUpdate();
 	}
 
@@ -620,7 +634,7 @@ export default class Properties extends React.Component {
 		this.forceUpdate();
 	}
 
-	renderDataGrid(data)
+	renderDataGrid(data, multi)
 	{	
 		let counter = 0;
 		let rows = []
@@ -696,10 +710,14 @@ export default class Properties extends React.Component {
 			{
 				if(window.service.selectedObject.scripts.length>0)
 				{
-					cols.push(<div className="" key={counter+"_1"}>{this.renderScriptsPanel()}</div>);
+					if (multi)
+						cols.push(<div className="" key={counter+"_1"}>Multi edition is not avaliablefor scripts yet.</div>);
+					else
+						cols.push(<div className="" key={counter+"_1"}>{this.renderScriptsPanel()}</div>);
 				}
 				
-				cols.push(<a onClick={this.showFilePicker.bind(this, "py")} className="list-group-item list-group-item-action list-group-item-info">Add a script <span className="glyphicon glyphicon-plus"/></a>);
+				if (!multi)
+					cols.push(<a onClick={this.showFilePicker.bind(this, "py")} className="list-group-item list-group-item-action list-group-item-info">Add a script <span className="glyphicon glyphicon-plus"/></a>);
 				
 			}
 			else
diff --git a/Sources/src/core.js b/Sources/src/core.js
@@ -102,13 +102,11 @@ function loop()
 {
   if(window.service.builder && window.service.enabledDynamicVars)
   {
-    if(dcounter>10)
+    if(window.service.updatedDynamicVars)
     {
        window.service.builder.updateDynamicVariables();
-       dcounter=0;
+       window.service.updatedDynamicVars = false;
     }  
-    else
-      dcounter++;
   }
    
   window.service.zoom = lerp(window.service.zoom, desiredZoom, 0.1);

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,19 @@ export default class AudioViewer extends React.Component {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
	`24`	`+ edit()`
	`25`	`+ {`
	`26`	`+ let fullpath = document.getElementById("audio_source_"+this.props.id).src;`
	`27`	`+ var open = require("open");`
	`28`	`+ open(fullpath);`
	`29`	`+ }`
	`30`	`+`
`24`	`31`	`render() {`
`25`		`- return (`
`26`		`- <audio id={"audio_"+this.props.id} style={{width: "100%"}} className='media-object' controls>`
`27`		`- <source id={"audio_source_"+this.props.id}/>`
`28`		`- </audio>);`
	`32`	`+ return (<div>`
	`33`	`+ <audio id={"audio_"+this.props.id} style={{width: "100%"}} className='media-object' controls>`
	`34`	`+ <source id={"audio_source_"+this.props.id}/>`
	`35`	`+ </audio>`
	`36`	`+ <span onClick={this.edit.bind(this)} className="glyphicon glyphicon-edit" style={{cursor:'pointer'}}></span>`
	`37`	`+ </div>);`
`29`	`38`	`}`
`30`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,8 @@ export default class Properties extends React.Component {`
`96`	`96`	`return this.renderDataGrid(window.service.selectedObject.toJsonDescriptor());`
`97`	`97`	`else`
`98`	`98`	`{`
`99`		`- return <div>{Object.keys(window.service.selectedObjects).length+""} objects selected</div>;`
	`99`	`+ return this.renderDataGrid(window.service.selectedObject.toJsonDescriptor(), true);`
	`100`	`+ //<div>{Object.keys(window.service.selectedObjects).length+""} objects selected</div>;`
`100`	`101`	`}`
`101`	`102`	`}`
`102`	`103`	`else`
`@@ -544,6 +545,11 @@ export default class Properties extends React.Component {`
`544`	`545`	`if(window.service.selectedObject!=null)`
`545`	`546`	`{`
`546`	`547`	`//update selected object...`
	`548`	`+ for (let i in window.service.selectedObjects)`
	`549`	`+ {`
	`550`	`+ window.service.selectedObjects[i][field] = newVal;`
	`551`	`+ }`
	`552`	`+`
`547`	`553`	`window.service.selectedObject[field] = newVal;`
`548`	`554`	`this.forceUpdate();`
`549`	`555`	`window.service.sceneUI.forceUpdate();`
`@@ -564,6 +570,12 @@ export default class Properties extends React.Component {`
`564`	`570`	`{`
`565`	`571`	`val = "True"`
`566`	`572`	`}`
	`573`	`+`
	`574`	`+ for (let i in window.service.selectedObjects)`
	`575`	`+ {`
	`576`	`+ window.service.selectedObjects[i][field] = val;`
	`577`	`+ }`
	`578`	`+`
`567`	`579`	`window.service.selectedObject[field] = val;`
`568`	`580`	`this.forceUpdate();`
`569`	`581`	`window.service.sceneUI.forceUpdate();`
`@@ -583,6 +595,7 @@ export default class Properties extends React.Component {`
`583`	`595`	`script.params[field].value = document.getElementById(domID).value;`
`584`	`596`	`}`
`585`	`597`
	`598`	`+ window.service.updatedDynamicVars = true;`
`586`	`599`	`this.forceUpdate();`
`587`	`600`	`}`
`588`	`601`
`@@ -611,6 +624,7 @@ export default class Properties extends React.Component {`
`611`	`624`	`script.params[field].value = val;`
`612`	`625`	`}`
`613`	`626`
	`627`	`+ window.service.updatedDynamicVars = true;`
`614`	`628`	`this.forceUpdate();`
`615`	`629`	`}`
`616`	`630`
`@@ -620,7 +634,7 @@ export default class Properties extends React.Component {`
`620`	`634`	`this.forceUpdate();`
`621`	`635`	`}`
`622`	`636`
`623`		`- renderDataGrid(data)`
	`637`	`+ renderDataGrid(data, multi)`
`624`	`638`	`{`
`625`	`639`	`let counter = 0;`
`626`	`640`	`let rows = []`
`@@ -696,10 +710,14 @@ export default class Properties extends React.Component {`
`696`	`710`	`{`
`697`	`711`	`if(window.service.selectedObject.scripts.length>0)`
`698`	`712`	`{`
`699`		`- cols.push(<div className="" key={counter+"_1"}>{this.renderScriptsPanel()}</div>);`
	`713`	`+ if (multi)`
	`714`	`+ cols.push(<div className="" key={counter+"_1"}>Multi edition is not avaliablefor scripts yet.</div>);`
	`715`	`+ else`
	`716`	`+ cols.push(<div className="" key={counter+"_1"}>{this.renderScriptsPanel()}</div>);`
`700`	`717`	`}`
`701`	`718`
`702`		`- cols.push(<a onClick={this.showFilePicker.bind(this, "py")} className="list-group-item list-group-item-action list-group-item-info">Add a script <span className="glyphicon glyphicon-plus"/></a>);`
	`719`	`+ if (!multi)`
	`720`	`+ cols.push(<a onClick={this.showFilePicker.bind(this, "py")} className="list-group-item list-group-item-action list-group-item-info">Add a script <span className="glyphicon glyphicon-plus"/></a>);`
`703`	`721`
`704`	`722`	`}`
`705`	`723`	`else`
Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,11 @@ function loop()`
`102`	`102`	`{`
`103`	`103`	`if(window.service.builder && window.service.enabledDynamicVars)`
`104`	`104`	`{`
`105`		`- if(dcounter>10)`
	`105`	`+ if(window.service.updatedDynamicVars)`
`106`	`106`	`{`
`107`	`107`	`window.service.builder.updateDynamicVariables();`
`108`		`- dcounter=0;`
	`108`	`+ window.service.updatedDynamicVars = false;`
`109`	`109`	`}`
`110`		`- else`
`111`		`- dcounter++;`
`112`	`110`	`}`
`113`	`111`
`114`	`112`	`window.service.zoom = lerp(window.service.zoom, desiredZoom, 0.1);`