d1e96a5195
Continues the work of the material subsystem improvements. This merge covers the continued development of the material editor. The primary improvements are in the handling of 2D and 3D array properties. These properties are now fully editable, and can be saved and restored. The cards now separate the author and license. These were previously saved as a single item. Future support will be provided for standard open source licenses. Saving operations validate the cards to ensure UUIDs of materials are considered. Warnings are given when a save could potentially impact the models, such as saving over a material instead of creating a new instance. The editor is still not complete. There are a number of functional elements, such as drag/drop operations, folder creation, and deletion operations that need to be added to the main tree. State needs to be saved and restored to improve the user experience. The appearance preview also needs significant work. This will be handled in a future PR.
123 lines
3.9 KiB
C++
123 lines
3.9 KiB
C++
/***************************************************************************
|
|
* Copyright (c) 2023 David Carter <dcarter@david.carter.ca> *
|
|
* *
|
|
* This file is part of FreeCAD. *
|
|
* *
|
|
* FreeCAD is free software: you can redistribute it and/or modify it *
|
|
* under the terms of the GNU Lesser General Public License as *
|
|
* published by the Free Software Foundation, either version 2.1 of the *
|
|
* License, or (at your option) any later version. *
|
|
* *
|
|
* FreeCAD is distributed in the hope that it will be useful, but *
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
|
|
* Lesser General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the GNU Lesser General Public *
|
|
* License along with FreeCAD. If not, see *
|
|
* <https://www.gnu.org/licenses/>. *
|
|
* *
|
|
**************************************************************************/
|
|
|
|
#ifndef MATERIAL_MODELLIBRARY_H
|
|
#define MATERIAL_MODELLIBRARY_H
|
|
|
|
#include <memory>
|
|
|
|
#include <QDir>
|
|
#include <QString>
|
|
|
|
#include <Base/BaseClass.h>
|
|
#include <Base/Quantity.h>
|
|
|
|
#include <Mod/Material/MaterialGlobal.h>
|
|
|
|
#include "MaterialValue.h"
|
|
#include "Model.h"
|
|
namespace Materials
|
|
{
|
|
|
|
// class Model;
|
|
|
|
class MaterialsExport LibraryBase: public Base::BaseClass
|
|
{
|
|
TYPESYSTEM_HEADER();
|
|
|
|
public:
|
|
LibraryBase();
|
|
LibraryBase(const QString& libraryName, const QString& dir, const QString& icon);
|
|
~LibraryBase() override = default;
|
|
|
|
const QString getName() const
|
|
{
|
|
return _name;
|
|
}
|
|
const QString getDirectory() const
|
|
{
|
|
return _directory;
|
|
}
|
|
const QString getDirectoryPath() const
|
|
{
|
|
return QDir(_directory).absolutePath();
|
|
}
|
|
const QString getIconPath() const
|
|
{
|
|
return _iconPath;
|
|
}
|
|
bool operator==(const LibraryBase& library) const;
|
|
bool operator!=(const LibraryBase& library) const
|
|
{
|
|
return !operator==(library);
|
|
}
|
|
QString getLocalPath(const QString& path) const;
|
|
QString getRelativePath(const QString& path) const;
|
|
bool isRoot(const QString& path) const;
|
|
|
|
private:
|
|
LibraryBase(const LibraryBase&);
|
|
|
|
QString _name;
|
|
QString _directory;
|
|
QString _iconPath;
|
|
};
|
|
|
|
class MaterialsExport ModelLibrary: public LibraryBase,
|
|
public std::enable_shared_from_this<ModelLibrary>
|
|
{
|
|
TYPESYSTEM_HEADER();
|
|
|
|
public:
|
|
ModelLibrary();
|
|
ModelLibrary(const QString& libraryName, const QString& dir, const QString& icon);
|
|
~ModelLibrary() override = default;
|
|
|
|
bool operator==(const ModelLibrary& library) const
|
|
{
|
|
return LibraryBase::operator==(library);
|
|
}
|
|
bool operator!=(const ModelLibrary& library) const
|
|
{
|
|
return !operator==(library);
|
|
}
|
|
std::shared_ptr<Model> getModelByPath(const QString& path) const;
|
|
|
|
std::shared_ptr<Model> addModel(const Model& model, const QString& path);
|
|
|
|
// Use this to get a shared_ptr for *this
|
|
std::shared_ptr<ModelLibrary> getptr()
|
|
{
|
|
return shared_from_this();
|
|
}
|
|
std::shared_ptr<std::map<QString, std::shared_ptr<ModelTreeNode>>>
|
|
getModelTree(ModelFilter filter) const;
|
|
|
|
private:
|
|
ModelLibrary(const ModelLibrary&);
|
|
|
|
std::unique_ptr<std::map<QString, std::shared_ptr<Model>>> _modelPathMap;
|
|
};
|
|
|
|
} // namespace Materials
|
|
|
|
#endif // MATERIAL_MODELLIBRARY_H
|