Showing the changes to interface/src/Application.cpp (1 of 31 files). Show all
Unified · Split
| @@ -137,7 +137,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 136 unmodified lines | ||
| 137 | 137 | _frameCount(0), |
| 138 | 138 | _fps(60.0f), |
| 139 | 139 | _justStarted(true), |
| 140 | − _voxelImporter(NULL), | |
| 140 | + _voxelImportDialog(NULL), | |
| 141 | + _voxelImporter(), | |
| 141 | 142 | _importSucceded(false), |
| 142 | 143 | _sharedVoxelSystem(TREE_SCALE, DEFAULT_MAX_VOXELS_PER_SYSTEM, &_clipboard), |
| 143 | 144 | _modelClipboardRenderer(), |
| @@ -432,7 +433,7 @@ Application::~Application() { · 288 unmodified lines | ||
| 432 | 433 | delete idleTimer; |
| 433 | 434 | |
| 434 | 435 | _sharedVoxelSystem.changeTree(new VoxelTree); |
| 435 | − delete _voxelImporter; | |
| 436 | + delete _voxelImportDialog; | |
| 436 | 437 | |
| 437 | 438 | // let the avatar mixer know we're out |
| 438 | 439 | MyAvatar::sendKillAvatar(); |
| @@ -467,8 +468,8 @@ void Application::saveSettings() { · 28 unmodified lines | ||
| 467 | 468 | Menu::getInstance()->saveSettings(); |
| 468 | 469 | _rearMirrorTools->saveSettings(_settings); |
| 469 | 470 | |
| 470 | − if (_voxelImporter) { | |
| 471 | − _voxelImporter->saveSettings(_settings); | |
| 471 | + if (_voxelImportDialog) { | |
| 472 | + _voxelImportDialog->saveSettings(_settings); | |
| 472 | 473 | } |
| 473 | 474 | _settings->sync(); |
| 474 | 475 | _numChangedSettings = 0; |
| @@ -1621,17 +1622,17 @@ void Application::exportVoxels(const VoxelDetail& sourceVoxel) { · 1146 unmodified lines | ||
| 1621 | 1622 | void Application::importVoxels() { |
| 1622 | 1623 | _importSucceded = false; |
| 1623 | 1624 | |
| 1624 | − if (!_voxelImporter) { | |
| 1625 | − _voxelImporter = new VoxelImporter(_window); | |
| 1626 | − _voxelImporter->loadSettings(_settings); | |
| 1625 | + if (!_voxelImportDialog) { | |
| 1626 | + _voxelImportDialog = new VoxelImportDialog(_window); | |
| 1627 | + _voxelImportDialog->loadSettings(_settings); | |
| 1627 | 1628 | } |
| 1628 | 1629 | |
| 1629 | − if (!_voxelImporter->exec()) { | |
| 1630 | + if (!_voxelImportDialog->exec()) { | |
| 1630 | 1631 | qDebug() << "Import succeeded." << endl; |
| 1631 | 1632 | _importSucceded = true; |
| 1632 | 1633 | } else { |
| 1633 | 1634 | qDebug() << "Import failed." << endl; |
| 1634 | − if (_sharedVoxelSystem.getTree() == _voxelImporter->getVoxelTree()) { | |
| 1635 | + if (_sharedVoxelSystem.getTree() == _voxelImporter.getVoxelTree()) { | |
| 1635 | 1636 | _sharedVoxelSystem.killLocalVoxels(); |
| 1636 | 1637 | _sharedVoxelSystem.changeTree(&_clipboard); |
| 1637 | 1638 | } |
| @@ -1746,7 +1747,7 @@ void Application::init() { · 108 unmodified lines | ||
| 1746 | 1747 | // Cleanup of the original shared tree |
| 1747 | 1748 | _sharedVoxelSystem.init(); |
| 1748 | 1749 | |
| 1749 | − _voxelImporter = new VoxelImporter(_window); | |
| 1750 | + _voxelImportDialog = new VoxelImportDialog(_window); | |
| 1750 | 1751 | |
| 1751 | 1752 | _environment.init(); |
| 1752 | 1753 | |