kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Move the unit schema into Project Information and remove all Project Unit System code (#11266)

Browse Source 
* Add unit system to Project Information and store with document.

* Remove the project unit system

* Restore correct document activation signalling to fix test fail

* Remove commented out dead lines

* Restore ignore option for project unit schemas

* Whitespace fix

* Refresh after changing units

* Remove field label

* Property editor changes applied to unit system
This commit is contained in:
bgbsww
2023-12-04 14:04:53 -05:00
committed by GitHub
parent 0aa328622d
commit c2bab7a2fa
12 changed files with 125 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Gui/MainWindow.cpp
View File

@@ -100,7 +100,6 @@
#include "WorkbenchManager.h"
#include "Workbench.h"
#include "MergeDocuments.h"
#include "ViewProviderExtern.h"
@@ -181,11 +180,14 @@ public:
}
QObject::connect(actionGrp, &QActionGroup::triggered, this, [this](QAction* action) {
int userSchema = action->data().toInt();
// Set and save the Unit System
Base::UnitsApi::setSchema(static_cast<Base::UnitSystem>(userSchema));
getWindowParameter()->SetInt("UserSchema", userSchema);
// Update the application to show the unit change
Gui::Application::Instance->onUpdate();
setUserSchema(userSchema);
// Force PropertyEditor refresh until we find a better way. Q_EMIT something?
const auto views = getMainWindow()->findChildren<PropertyView*>();
for(auto view : views) {
bool show = view->showAll();
view->setShowAll(!show);
view->setShowAll(show);
}
} );
setMenu(menu);
retranslateUi();
@@ -216,10 +218,32 @@ public:
}
}
void setUserSchema(int userSchema)
{
App::Document* doc = App::GetApplication().getActiveDocument();
if ( doc != nullptr ) {
if (doc->UnitSystem.getValue() != userSchema )
doc->UnitSystem.setValue(userSchema);
} else
getWindowParameter()->SetInt("UserSchema", userSchema);
unitChanged();
Base::UnitsApi::setSchema(static_cast<Base::UnitSystem>(userSchema));
// Update the main window to show the unit change
Gui::Application::Instance->onUpdate();
}
private:
void unitChanged()
{
ParameterGrp::handle hGrpu = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/Units");
bool ignore = hGrpu->GetBool("IgnoreProjectSchema", false);
App::Document* doc = App::GetApplication().getActiveDocument();
int userSchema = getWindowParameter()->GetInt("UserSchema", 0);
if ( doc != nullptr && ! ignore) {
userSchema = doc->UnitSystem.getValue();
}
auto actions = menu()->actions();
if(Q_UNLIKELY(userSchema < 0 || userSchema >= actions.size())) {
userSchema = 0;
@@ -242,7 +266,7 @@ private:
// Pimpl class
struct MainWindowP
{
QPushButton* sizeLabel;
DimensionWidget* sizeLabel;
QLabel* actionLabel;
QTimer* actionTimer;
QTimer* statusTimer;
@@ -2430,6 +2454,13 @@ void MainWindow::setPaneText(int i, QString text)
}
}
void MainWindow::setUserSchema(int userSchema)
{
d->sizeLabel->setUserSchema(userSchema);
}
void MainWindow::customEvent(QEvent* e)
{
if (e->type() == QEvent::User) {