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.
544 lines
14 KiB
C++
544 lines
14 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/>. *
|
|
* *
|
|
**************************************************************************/
|
|
|
|
#include "PreCompiled.h"
|
|
#ifndef _PreComp_
|
|
#include <QMessageBox>
|
|
#endif
|
|
|
|
#include <QMetaType>
|
|
|
|
#include <Base/Console.h>
|
|
#include <Gui/MainWindow.h>
|
|
#include <Gui/MetaTypes.h>
|
|
|
|
#include <Mod/Material/App/Exceptions.h>
|
|
#include <Mod/Material/App/Materials.h>
|
|
|
|
#include "ArrayModel.h"
|
|
|
|
|
|
using namespace MatGui;
|
|
|
|
/* TRANSLATOR MatGui::ArrayModel */
|
|
|
|
AbstractArrayModel::AbstractArrayModel(QObject* parent)
|
|
: QAbstractTableModel(parent)
|
|
{}
|
|
|
|
//===
|
|
|
|
|
|
Array2DModel::Array2DModel(std::shared_ptr<Materials::MaterialProperty> property,
|
|
std::shared_ptr<Materials::Material2DArray> value,
|
|
QObject* parent)
|
|
: AbstractArrayModel(parent)
|
|
, _property(property)
|
|
, _value(value)
|
|
{}
|
|
|
|
int Array2DModel::rowCount(const QModelIndex& parent) const
|
|
{
|
|
if (parent.isValid()) {
|
|
return 0; // No children
|
|
}
|
|
|
|
return _value->rows() + 1; // Will always have 1 empty row
|
|
}
|
|
|
|
bool Array2DModel::newRow(const QModelIndex& index) const
|
|
{
|
|
return (index.row() == _value->rows());
|
|
}
|
|
|
|
void Array2DModel::deleteRow(const QModelIndex& index)
|
|
{
|
|
removeRows(index.row(), 1);
|
|
Q_EMIT dataChanged(index, index);
|
|
}
|
|
|
|
int Array2DModel::columnCount(const QModelIndex& parent) const
|
|
{
|
|
Q_UNUSED(parent);
|
|
|
|
return _property->columns();
|
|
}
|
|
|
|
QVariant Array2DModel::data(const QModelIndex& index, int role) const
|
|
{
|
|
if (role == Qt::DisplayRole) {
|
|
try {
|
|
return _value->getValue(index.row(), index.column());
|
|
}
|
|
catch (const Materials::InvalidIndex&) {
|
|
}
|
|
|
|
try {
|
|
auto column = _property->getColumnType(index.column());
|
|
if (column == Materials::MaterialValue::Quantity) {
|
|
Base::Quantity q = Base::Quantity(0, _property->getColumnUnits(index.column()));
|
|
return QVariant::fromValue(q);
|
|
}
|
|
}
|
|
catch (const Materials::InvalidColumn&) {
|
|
}
|
|
|
|
return QString();
|
|
}
|
|
|
|
return QVariant();
|
|
}
|
|
|
|
QVariant Array2DModel::headerData(int section, Qt::Orientation orientation, int role) const
|
|
{
|
|
if (role == Qt::DisplayRole) {
|
|
if (orientation == Qt::Horizontal) {
|
|
const Materials::MaterialProperty& column = _property->getColumn(section);
|
|
return QVariant(column.getName());
|
|
}
|
|
else if (orientation == Qt::Vertical) {
|
|
// Vertical header
|
|
if (section == (rowCount() - 1)) {
|
|
return QVariant(QString::fromStdString("*"));
|
|
}
|
|
return QVariant(section + 1);
|
|
}
|
|
}
|
|
|
|
return QAbstractTableModel::headerData(section, orientation, role);
|
|
}
|
|
|
|
bool Array2DModel::setData(const QModelIndex& index, const QVariant& value, int role)
|
|
{
|
|
Q_UNUSED(role);
|
|
|
|
if (index.row() == _value->rows()) {
|
|
insertRows(index.row(), 1);
|
|
}
|
|
_value->setValue(index.row(), index.column(), value);
|
|
|
|
Q_EMIT dataChanged(index, index);
|
|
return true;
|
|
}
|
|
|
|
Qt::ItemFlags Array2DModel::flags(const QModelIndex& index) const
|
|
{
|
|
return (QAbstractTableModel::flags(index) | Qt::ItemIsEditable);
|
|
}
|
|
|
|
|
|
// Resizing functions
|
|
bool Array2DModel::insertRows(int row, int count, const QModelIndex& parent)
|
|
{
|
|
beginInsertRows(parent, row, row + count - 1);
|
|
|
|
int columns = columnCount();
|
|
for (int i = 0; i < count; i++) {
|
|
auto rowPtr = std::make_shared<std::vector<QVariant>>();
|
|
for (int j = 0; j < columns; j++) {
|
|
rowPtr->push_back(_property->getColumnNull(j));
|
|
}
|
|
|
|
_value->insertRow(row, rowPtr);
|
|
}
|
|
|
|
endInsertRows();
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Array2DModel::removeRows(int row, int count, const QModelIndex& parent)
|
|
{
|
|
beginRemoveRows(parent, row, row + count - 1);
|
|
|
|
for (int i = 0; i < count; i++) {
|
|
_value->deleteRow(row);
|
|
}
|
|
|
|
endRemoveRows();
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Array2DModel::insertColumns(int column, int count, const QModelIndex& parent)
|
|
{
|
|
Q_UNUSED(column);
|
|
Q_UNUSED(count);
|
|
Q_UNUSED(parent);
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Array2DModel::removeColumns(int column, int count, const QModelIndex& parent)
|
|
{
|
|
Q_UNUSED(column);
|
|
Q_UNUSED(count);
|
|
Q_UNUSED(parent);
|
|
|
|
return false;
|
|
}
|
|
|
|
//===
|
|
|
|
Array3DDepthModel::Array3DDepthModel(std::shared_ptr<Materials::MaterialProperty> property,
|
|
std::shared_ptr<Materials::Material3DArray> value,
|
|
QObject* parent)
|
|
: AbstractArrayModel(parent)
|
|
, _property(property)
|
|
, _value(value)
|
|
{}
|
|
|
|
int Array3DDepthModel::rowCount(const QModelIndex& parent) const
|
|
{
|
|
if (parent.isValid()) {
|
|
return 0; // No children
|
|
}
|
|
|
|
return _value->depth() + 1; // Will always have 1 empty row
|
|
}
|
|
|
|
bool Array3DDepthModel::newRow(const QModelIndex& index) const
|
|
{
|
|
return (index.row() == _value->depth());
|
|
}
|
|
|
|
void Array3DDepthModel::deleteRow(const QModelIndex& index)
|
|
{
|
|
removeRows(index.row(), 1);
|
|
Q_EMIT dataChanged(index, index);
|
|
}
|
|
|
|
QVariant Array3DDepthModel::data(const QModelIndex& index, int role) const
|
|
{
|
|
if (role == Qt::DisplayRole) {
|
|
try {
|
|
Base::Quantity q = _value->getDepthValue(index.row());
|
|
return QVariant::fromValue(q);
|
|
}
|
|
catch (const Materials::InvalidDepth&) {
|
|
}
|
|
catch (const Materials::InvalidRow&) {
|
|
}
|
|
catch (const Materials::InvalidColumn&) {
|
|
}
|
|
catch (const Materials::InvalidIndex&) {
|
|
}
|
|
|
|
try {
|
|
Base::Quantity q = Base::Quantity(0, _property->getColumnUnits(0));
|
|
return QVariant::fromValue(q);
|
|
}
|
|
catch (const Materials::InvalidColumn&) {
|
|
}
|
|
}
|
|
|
|
return QVariant();
|
|
}
|
|
|
|
QVariant Array3DDepthModel::headerData(int section, Qt::Orientation orientation, int role) const
|
|
{
|
|
if (role == Qt::DisplayRole) {
|
|
if (orientation == Qt::Horizontal) {
|
|
const Materials::MaterialProperty& column = _property->getColumn(section);
|
|
return QVariant(column.getName());
|
|
}
|
|
else if (orientation == Qt::Vertical) {
|
|
// Vertical header
|
|
if (section == (rowCount() - 1)) {
|
|
return QVariant(QString::fromStdString("*"));
|
|
}
|
|
return QVariant(section + 1);
|
|
}
|
|
}
|
|
|
|
return QAbstractTableModel::headerData(section, orientation, role);
|
|
}
|
|
|
|
bool Array3DDepthModel::setData(const QModelIndex& index, const QVariant& value, int role)
|
|
{
|
|
Q_UNUSED(role);
|
|
|
|
if (index.row() == _value->depth()) {
|
|
insertRows(index.row(), 1);
|
|
_value->setCurrentDepth(index.row());
|
|
}
|
|
_value->setDepthValue(index.row(), value.value<Base::Quantity>());
|
|
|
|
Q_EMIT dataChanged(index, index);
|
|
return true;
|
|
}
|
|
|
|
Qt::ItemFlags Array3DDepthModel::flags(const QModelIndex& index) const
|
|
{
|
|
return (QAbstractTableModel::flags(index) | Qt::ItemIsEditable);
|
|
}
|
|
|
|
|
|
// Resizing functions
|
|
bool Array3DDepthModel::insertRows(int row, int count, const QModelIndex& parent)
|
|
{
|
|
beginInsertRows(parent, row, row + count - 1);
|
|
|
|
for (int i = 0; i < count; i++) {
|
|
_value->addDepth(row, Base::Quantity(0, _property->getColumnUnits(0)));
|
|
}
|
|
|
|
endInsertRows();
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Array3DDepthModel::removeRows(int row, int count, const QModelIndex& parent)
|
|
{
|
|
beginRemoveRows(parent, row, row + count - 1);
|
|
|
|
for (int i = 0; i < count; i++) {
|
|
_value->deleteDepth(row);
|
|
}
|
|
|
|
endRemoveRows();
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Array3DDepthModel::insertColumns(int column, int count, const QModelIndex& parent)
|
|
{
|
|
Q_UNUSED(column);
|
|
Q_UNUSED(count);
|
|
Q_UNUSED(parent);
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Array3DDepthModel::removeColumns(int column, int count, const QModelIndex& parent)
|
|
{
|
|
Q_UNUSED(column);
|
|
Q_UNUSED(count);
|
|
Q_UNUSED(parent);
|
|
|
|
return false;
|
|
}
|
|
|
|
//===
|
|
|
|
Array3DModel::Array3DModel(std::shared_ptr<Materials::MaterialProperty> property,
|
|
std::shared_ptr<Materials::Material3DArray> value,
|
|
QObject* parent)
|
|
: AbstractArrayModel(parent)
|
|
, _property(property)
|
|
, _value(value)
|
|
{}
|
|
|
|
int Array3DModel::rowCount(const QModelIndex& parent) const
|
|
{
|
|
if (parent.isValid()) {
|
|
return 0; // No children
|
|
}
|
|
|
|
try {
|
|
return _value->rows() + 1; // Will always have 1 empty row
|
|
}
|
|
catch (const Materials::InvalidDepth&) {
|
|
return 1;
|
|
}
|
|
catch (const Materials::InvalidRow&) {
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
int Array3DModel::columnCount(const QModelIndex& parent) const
|
|
{
|
|
Q_UNUSED(parent);
|
|
|
|
return _property->columns() - 1;
|
|
}
|
|
|
|
bool Array3DModel::newRow(const QModelIndex& index) const
|
|
{
|
|
try {
|
|
return (index.row() == _value->rows());
|
|
}
|
|
catch (const Materials::InvalidDepth&) {
|
|
return true;
|
|
}
|
|
catch (const Materials::InvalidRow&) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
void Array3DModel::deleteRow(const QModelIndex& index)
|
|
{
|
|
removeRows(index.row(), 1);
|
|
Q_EMIT dataChanged(index, index);
|
|
}
|
|
|
|
QVariant Array3DModel::data(const QModelIndex& index, int role) const
|
|
{
|
|
if (role == Qt::DisplayRole) {
|
|
// Base::Console().Log("Row %d, column %d\n", index.row(), index.column());
|
|
try {
|
|
Base::Quantity q = _value->getValue(index.row(), index.column());
|
|
return QVariant::fromValue(q);
|
|
}
|
|
catch (const Materials::InvalidDepth&) {
|
|
}
|
|
catch (const Materials::InvalidRow&) {
|
|
}
|
|
catch (const Materials::InvalidColumn&) {
|
|
}
|
|
catch (const Materials::InvalidIndex&) {
|
|
}
|
|
catch (const std::exception& e) {
|
|
Base::Console().Error("The error message is: %s\n", e.what());
|
|
}
|
|
|
|
try {
|
|
Base::Quantity q = Base::Quantity(0, _property->getColumnUnits(index.column() + 1));
|
|
return QVariant::fromValue(q);
|
|
}
|
|
catch (const Materials::InvalidColumn&) {
|
|
}
|
|
}
|
|
|
|
return QVariant();
|
|
}
|
|
|
|
QVariant Array3DModel::headerData(int section, Qt::Orientation orientation, int role) const
|
|
{
|
|
if (role == Qt::DisplayRole) {
|
|
if (orientation == Qt::Horizontal) {
|
|
const Materials::MaterialProperty& column = _property->getColumn(section + 1);
|
|
return QVariant(column.getName());
|
|
}
|
|
else if (orientation == Qt::Vertical) {
|
|
// Vertical header
|
|
if (section == (rowCount() - 1)) {
|
|
return QVariant(QString::fromStdString("*"));
|
|
}
|
|
return QVariant(section + 1);
|
|
}
|
|
}
|
|
|
|
return QAbstractTableModel::headerData(section, orientation, role);
|
|
}
|
|
|
|
bool Array3DModel::setData(const QModelIndex& index, const QVariant& value, int role)
|
|
{
|
|
Q_UNUSED(role);
|
|
|
|
Base::Console().Log("Array3DModel::setData at (%d, %d, %d)\n",
|
|
_value->currentDepth(),
|
|
index.row(),
|
|
index.column());
|
|
|
|
if (_value->depth() == 0) {
|
|
// Create the first row
|
|
// _value->addDepth(Base::Quantity(0, _property->getColumnUnits(0)));
|
|
return false;
|
|
}
|
|
|
|
if (index.row() == _value->rows()) {
|
|
insertRows(index.row(), 1);
|
|
}
|
|
try {
|
|
_value->setValue(index.row(), index.column(), value.value<Base::Quantity>());
|
|
}
|
|
catch (const Materials::InvalidDepth&) {
|
|
Base::Console().Error("Array3DModel::setData - InvalidDepth");
|
|
}
|
|
catch (const Materials::InvalidRow&) {
|
|
Base::Console().Error("Array3DModel::setData - invalidRow");
|
|
}
|
|
catch (const Materials::InvalidColumn&) {
|
|
Base::Console().Error("Array3DModel::setData - InvalidColumn");
|
|
}
|
|
|
|
Q_EMIT dataChanged(index, index);
|
|
return true;
|
|
}
|
|
|
|
Qt::ItemFlags Array3DModel::flags(const QModelIndex& index) const
|
|
{
|
|
return (QAbstractTableModel::flags(index) | Qt::ItemIsEditable);
|
|
}
|
|
|
|
|
|
// Resizing functions
|
|
bool Array3DModel::insertRows(int row, int count, const QModelIndex& parent)
|
|
{
|
|
beginInsertRows(parent, row, row + count - 1);
|
|
|
|
int columns = columnCount();
|
|
for (int i = 0; i < count; i++) {
|
|
auto rowPtr = std::make_shared<std::vector<Base::Quantity>>();
|
|
for (int j = 0; j < columns; j++) {
|
|
rowPtr->push_back(_property->getColumnNull(j).value<Base::Quantity>());
|
|
}
|
|
|
|
_value->insertRow(row, rowPtr);
|
|
}
|
|
|
|
endInsertRows();
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Array3DModel::removeRows(int row, int count, const QModelIndex& parent)
|
|
{
|
|
beginRemoveRows(parent, row, row + count - 1);
|
|
|
|
for (int i = 0; i < count; i++) {
|
|
_value->deleteRow(row);
|
|
}
|
|
|
|
endRemoveRows();
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Array3DModel::insertColumns(int column, int count, const QModelIndex& parent)
|
|
{
|
|
Q_UNUSED(column);
|
|
Q_UNUSED(count);
|
|
Q_UNUSED(parent);
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Array3DModel::removeColumns(int column, int count, const QModelIndex& parent)
|
|
{
|
|
Q_UNUSED(column);
|
|
Q_UNUSED(count);
|
|
Q_UNUSED(parent);
|
|
|
|
return false;
|
|
}
|
|
|
|
void Array3DModel::updateData()
|
|
{
|
|
beginResetModel();
|
|
|
|
// The table has changed at this point, typically by setting the current depth.
|
|
// The existing structure needs to be cleared and the table redrawn.
|
|
|
|
endResetModel();
|
|
}
|