OrthoView::setViewType() is now setOrientation()

codereader · Sep 13, 2023 · bd82dba · bd82dba
1 parent c32e050
commit bd82dba
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/radiant/xyview/GlobalXYWnd.cpp b/radiant/xyview/GlobalXYWnd.cpp
@@ -268,16 +268,6 @@ void XYWndManager::updateAllViews(bool force)
 	}
 }
 
-void XYWndManager::doWithActiveXyWnd(const std::function<void(OrthoView&)>& action) const
-{
-    auto window = _xyWnds.find(_activeXYWndId);
-
-    if (window != _xyWnds.end())
-    {
-        action(*window->second);
-    }
-}
-
 void XYWndManager::zoomIn(const cmd::ArgumentList& args)
 {
     doWithActiveXyWnd([](auto& activeXyWnd) { activeXyWnd.zoomIn(); });
@@ -364,19 +354,19 @@ OrthoOrientation XYWndManager::getActiveViewType() const
 
 void XYWndManager::setActiveViewType(OrthoOrientation viewType)
 {
-    doWithActiveXyWnd([&](auto& activeXyWnd) { activeXyWnd.setViewType(viewType); });
+    doWithActiveXyWnd([&](auto& activeXyWnd) { activeXyWnd.setOrientation(viewType); });
 }
 
 void XYWndManager::toggleActiveView(const cmd::ArgumentList& args)
 {
     doWithActiveXyWnd([&](auto& activeXyWnd)
     {
         if (activeXyWnd.getOrientation() == OrthoOrientation::XY)
-            activeXyWnd.setViewType(OrthoOrientation::XZ);
+            activeXyWnd.setOrientation(OrthoOrientation::XZ);
         else if (activeXyWnd.getOrientation() == OrthoOrientation::XZ)
-            activeXyWnd.setViewType(OrthoOrientation::YZ);
+            activeXyWnd.setOrientation(OrthoOrientation::YZ);
         else
-            activeXyWnd.setViewType(OrthoOrientation::XY);
+            activeXyWnd.setOrientation(OrthoOrientation::XY);
 
         // Re-focus the view when toggling projections
         activeXyWnd.setOrigin(getFocusPosition());

diff --git a/radiant/xyview/GlobalXYWnd.h b/radiant/xyview/GlobalXYWnd.h
@@ -149,7 +149,12 @@ class XYWndManager: public IOrthoViewManager, public IUserControlCreator
     wxWindow* createWidget(wxWindow* parent) override;
 
 private:
-    void doWithActiveXyWnd(const std::function<void(OrthoView&)>& action) const;
+    template<typename F> void doWithActiveXyWnd(F functor) const
+    {
+        if (auto window = _xyWnds.find(_activeXYWndId); window != _xyWnds.end()) {
+            functor(*window->second);
+        }
+    }
 
     /* greebo: This function determines the point currently being "looked" at, it is used for toggling the ortho views
      * If something is selected the center of the selection is taken as new origin, otherwise the camera

diff --git a/radiant/xyview/OrthoView.cpp b/radiant/xyview/OrthoView.cpp
@@ -452,7 +452,7 @@ void OrthoView::positionView(const Vector3& position) {
     queueDraw();
 }
 
-void OrthoView::setViewType(OrthoOrientation viewType) {
+void OrthoView::setOrientation(OrthoOrientation viewType) {
     _orientation = viewType;
     updateModelview();
 }

diff --git a/radiant/xyview/OrthoView.h b/radiant/xyview/OrthoView.h
@@ -151,7 +151,7 @@ class OrthoView final :
     void updateProjection();
 
     /// Change the view orientation
-    void setViewType(OrthoOrientation n);
+    void setOrientation(OrthoOrientation n);
 
     /// \see IOrthoView::getOrientation
     OrthoOrientation getOrientation() const override;