MetavoxelEditorDialog -> MetavoxelEditor.

interface/src/Menu.cpp

@@ -32,7 +32,7 @@
 #include "Menu.h"
 #include "Util.h"
 #include "InfoView.h"
-#include "ui/MetavoxelEditorDialog.h"
+#include "ui/MetavoxelEditor.h"
 
 Menu* Menu::_instance = NULL;
 
@@ -1013,10 +1013,10 @@ void Menu::bandwidthDetails() {
 }
 
 void Menu::showMetavoxelEditor() {
-    if (!_metavoxelEditorDialog) {
-        _metavoxelEditorDialog = new MetavoxelEditorDialog();
+    if (!_MetavoxelEditor) {
+        _MetavoxelEditor = new MetavoxelEditor();
     }
-    _metavoxelEditorDialog->raise();
+    _MetavoxelEditor->raise();
 }
 
 void Menu::audioMuteToggled() {

interface/src/Menu.h

@@ -38,7 +38,7 @@ class QSettings;
 
 class BandwidthDialog;
 class LodToolsDialog;
-class MetavoxelEditorDialog;
+class MetavoxelEditor;
 class VoxelStatsDialog;
 
 class Menu : public QMenuBar, public AbstractMenuInterface {
@@ -143,7 +143,7 @@ private:
     FrustumDrawMode _frustumDrawMode;
     ViewFrustumOffset _viewFrustumOffset;
     QActionGroup* _voxelModeActionsGroup;
-    QPointer<MetavoxelEditorDialog> _metavoxelEditorDialog;
+    QPointer<MetavoxelEditor> _MetavoxelEditor;
     VoxelStatsDialog* _voxelStatsDialog;
     LodToolsDialog* _lodToolsDialog;
     int _maxVoxels;

interface/src/ui/MetavoxelEditor.cpp

@@ -1,5 +1,5 @@
 //
-//  MetavoxelEditorDialog.cpp
+//  MetavoxelEditor.cpp
 //  interface
 //
 //  Created by Andrzej Kapolka on 1/21/14.
@@ -18,7 +18,7 @@
 #include <AttributeRegistry.h>
 
 #include "Application.h"
-#include "MetavoxelEditorDialog.h"
+#include "MetavoxelEditor.h"
 
 enum GridPlane {
     GRID_PLANE_XY, GRID_PLANE_XZ, GRID_PLANE_YZ
@@ -26,7 +26,7 @@ enum GridPlane {
 
 const glm::vec2 INVALID_VECTOR(FLT_MAX, FLT_MAX);
 
-MetavoxelEditorDialog::MetavoxelEditorDialog() :
+MetavoxelEditor::MetavoxelEditor() :
     QDialog(Application::getInstance()->getGLWidget()) {
     
     setWindowTitle("Metavoxel Editor");
@@ -94,7 +94,7 @@ MetavoxelEditorDialog::MetavoxelEditorDialog() :
     _gridProgram.link();
 }
 
-bool MetavoxelEditorDialog::eventFilter(QObject* watched, QEvent* event) {
+bool MetavoxelEditor::eventFilter(QObject* watched, QEvent* event) {
     switch (_state) {
         case HOVERING_STATE:
             if (event->type() == QEvent::MouseButtonPress && _startPosition != INVALID_VECTOR) {
@@ -120,7 +120,7 @@ bool MetavoxelEditorDialog::eventFilter(QObject* watched, QEvent* event) {
     return false;
 }
 
-void MetavoxelEditorDialog::updateValueEditor() {
+void MetavoxelEditor::updateValueEditor() {
     QString selected = getSelectedAttribute();
     if (selected.isNull()) {
         _value->setVisible(false);
@@ -139,7 +139,7 @@ void MetavoxelEditorDialog::updateValueEditor() {
     }
 }
 
-void MetavoxelEditorDialog::createNewAttribute() {
+void MetavoxelEditor::createNewAttribute() {
     QDialog dialog(this);
     dialog.setWindowTitle("New Attribute");
     
@@ -167,7 +167,7 @@ void MetavoxelEditorDialog::createNewAttribute() {
     updateAttributes(nameText);
 }
 
-void MetavoxelEditorDialog::updateGridPosition() {
+void MetavoxelEditor::updateGridPosition() {
     // make sure our grid position matches our grid spacing
     double step = _gridSpacing->value();
     if (step > 0.0) {
@@ -176,7 +176,7 @@ void MetavoxelEditorDialog::updateGridPosition() {
     }
 }
 
-void MetavoxelEditorDialog::render() {
+void MetavoxelEditor::render() {
     QString selected = getSelectedAttribute();
     if (selected.isNull()) {
         resetState();
@@ -284,7 +284,7 @@ void MetavoxelEditorDialog::render() {
     glDepthMask(GL_TRUE);
 }
 
-void MetavoxelEditorDialog::updateAttributes(const QString& select) {
+void MetavoxelEditor::updateAttributes(const QString& select) {
     // remember the selection in order to preserve it
     QString selected = select.isNull() ? getSelectedAttribute() : select;
     _attributes->clear();
@@ -303,15 +303,15 @@ void MetavoxelEditorDialog::updateAttributes(const QString& select) {
     }
 }
 
-QString MetavoxelEditorDialog::getSelectedAttribute() const {
+QString MetavoxelEditor::getSelectedAttribute() const {
     QList<QListWidgetItem*> selectedItems = _attributes->selectedItems();
     return selectedItems.isEmpty() ? QString() : selectedItems.first()->text();
 }
 
-void MetavoxelEditorDialog::resetState() {
+void MetavoxelEditor::resetState() {
     _state = HOVERING_STATE;
     _startPosition = INVALID_VECTOR;
     _height = 0.0f;
 }
 
-ProgramObject MetavoxelEditorDialog::_gridProgram;
+ProgramObject MetavoxelEditor::_gridProgram;

interface/src/ui/MetavoxelEditor.h

@@ -1,13 +1,13 @@
 //
-//  MetavoxelEditorDialog.h
+//  MetavoxelEditor.h
 //  interface
 //
 //  Created by Andrzej Kapolka on 1/21/14.
 //  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
 //
 
-#ifndef __interface__MetavoxelEditorDialog__
-#define __interface__MetavoxelEditorDialog__
+#ifndef __interface__MetavoxelEditor__
+#define __interface__MetavoxelEditor__
 
 #include <QDialog>
 
@@ -19,12 +19,12 @@ class QGroupBox;
 class QListWidget;
 
 /// Allows editing metavoxels.
-class MetavoxelEditorDialog : public QDialog {
+class MetavoxelEditor : public QDialog {
     Q_OBJECT
 
 public:
     
-    MetavoxelEditorDialog();
+    MetavoxelEditor();
 
     virtual bool eventFilter(QObject* watched, QEvent* event);
 
@@ -61,4 +61,4 @@ private:
     static ProgramObject _gridProgram;
 };
 
-#endif /* defined(__interface__MetavoxelEditorDialog__) */
+#endif /* defined(__interface__MetavoxelEditor__) */