Michel2/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad.git synced 2026-07-28 04:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update camera menu before showing.

Browse Source
This commit is contained in:
Leonardo Zide
2024-02-19 17:51:34 -08:00
parent 732dac4c65
commit 45ab8e8d60
5 changed files with 9 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_mainwindow.cpp
+6 -21
View File
@@ -411,6 +411,8 @@ void lcMainWindow::CreateMenus()
for (int actionIdx = LC_VIEW_CAMERA_FIRST; actionIdx <= LC_VIEW_CAMERA_LAST; actionIdx++)
mCameraMenu->addAction(mActions[actionIdx]);
connect(mCameraMenu, &QMenu::aboutToShow, this, &lcMainWindow::CameraMenuAboutToShow);
mViewpointMenu = new QMenu(tr("&Viewpoints"), this);
mViewpointMenu->addAction(mActions[LC_VIEW_VIEWPOINT_FRONT]);
mViewpointMenu->addAction(mActions[LC_VIEW_VIEWPOINT_BACK]);
@@ -424,6 +426,8 @@ void lcMainWindow::CreateMenus()
mProjectionMenu->addAction(mActions[LC_VIEW_PROJECTION_PERSPECTIVE]);
mProjectionMenu->addAction(mActions[LC_VIEW_PROJECTION_ORTHO]);
connect(mProjectionMenu, &QMenu::aboutToShow, this, &lcMainWindow::ProjectionMenuAboutToShow);
mShadingMenu = new QMenu(tr("Sh&ading"), this);
mShadingMenu->addAction(mActions[LC_VIEW_SHADING_WIREFRAME]);
mShadingMenu->addAction(mActions[LC_VIEW_SHADING_FLAT]);
@@ -797,7 +801,6 @@ lcView* lcMainWindow::CreateView(lcModel* Model)
{
lcView* NewView = new lcView(lcViewType::View, Model);
connect(NewView, SIGNAL(CameraChanged()), this, SLOT(ViewCameraChanged()));
connect(NewView, SIGNAL(FocusReceived()), this, SLOT(ViewFocusReceived()));
AddView(NewView);
@@ -1626,10 +1629,7 @@ void lcMainWindow::AddView(lcView* View)
return;
if (!TabWidget->GetActiveView())
{
TabWidget->SetActiveView(View);
UpdatePerspective();
}
}
void lcMainWindow::RemoveView(lcView* View)
@@ -1656,9 +1656,6 @@ void lcMainWindow::SetActiveView(lcView* ActiveView)
CurrentActiveView->SetTopSubmodelActive();
TabWidget->SetActiveView(ActiveView);
UpdateCameraMenu();
UpdatePerspective();
}
void lcMainWindow::SetTool(lcTool Tool)
@@ -2164,17 +2161,7 @@ void lcMainWindow::ViewFocusReceived()
SetActiveView(qobject_cast<lcView*>(sender()));
}
void lcMainWindow::ViewCameraChanged()
{
lcView* View = qobject_cast<lcView*>(sender());
if (!View || !View->IsLastFocused())
return;
UpdateCameraMenu();
}
void lcMainWindow::UpdateCameraMenu()
void lcMainWindow::CameraMenuAboutToShow()
{
const lcArray<lcCamera*>& Cameras = lcGetActiveModel()->GetCameras();
lcView* ActiveView = GetActiveView();
@@ -2203,11 +2190,9 @@ void lcMainWindow::UpdateCameraMenu()
if (!CurrentSet)
mActions[LC_VIEW_CAMERA_NONE]->setChecked(true);
UpdatePerspective();
}
void lcMainWindow::UpdatePerspective()
void lcMainWindow::ProjectionMenuAboutToShow()
{
lcView* ActiveView = GetActiveView();