patch

Author: farleyrunkel

src/Core/Viewport.cxx

@@ -212,7 +212,7 @@ double Viewport::GetScale() const
     auto aAttr = ScaleAttribute();
     if(aAttr.IsNull())
     {
-        TDataStd_Real::Set(ScaleLabel(), 100.0);
+        TDataStd_Real::Set(ScaleLabel(), 1.0);
     }
     return ScaleAttribute()->Get();
 }

src/Core/Viewport.hxx

@@ -25,7 +25,7 @@
 // Project includes
 #include "Core/Workspace.hxx"
 
-class Viewport : public Standard_Transient, public EnablePropertyChanged
+class Viewport : public Standard_Transient
 {
 public:
 	DEFINE_ATTRIBUTE_ON_CHILD(1, TDataXtd_Point, EyePoint)

src/Iact/Commands/WorkspaceCommands.hxx

@@ -108,7 +108,7 @@ public:
                 commands.emplace_back(std::make_shared<ActionCommand>(
                     [i](const auto& param) {
                     auto VC = InteractiveContext::Current()->GetViewportController();
-                    VC->setPredefinedView(static_cast<ViewportController::PredefinedViews>(std::any_cast<int>(param)));
+                    VC->SetPredefinedView(static_cast<ViewportController::PredefinedViews>(std::any_cast<int>(param)));
                 },
                     [](const auto&) { return !InteractiveContext::Current()->GetViewportController().IsNull(); }
                 ));
@@ -220,7 +220,7 @@ public:
     {
         static ActionCommand command(
             [](const auto& mode) {
-            auto viewport = InteractiveContext::Current()->GetViewportController()->viewport();
+            auto viewport = InteractiveContext::Current()->GetViewportController()->GetViewport();
             if(!viewport.IsNull())
             {
                 viewport->SetRenderMode(std::any_cast<Viewport::RenderModes>(mode));

src/Iact/Viewport/ViewportPanel.hxx

@@ -70,7 +70,7 @@ private:
 			layout()->removeWidget(myViewportHwndHost);
 			myViewportHwndHost->deleteLater();
 		}
-
+		theCV->GetViewport()->SetDpiScale(1.0f);
 		myViewportHwndHost = new ViewportWidget(theCV);
 
 		layout()->addWidget(myViewportHwndHost);

src/Iact/Viewport/ViewportWidget.cxx

@@ -25,15 +25,15 @@
 ViewportWidget::ViewportWidget(const Handle(ViewportController)& controller, QWidget* parent)
     : QOpenGLWidget(parent)
     , m_viewportController(controller)
-    , myContext(controller->viewport()->GetWorkspace()->AisContext())
-    , myView(controller->viewport()->V3dView())
-    , myViewer(controller->viewport()->GetWorkspace()->V3dViewer())
-    , myFocusView(controller->focusView())
+    , myContext(controller->GetViewport()->GetWorkspace()->AisContext())
+    , myView(controller->GetViewport()->V3dView())
+    , myViewer(controller->GetViewport()->GetWorkspace()->V3dViewer())
+    , myFocusView(controller->FocusView())
     , myIsCoreProfile(true)
 {
-    m_viewportController->setOpenglWidget(this);
+    m_viewportController->SetOpenglWidget(this);
 
-    myViewCube = m_viewportController->viewCube();
+    myViewCube = m_viewportController->ViewCube();
 
     // Qt widget setup
     setMouseTracking(true);

src/Iact/ViewportController.cxx

@@ -37,7 +37,7 @@ ViewportController::ViewportController(const Handle(Viewport)& viewport,
 						   AIS_MouseGesture_Zoom);
 }
 
-void ViewportController::setPredefinedView(PredefinedViews predefinedView)
+void ViewportController::SetPredefinedView(PredefinedViews predefinedView)
 {
 	if(predefinedView == PredefinedViews::WorkingPlane)
 	{
@@ -78,7 +78,7 @@ void ViewportController::setPredefinedView(PredefinedViews predefinedView)
 	m_viewport->OnViewMoved();
 }
 
-void ViewportController::setOpenglWidget(ViewportWidget* widget)
+void ViewportController::SetOpenglWidget(ViewportWidget* widget)
 {
 	m_viewportWidget = widget;
 

src/Iact/ViewportController.hxx

@@ -42,7 +42,7 @@ public:
 	explicit ViewportController(const Handle(Viewport)& viewport,
 								const Handle(WorkspaceController)& workspacecontroller);
 
-	void setPredefinedView(PredefinedViews predefinedView);
+	void SetPredefinedView(PredefinedViews predefinedView);
 
 	void ZoomFitAll() {
 		FitAllAuto(m_workspaceController->workspace()->AisContext(), m_viewport->V3dView());
@@ -63,24 +63,24 @@ public:
 		m_viewport->OnViewMoved();
 	}
 
-	Handle(Viewport) viewport() const
+	Handle(Viewport) GetViewport() const
 	{
 		return m_viewport;
 	}
 
-	Handle(WorkspaceController) workspaceController() const
+	Handle(WorkspaceController) GetWorkspaceController() const
 	{
 		return m_workspaceController;
 	}
 
-	void setOpenglWidget(ViewportWidget* widget);
+	void SetOpenglWidget(ViewportWidget* widget);
 
-	Handle(AIS_ViewCube) viewCube() const
+	Handle(AIS_ViewCube) ViewCube() const
 	{
 		return _AisViewCube;
 	}
 
-	Handle(V3d_View) focusView() const
+	Handle(V3d_View) FocusView() const
 	{
 		return myFocusView;
 	}

src/Iact/WorkspaceController.cxx

@@ -51,7 +51,7 @@ void WorkspaceController::InitWorkspace()
 	m_workspace->GridChanged.connect([this](const auto&) {
 		_GridNeedsUpdate = true;
 		_UpdateGrid();
-		InteractiveContext::Current()->GetViewportController()->viewport()->OnViewMoved();
+		InteractiveContext::Current()->GetViewportController()->GetViewport()->OnViewMoved();
 	});
 
 	myGrid = new AISX_Grid();
@@ -188,7 +188,7 @@ Handle(ViewportController) WorkspaceController::GetViewportController(const Hand
 {
 	for(const auto& controller : m_viewportControllers)
 	{
-		if(controller->viewport() == viewport)
+		if(controller->GetViewport() == viewport)
 		{
 			return controller;
 		}
@@ -201,7 +201,7 @@ bool WorkspaceController::onMouseMove(const Handle(ViewportController)& theViewp
 	m_mouseEventData->Clear();
 
 	auto aMousePos = theViewportController->LastMousePosition();
-	auto viewport = theViewportController->viewport();
+	auto viewport = theViewportController->GetViewport();
 
 	if(!viewport->ScreenToPoint(m_workspace->WorkingPlane(), aMousePos.x(), aMousePos.y(), aPlanePoint));