Showing the changes to interface/src/Application.cpp (1 of 50 files). Show all
Unified · Split
| @@ -63,11 +63,11 @@ · 62 unmodified lines | |||
| 63 | #include <UUID.h> | 63 | #include <UUID.h> |
| 64 | #include <OctreeSceneStats.h> | 64 | #include <OctreeSceneStats.h> |
| 65 | #include <LocalVoxelsList.h> | 65 | #include <LocalVoxelsList.h> |
| 66 | #include <ModelUploader.h> | ||
| 67 | 66 | ||
| 68 | #include "Application.h" | 67 | #include "Application.h" |
| 69 | #include "InterfaceVersion.h" | 68 | #include "InterfaceVersion.h" |
| 70 | #include "Menu.h" | 69 | #include "Menu.h" |
| 70 | #include "ModelUploader.h" | ||
| 71 | #include "Util.h" | 71 | #include "Util.h" |
| 72 | #include "devices/OculusManager.h" | 72 | #include "devices/OculusManager.h" |
| 73 | #include "devices/TV3DManager.h" | 73 | #include "devices/TV3DManager.h" |
| @@ -3090,6 +3090,16 @@ void Application::setMenuShortcutsEnabled(bool enabled) { · 3016 unmodified lines | |||
| 3090 | setShortcutsEnabled(_window->menuBar(), enabled); | 3090 | setShortcutsEnabled(_window->menuBar(), enabled); |
| 3091 | } | 3091 | } |
| 3092 | 3092 | ||
| 3093 | void Application::uploadModel(ModelType modelType) { | ||
| 3094 | ModelUploader* uploader = new ModelUploader(modelType); | ||
| 3095 | QThread* thread = new QThread(); | ||
| 3096 | thread->connect(uploader, SIGNAL(destroyed()), SLOT(quit())); | ||
| 3097 | thread->connect(thread, SIGNAL(finished()), SLOT(deleteLater())); | ||
| 3098 | uploader->connect(thread, SIGNAL(started()), SLOT(send())); | ||
| 3099 | |||
| 3100 | thread->start(); | ||
| 3101 | } | ||
| 3102 | |||
| 3093 | void Application::updateWindowTitle(){ | 3103 | void Application::updateWindowTitle(){ |
| 3094 | 3104 | ||
| 3095 | QString buildVersion = " (build " + applicationVersion() + ")"; | 3105 | QString buildVersion = " (build " + applicationVersion() + ")"; |
| @@ -3417,22 +3427,16 @@ void Application::toggleRunningScriptsWidget() { · 321 unmodified lines | |||
| 3417 | } | 3427 | } |
| 3418 | } | 3428 | } |
| 3419 | 3429 | ||
| 3420 | void Application::uploadFST(bool isHead) { | ||
| 3421 | ModelUploader* uploader = new ModelUploader(isHead); | ||
| 3422 | QThread* thread = new QThread(); | ||
| 3423 | thread->connect(uploader, SIGNAL(destroyed()), SLOT(quit())); | ||
| 3424 | thread->connect(thread, SIGNAL(finished()), SLOT(deleteLater())); | ||
| 3425 | uploader->connect(thread, SIGNAL(started()), SLOT(send())); | ||
| 3426 | |||
| 3427 | thread->start(); | ||
| 3428 | } | ||
| 3429 | |||
| 3430 | void Application::uploadHead() { | 3430 | void Application::uploadHead() { |
| 3431 | uploadFST(true); | 3431 | uploadModel(HEAD_MODEL); |
| 3432 | } | 3432 | } |
| 3433 | 3433 | ||
| 3434 | void Application::uploadSkeleton() { | 3434 | void Application::uploadSkeleton() { |
| 3435 | uploadFST(false); | 3435 | uploadModel(SKELETON_MODEL); |
| 3436 | } | ||
| 3437 | |||
| 3438 | void Application::uploadAttachment() { | ||
| 3439 | uploadModel(ATTACHMENT_MODEL); | ||
| 3436 | } | 3440 | } |
| 3437 | 3441 | ||
| 3438 | ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScriptFromEditor) { | 3442 | ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScriptFromEditor) { |