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

Removed in browser resize

pull/688/head
Piero Toffanin 2019-06-27 11:19:52 -04:00
rodzic ac649e7940
commit 97c9ec4884
6 zmienionych plików z 24 dodań i 78 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
app/api/tasks.py
Wyświetl plik

@ -102,6 +102,7 @@ class TaskViewSet(viewsets.ViewSet):
raise exceptions.NotFound()
task.pending_action = pending_action
task.partial = False # Otherwise this will not be processed
task.last_error = None
task.save()
@ -169,6 +170,8 @@ class TaskViewSet(viewsets.ViewSet):
except (ObjectDoesNotExist, ValidationError):
raise exceptions.NotFound()
# TODO: check at least two images are present
task.partial = False
task.images_count = models.ImageUpload.objects.filter(task=task).count()
task.save()

5
app/static/app/js/classes/ResizeModes.js
Wyświetl plik

@ -1,14 +1,13 @@
const dict = [
{k: 'NO', v: 0, human: "No"}, // Don't resize
{k: 'YES', v: 1, human: "Yes"}, // Resize on server
{k: 'YESINBROWSER', v: 2, human: "Yes (In browser)"} // Resize on browser
{k: 'YES', v: 1, human: "Yes"} // Resize on server
];
const exp = {
all: () => dict.map(d => d.v),
fromString: (s) => {
let v = parseInt(s);
if (!isNaN(v) && v >= 0 && v <= 2) return v;
if (!isNaN(v) && v >= 0 && v <= 1) return v;
else return 0;
},
toHuman: (v) => {

6
app/static/app/js/components/EditTaskForm.jsx
Wyświetl plik

@ -160,6 +160,8 @@ class EditTaskForm extends React.Component {
}else{
this.selectNodeByKey(this.props.task.processing_node);
}
}else if (this.props.selectedNode){
this.selectNodeByKey(this.props.selectedNode);
}else{
this.selectNodeByKey("auto");
}
@ -307,6 +309,10 @@ class EditTaskForm extends React.Component {
selectNodeByKey(key){
let node = this.state.processingNodes.find(node => node.key == key);
if (node) this.setState({selectedNode: node});
else{
console.warn(`Node ${key} does not exist, selecting auto`);
this.selectNodeByKey("auto");
}
}
handleSelectNode(e){

11
app/static/app/js/components/NewTaskPanel.jsx
Wyświetl plik

@ -60,7 +60,15 @@ class NewTaskPanel extends React.Component {
this.taskForm.saveLastPresetToStorage();
Storage.setItem('resize_size', this.state.resizeSize);
Storage.setItem('resize_mode', this.state.resizeMode);
if (this.props.onSave) this.props.onSave(this.getTaskInfo());
const taskInfo = this.getTaskInfo();
if (taskInfo.selectedNode.key != "auto"){
Storage.setItem('last_processing_node', taskInfo.selectedNode.id);
}else{
Storage.setItem('last_processing_node', '');
}
if (this.props.onSave) this.props.onSave(taskInfo);
}
}
@ -119,6 +127,7 @@ class NewTaskPanel extends React.Component {
<div className={this.state.inReview ? "disabled" : ""}>
<p>{this.props.filesCount} files selected. Please check these additional options:</p>
<EditTaskForm
selectedNode={Storage.getItem("last_processing_node") || "auto"}
onFormLoaded={this.handleFormTaskLoaded}
onFormChanged={this.handleFormChanged}
inReview={this.state.inReview}

75
app/static/app/js/components/ProjectListItem.jsx
Wyświetl plik

@ -5,15 +5,12 @@ import TaskList from './TaskList';
import NewTaskPanel from './NewTaskPanel';
import ImportTaskPanel from './ImportTaskPanel';
import UploadProgressBar from './UploadProgressBar';
import ProgressBar from './ProgressBar';
import ErrorMessage from './ErrorMessage';
import EditProjectDialog from './EditProjectDialog';
import Dropzone from '../vendor/dropzone';
import csrf from '../django/csrf';
import HistoryNav from '../classes/HistoryNav';
import PropTypes from 'prop-types';
import ResizeModes from '../classes/ResizeModes';
import Gcp from '../classes/Gcp';
import $ from 'jquery';
class ProjectListItem extends React.Component {
@ -75,8 +72,6 @@ class ProjectListItem extends React.Component {
return {
uploading: false,
editing: false,
resizing: false,
resizedImages: 0,
error: "",
progress: 0,
files: [],
@ -122,37 +117,6 @@ class ProjectListItem extends React.Component {
headers: {
[csrf.header]: csrf.token
},
transformFile: (file, done) => {
// Resize image?
if ((this.dz.options.resizeWidth || this.dz.options.resizeHeight) && file.type.match(/image.*/)) {
return this.dz.resizeImage(file, this.dz.options.resizeWidth, this.dz.options.resizeHeight, this.dz.options.resizeMethod, done);
// Resize GCP? This should always be executed last (we sort in transformstart)
} else if (this.dz.options.resizeWidth && file.type.match(/text.*/)){
// Read GCP content
const fileReader = new FileReader();
fileReader.onload = (e) => {
const originalGcp = new Gcp(e.target.result);
const resizedGcp = originalGcp.resize(this.dz._resizeMap);
// Create new GCP file
let gcp = new Blob([resizedGcp.toString()], {type: "text/plain"});
gcp.lastModifiedDate = file.lastModifiedDate;
gcp.lastModified = file.lastModified;
gcp.name = file.name;
gcp.previewElement = file.previewElement;
gcp.previewTemplate = file.previewTemplate;
gcp.processing = file.processing;
gcp.status = file.status;
gcp.upload = file.upload;
gcp.upload.total = gcp.size; // not a typo
gcp.webkitRelativePath = file.webkitRelativePath;
done(gcp);
};
fileReader.readAsText(file);
} else {
return done(file);
}
}
});
@ -189,22 +153,6 @@ class ProjectListItem extends React.Component {
});
}
})
.on("transformcompleted", (file, total) => {
if (this.dz._resizeMap) this.dz._resizeMap[file.name] = this.dz._taskInfo.resizeSize / Math.max(file.width, file.height);
if (this.dz.options.resizeWidth) this.setUploadState({resizedImages: total});
})
.on("transformstart", (files) => {
if (this.dz.options.resizeWidth){
// Sort so that a GCP file is always last
files.sort(f => f.type.match(/text.*/) ? 1 : -1)
// Create filename --> resize ratio dict
this.dz._resizeMap = {};
}
})
.on("transformend", () => {
this.setUploadState({resizing: false, uploading: true});
})
.on("complete", (file) => {
// Retry
const retry = () => {
@ -352,15 +300,7 @@ class ProjectListItem extends React.Component {
handleTaskSaved(taskInfo){
this.dz._taskInfo = taskInfo; // Allow us to access the task info from dz
// Update dropzone settings
if (taskInfo.resizeMode === ResizeModes.YESINBROWSER){
this.dz.options.resizeWidth = taskInfo.resizeSize;
this.dz.options.resizeQuality = 1.0;
this.setUploadState({resizing: true, editing: false});
}else{
this.setUploadState({uploading: true, editing: false});
}
this.setUploadState({uploading: true, editing: false});
// Create task
const formData = {
@ -370,9 +310,6 @@ class ProjectListItem extends React.Component {
auto_processing_node: taskInfo.selectedNode.key == "auto",
partial: true
};
if (taskInfo.resizeMode === ResizeModes.YES){
formData["resize_to"] = taskInfo.resizeSize
}
$.ajax({
url: `/api/projects/${this.state.data.id}/tasks/`,
@ -382,7 +319,6 @@ class ProjectListItem extends React.Component {
type: 'POST'
}).done((task) => {
if (task && task.id){
console.log(this.dz._taskInfo);
this.dz._taskInfo.id = task.id;
this.dz.options.url = `/api/projects/${this.state.data.id}/tasks/${task.id}/upload/`;
this.dz.processQueue();
@ -518,14 +454,7 @@ class ProjectListItem extends React.Component {
<i className="drag-drop-icon fa fa-inbox"></i>
<div className="row">
{this.state.upload.uploading ? <UploadProgressBar {...this.state.upload}/> : ""}
{this.state.upload.resizing ?
<ProgressBar
current={this.state.upload.resizedImages}
total={this.state.upload.totalCount}
template={(info) => `Resized ${info.current} of ${info.total} images. Your browser might slow down during this process.`}
/>
: ""}
{this.state.upload.error !== "" ?
<div className="alert alert-warning alert-dismissible">
<button type="button" className="close" aria-label="Close" onClick={this.closeUploadError}><span aria-hidden="true">&times;</span></button>

2
requirements.txt
Wyświetl plik

@ -37,7 +37,7 @@ pip-autoremove==0.9.0
psycopg2==2.7.4
psycopg2-binary==2.7.4
PyJWT==1.5.3
pyodm==1.5.3
pyodm==1.5.3b1
pyparsing==2.1.10
pytz==2018.3
rcssmin==1.0.6