Rename StudioVtkOutputWindow to ShapeWorksVtkOutputWindow

Author: akenmorris

Studio/CMakeLists.txt

@@ -228,14 +228,14 @@ SET(STUDIO_VISUALIZATION_SRCS
   Visualization/MeshSlice.cpp
   Visualization/Viewer.cpp
   Visualization/Visualizer.cpp
-  Visualization/StudioVtkOutputWindow.cpp
+  Visualization/ShapeWorksVtkOutputWindow.cpp
   Visualization/StudioHandleWidget.cpp
 )
 
 SET(STUDIO_VISUALIZATION_MOC_HDRS
   Visualization/Lightbox.h
   Visualization/ParticleColors.h
-  Visualization/StudioVtkOutputWindow.h
+  Visualization/ShapeWorksVtkOutputWindow.h
   Visualization/Visualizer.h
 )
 

Studio/Interface/ShapeWorksStudioApp.cpp

@@ -69,7 +69,7 @@ ShapeWorksStudioApp::ShapeWorksStudioApp() {
   status_bar_ = new StatusBarWidget(this);
   connect(status_bar_, &StatusBarWidget::toggle_log_window, this, &ShapeWorksStudioApp::toggle_log_window);
 
-  studio_vtk_output_window_ = vtkSmartPointer<StudioVtkOutputWindow>::New();
+  studio_vtk_output_window_ = vtkSmartPointer<ShapeWorksVtkOutputWindow>::New();
   vtkOutputWindow::SetInstance(studio_vtk_output_window_);
 
   logger_.register_callbacks();

Studio/Interface/ShapeWorksStudioApp.h

@@ -6,7 +6,7 @@
 #include <Interface/LogWindow.h>
 #include <Interface/StudioLogger.h>
 #include <Interface/UpdateChecker.h>
-#include <Visualization/StudioVtkOutputWindow.h>
+#include <Visualization/ShapeWorksVtkOutputWindow.h>
 #include <vtkPolyData.h>
 #include <vtkSmartPointer.h>
 
@@ -234,7 +234,7 @@ class ShapeWorksStudioApp : public QMainWindow {
   QSharedPointer<Visualizer> visualizer_;
   QSharedPointer<PreferencesWindow> preferences_window_;
   CompareWidget* compare_widget_ = nullptr;
-  vtkSmartPointer<StudioVtkOutputWindow> studio_vtk_output_window_;
+  vtkSmartPointer<ShapeWorksVtkOutputWindow> studio_vtk_output_window_;
 
   // all the preferences
   Preferences preferences_;

Studio/Python/PythonWorker.cpp

@@ -72,7 +72,7 @@ PythonWorker::~PythonWorker() {
 }
 
 //---------------------------------------------------------------------------
-void PythonWorker::set_vtk_output_window(vtkSmartPointer<StudioVtkOutputWindow> output_window) {
+void PythonWorker::set_vtk_output_window(vtkSmartPointer<ShapeWorksVtkOutputWindow> output_window) {
   studio_vtk_output_window_ = output_window;
 }
 

Studio/Python/PythonWorker.h

@@ -9,7 +9,7 @@
 
 // studio
 #include <Job/Job.h>
-#include <Visualization/StudioVtkOutputWindow.h>
+#include <Visualization/ShapeWorksVtkOutputWindow.h>
 
 namespace shapeworks {
 class PythonLogger;
@@ -23,7 +23,7 @@ class PythonWorker : public QObject {
   PythonWorker();
   ~PythonWorker();
 
-  void set_vtk_output_window(vtkSmartPointer<StudioVtkOutputWindow> output_window);
+  void set_vtk_output_window(vtkSmartPointer<ShapeWorksVtkOutputWindow> output_window);
 
   void run_job(QSharedPointer<Job> job);
 
@@ -51,7 +51,7 @@ class PythonWorker : public QObject {
   bool initialized_ = false;
   bool initialized_success_ = false;
 
-  vtkSmartPointer<StudioVtkOutputWindow> studio_vtk_output_window_;
+  vtkSmartPointer<ShapeWorksVtkOutputWindow> studio_vtk_output_window_;
 
   QSharedPointer<PythonLogger> python_logger_;
 

…/Visualization/StudioVtkOutputWindow.cpp …ualization/ShapeWorksVtkOutputWindow.cppStudio/Visualization/StudioVtkOutputWindow.cpp renamed to Studio/Visualization/ShapeWorksVtkOutputWindow.cpp Studio/Visualization/StudioVtkOutputWindow.cpp renamed to Studio/Visualization/ShapeWorksVtkOutputWindow.cpp

@@ -1,26 +1,26 @@
-#include "StudioVtkOutputWindow.h"
+#include "ShapeWorksVtkOutputWindow.h"
 
 #include <Logging.h>
 #include <vtkObjectFactory.h>
 
 namespace shapeworks {
 
-vtkStandardNewMacro(StudioVtkOutputWindow);
+vtkStandardNewMacro(ShapeWorksVtkOutputWindow);
 
 //---------------------------------------------------------------------------
-StudioVtkOutputWindow::StudioVtkOutputWindow() {}
+ShapeWorksVtkOutputWindow::ShapeWorksVtkOutputWindow() {}
 
 //---------------------------------------------------------------------------
-void StudioVtkOutputWindow::DisplayErrorText(const char* text) { SW_ERROR(text); }
+void ShapeWorksVtkOutputWindow::DisplayErrorText(const char* text) { SW_ERROR(text); }
 
 //---------------------------------------------------------------------------
-void StudioVtkOutputWindow::DisplayWarningText(const char* text) { SW_WARN(text); }
+void ShapeWorksVtkOutputWindow::DisplayWarningText(const char* text) { SW_WARN(text); }
 
 //---------------------------------------------------------------------------
-void StudioVtkOutputWindow::DisplayGenericWarningText(const char* text) { SW_WARN(text); }
+void ShapeWorksVtkOutputWindow::DisplayGenericWarningText(const char* text) { SW_WARN(text); }
 
 //---------------------------------------------------------------------------
-void StudioVtkOutputWindow::DisplayDebugText(const char* text) { SW_DEBUG(text); }
+void ShapeWorksVtkOutputWindow::DisplayDebugText(const char* text) { SW_DEBUG(text); }
 
 //---------------------------------------------------------------------------
 

…io/Visualization/StudioVtkOutputWindow.h …isualization/ShapeWorksVtkOutputWindow.hStudio/Visualization/StudioVtkOutputWindow.h renamed to Studio/Visualization/ShapeWorksVtkOutputWindow.h Studio/Visualization/StudioVtkOutputWindow.h renamed to Studio/Visualization/ShapeWorksVtkOutputWindow.h

@@ -7,15 +7,15 @@
 namespace shapeworks {
 
 //! Implementation of vtkOutputWindow to capture and display VTK error messages
-class StudioVtkOutputWindow : public QObject, public vtkOutputWindow {
+class ShapeWorksVtkOutputWindow : public QObject, public vtkOutputWindow {
   Q_OBJECT;
 
  public:
-  static StudioVtkOutputWindow* New();
+  static ShapeWorksVtkOutputWindow* New();
 
-  vtkTypeMacro(StudioVtkOutputWindow, vtkOutputWindow);
+  vtkTypeMacro(ShapeWorksVtkOutputWindow, vtkOutputWindow);
 
-  StudioVtkOutputWindow();
+  ShapeWorksVtkOutputWindow();
 
   void DisplayErrorText(const char* text) override;
   void DisplayWarningText(const char* text) override;