mirror
/
OpenDroneMap-NodeODM
kopia lustrzana https://github.com/OpenDroneMap/NodeODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

UI simplification, support for true default bools

pull/95/head
Piero Toffanin 2019-10-03 21:56:01 -04:00
rodzic fd677e8048
commit e1bc50d8b3
2 zmienionych plików z 25 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
public/index.html
Wyświetl plik

@ -4,7 +4,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>NodeODM</title> <title>NodeODM - Web UI</title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
@ -39,7 +39,7 @@
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="/">NodeODM</a> <a class="navbar-brand" href="/">NodeODM - Web UI</a>
</div> </div>
</div> </div>
</nav> </nav>
@ -49,9 +49,6 @@
<div class="col-md-5"> <div class="col-md-5">
<form enctype="multipart/form-data" onsubmit="return false;"> <form enctype="multipart/form-data" onsubmit="return false;">
<div id="app"> <div id="app">
<div class="form-group form-inline">
<label for="taskName">Project Name:</lable> <input type="text" class="form-control" value="" id="taskName" data-bind="attr: {disabled: uploading()}" />
</div>
<div id="imagesInput" class="form-group" data-bind="visible: mode() === 'file'"> <div id="imagesInput" class="form-group" data-bind="visible: mode() === 'file'">
<div id="images">Images and GCP File (optional):</div> <button id="btnSelectFiles" class="btn btn-default btn-sm" data-bind="attr: {disabled: uploading()}">Add Files...</button> <div id="images">Images and GCP File (optional):</div> <button id="btnSelectFiles" class="btn btn-default btn-sm" data-bind="attr: {disabled: uploading()}">Add Files...</button>
<div data-bind="visible: filesCount() && !uploading()">Selected files: <span data-bind="text: filesCount()"></span></div> <div data-bind="visible: filesCount() && !uploading()">Selected files: <span data-bind="text: filesCount()"></span></div>
@ -89,9 +86,17 @@
<div data-bind="visible: showOptions()"> <div data-bind="visible: showOptions()">
<div> <div>
<label for="taskName">Project Name:</lable>
<br/>
<input type="text" class="form-control" value="" id="taskName" />
<button type="submit" class="btn glyphicon glyphicon-info-sign btn-info" data-toggle="tooltip" data-placement="top" title="Assign a name to the project." ></button>
<button id="resetTaskName" type="submit" class="btn glyphicon glyphicon glyphicon-repeat btn-default" data-toggle="tooltip" data-placement="top" title="Reset to default" ></button>
<br/><br/>
<label for="doPostProcessing">generate 2D and potree point cloud tiles:</label> <label for="doPostProcessing">generate 2D and potree point cloud tiles:</label>
<br/> <br/>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" id="doPostProcessing"> Enable <input type="checkbox" id="doPostProcessing"> Enable
@ -101,6 +106,7 @@
<button id="resetDoPostProcessing" type="submit" class="btn glyphicon glyphicon glyphicon-repeat btn-default" data-toggle="tooltip" data-placement="top" title="Reset to default" ></button> <button id="resetDoPostProcessing" type="submit" class="btn glyphicon glyphicon glyphicon-repeat btn-default" data-toggle="tooltip" data-placement="top" title="Reset to default" ></button>
<br/><br/> <br/><br/>
</div> </div>
<div> <div>
@ -188,11 +194,9 @@
</div> </div>
</div> </div>
</div> </div>
<hr>
<footer> <footer>
<p>This software is released under the terms of the <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank">GPLv3 License</a>. See <a href="https://github.com/OpenDroneMap/NodeODM" target="_blank">NodeODM</a> on Github for more information.</p> <hr/>
This window can be closed after uploading a task. The process will continue running on the server.
</footer> </footer>
</div> </div>
<!-- /container --> <!-- /container -->
@ -204,7 +208,7 @@
<script src="js/vendor/knockout-3.4.0.js"></script> <script src="js/vendor/knockout-3.4.0.js"></script>
<script src="js/vendor/ko.observableDictionary.js"></script> <script src="js/vendor/ko.observableDictionary.js"></script>
<script src="js/dropzone.js" type="text/javascript"></script> <script src="js/dropzone.js" type="text/javascript"></script>
<script src="js/main.js"></script> <script src="js/main.js?t=1"></script>
</body> </body>
</html> </html>

13
public/js/main.js
Wyświetl plik

@ -480,14 +480,23 @@ $(function() {
$('#resetDoPostProcessing').on('click', function(){ $('#resetDoPostProcessing').on('click', function(){
$("#doPostProcessing").prop('checked', false); $("#doPostProcessing").prop('checked', false);
}); });
$('#resetTaskName').on('click', function(){
$("#taskName").val('');
});
// Load options // Load options
function Option(properties) { function Option(properties) {
this.properties = properties; this.properties = properties;
this.value = ko.observable();
this.defaultValue = undefined;
if (properties.type === 'bool' && properties.value === 'true'){
this.defaultValue = true;
}
this.value = ko.observable(this.defaultValue);
} }
Option.prototype.resetToDefault = function() { Option.prototype.resetToDefault = function() {
this.value(undefined); this.value(this.defaultValue);
}; };
function OptionsModel() { function OptionsModel() {