##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SCIQLOP-Initialisation
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Fix bug when creating two variables crash the app. ...
Fix bug when creating two variables crash the app. Variable as now invalid range and cache range at creation
perrinel - - Load All Authors

File last commit:

r699:a7f60f6512e6
r699:a7f60f6512e6
Show More
VariableModel.cpp
293 lines | 9.0 KiB | text/x-c | CppLexer
/ core / src / Variable / VariableModel.cpp
History | Source | Raw |Copy content |Copy permalink
Alexandre Leroux
Changes Variable from struct to class
 r151 #include <Variable/Variable.h>
Alexandre Leroux
Creates the variable model...
 r107 #include <Variable/VariableModel.h>
Alexandre Leroux
Uses DateUtils
 r450 #include <Common/DateUtils.h>
Alexandre Leroux
Generates unique name for variable duplicate
 r653 #include <Common/StringUtils.h>
Alexandre Leroux
Uses DateUtils
 r450
Alexandre Leroux
Updates VariableModel::createVariable() method...
 r153 #include <Data/IDataSeries.h>
Alexandre Leroux
Creates the variable model...
 r107
Alexandre Leroux
Updates headerData() method to return column width/size for role Qt::SizeHintRole
 r257 #include <QSize>
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369 #include <unordered_map>
Alexandre Leroux
Replaces unit and mission columns by datetime columns
 r254
Alexandre Leroux
Creates the variable model...
 r107 Q_LOGGING_CATEGORY(LOG_VariableModel, "VariableModel")
Alexandre Leroux
Adapts VariableModel to be a QabstractTableModel...
 r140 namespace {
Alexandre Leroux
Implements headerData() method
 r141 // Column indexes
const auto NAME_COLUMN = 0;
Alexandre Leroux
Replaces unit and mission columns by datetime columns
 r254 const auto TSTART_COLUMN = 1;
const auto TEND_COLUMN = 2;
Alexandre Leroux
Adds column to display nb points in variable widget
 r662 const auto NBPOINTS_COLUMN = 3;
const auto UNIT_COLUMN = 4;
const auto MISSION_COLUMN = 5;
const auto PLUGIN_COLUMN = 6;
const auto NB_COLUMNS = 7;
Alexandre Leroux
Adapts VariableModel to be a QabstractTableModel...
 r140
Alexandre Leroux
Creates struct for column properties...
 r255 // Column properties
Alexandre Leroux
Adds width and height properties
 r256 const auto DEFAULT_HEIGHT = 25;
const auto DEFAULT_WIDTH = 100;
Alexandre Leroux
Creates struct for column properties...
 r255
struct ColumnProperties {
Alexandre Leroux
Adds width and height properties
 r256 ColumnProperties(const QString &name = {}, int width = DEFAULT_WIDTH,
int height = DEFAULT_HEIGHT)
: m_Name{name}, m_Width{width}, m_Height{height}
{
}
Alexandre Leroux
Creates struct for column properties...
 r255
QString m_Name;
Alexandre Leroux
Adds width and height properties
 r256 int m_Width;
int m_Height;
Alexandre Leroux
Creates struct for column properties...
 r255 };
Alexandre Leroux
Adds "unit" and "mission" columns to variable widget
 r519 const auto COLUMN_PROPERTIES = QHash<int, ColumnProperties>{
Alexandre Leroux
Adds column to display nb points in variable widget
 r662 {NAME_COLUMN, {QObject::tr("Name")}}, {TSTART_COLUMN, {QObject::tr("tStart"), 180}},
{TEND_COLUMN, {QObject::tr("tEnd"), 180}}, {NBPOINTS_COLUMN, {QObject::tr("Nb points")}},
{UNIT_COLUMN, {QObject::tr("Unit")}}, {MISSION_COLUMN, {QObject::tr("Mission")}},
{PLUGIN_COLUMN, {QObject::tr("Plugin")}}};
Alexandre Leroux
Creates struct for column properties...
 r255
Alexandre Leroux
Replaces unit and mission columns by datetime columns
 r254 /// Format for datetimes
const auto DATETIME_FORMAT = QStringLiteral("dd/MM/yyyy \nhh:mm:ss:zzz");
Alexandre Leroux
Generates unique name for variable duplicate
 r653 QString uniqueName(const QString &defaultName,
const std::vector<std::shared_ptr<Variable> > &variables)
{
auto forbiddenNames = std::vector<QString>(variables.size());
std::transform(variables.cbegin(), variables.cend(), forbiddenNames.begin(),
[](const auto &variable) { return variable->name(); });
auto uniqueName = StringUtils::uniqueName(defaultName, forbiddenNames);
Q_ASSERT(!uniqueName.isEmpty());
return uniqueName;
}
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369
Alexandre Leroux
Adapts VariableModel to be a QabstractTableModel...
 r140 } // namespace
Alexandre Leroux
Creates the variable model...
 r107 struct VariableModel::VariableModelPrivate {
/// Variables created in SciQlop
Alexandre Leroux
Updates VariableModel::createVariable() method...
 r153 std::vector<std::shared_ptr<Variable> > m_Variables;
Alexandre Leroux
Corrects regression on variable destruction
 r387 std::unordered_map<std::shared_ptr<Variable>, double> m_VariableToProgress;
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369
perrinel
Correction MR
 r370 /// Return the row index of the variable. -1 if it's not found
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369 int indexOfVariable(Variable *variable) const noexcept;
Alexandre Leroux
Creates the variable model...
 r107 };
Alexandre Leroux
Adapts VariableModel to be a QabstractTableModel...
 r140 VariableModel::VariableModel(QObject *parent)
: QAbstractTableModel{parent}, impl{spimpl::make_unique_impl<VariableModelPrivate>()}
Alexandre Leroux
Creates the variable model...
 r107 {
}
Alexandre Leroux
Adds variable to model
 r652 void VariableModel::addVariable(std::shared_ptr<Variable> variable) noexcept
Alexandre Leroux
Creates the variable model...
 r107 {
Alexandre Leroux
Notifies view when a variable is added to the model
 r144 auto insertIndex = rowCount();
beginInsertRows({}, insertIndex, insertIndex);
Alexandre Leroux
Generates unique name for variable duplicate
 r653 // Generates unique name for the variable
variable->setName(uniqueName(variable->name(), impl->m_Variables));
Alexandre Leroux
Updates VariableModel::createVariable() method...
 r153 impl->m_Variables.push_back(variable);
Alexandre Leroux
Fixes refresh problem in Variable widget
 r340 connect(variable.get(), &Variable::updated, this, &VariableModel::onVariableUpdated);
Alexandre Leroux
Creates the variable model...
 r107
Alexandre Leroux
Notifies view when a variable is added to the model
 r144 endInsertRows();
Alexandre Leroux
Adds variable to model
 r652 }
Alexandre Leroux
Creates duplicate only if the variable is in the model
 r654 bool VariableModel::containsVariable(std::shared_ptr<Variable> variable) const noexcept
{
auto end = impl->m_Variables.cend();
return std::find(impl->m_Variables.cbegin(), end, variable) != end;
}
Alexandre Leroux
Adds variable to model
 r652 std::shared_ptr<Variable> VariableModel::createVariable(const QString &name,
const QVariantHash &metadata) noexcept
{
perrinel
Fix bug when creating two variables crash the app. ...
 r699 auto variable = std::make_shared<Variable>(name, metadata);
Alexandre Leroux
Adds variable to model
 r652 addVariable(variable);
Alexandre Leroux
Notifies view when a variable is added to the model
 r144
Alexandre Leroux
Updates VariableModel::createVariable() method...
 r153 return variable;
Alexandre Leroux
Creates the variable model...
 r107 }
Alexandre Leroux
Adapts VariableModel to be a QabstractTableModel...
 r140
Alexandre Leroux
Variable deletion (3)...
 r306 void VariableModel::deleteVariable(std::shared_ptr<Variable> variable) noexcept
{
if (!variable) {
qCCritical(LOG_Variable()) << "Can't delete a null variable from the model";
return;
}
// Finds variable in the model
auto begin = impl->m_Variables.cbegin();
auto end = impl->m_Variables.cend();
auto it = std::find(begin, end, variable);
if (it != end) {
auto removeIndex = std::distance(begin, it);
// Deletes variable
beginRemoveRows({}, removeIndex, removeIndex);
impl->m_Variables.erase(it);
endRemoveRows();
}
else {
qCritical(LOG_VariableModel())
<< tr("Can't delete variable %1 from the model: the variable is not in the model")
.arg(variable->name());
}
Alexandre Leroux
Corrects regression on variable destruction
 r387
// Removes variable from progress map
impl->m_VariableToProgress.erase(variable);
Alexandre Leroux
Variable deletion (3)...
 r306 }
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369
Alexandre Leroux
Retrieves the current selected variable when clicking on the variable widget
 r229 std::shared_ptr<Variable> VariableModel::variable(int index) const
{
Alexandre Leroux
Pull request fixes
 r234 return (index >= 0 && index < impl->m_Variables.size()) ? impl->m_Variables[index] : nullptr;
Alexandre Leroux
Retrieves the current selected variable when clicking on the variable widget
 r229 }
Alexandre Leroux
Adds method to get all variables from model...
 r636 std::vector<std::shared_ptr<Variable> > VariableModel::variables() const
{
return impl->m_Variables;
}
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369 void VariableModel::setDataProgress(std::shared_ptr<Variable> variable, double progress)
{
perrinel
Remove abort button validity when the progress is finished (eg. == 0)
 r398 if (progress > 0.0) {
impl->m_VariableToProgress[variable] = progress;
}
else {
impl->m_VariableToProgress.erase(variable);
}
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369 auto modelIndex = createIndex(impl->indexOfVariable(variable.get()), NAME_COLUMN);
emit dataChanged(modelIndex, modelIndex);
}
Alexandre Leroux
Adapts VariableModel to be a QabstractTableModel...
 r140 int VariableModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
return NB_COLUMNS;
}
int VariableModel::rowCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
return impl->m_Variables.size();
}
QVariant VariableModel::data(const QModelIndex &index, int role) const
{
Alexandre Leroux
Implements data() method
 r142 if (!index.isValid()) {
return QVariant{};
}
if (index.row() < 0 || index.row() >= rowCount()) {
return QVariant{};
}
if (role == Qt::DisplayRole) {
Alexandre Leroux
Removes useless const ref
 r147 if (auto variable = impl->m_Variables.at(index.row()).get()) {
Alexandre Leroux
Implements data() method
 r142 switch (index.column()) {
case NAME_COLUMN:
Alexandre Leroux
Changes Variable from struct to class
 r151 return variable->name();
Alexandre Leroux
Fixed untimely update of the range to be displayed in the variable widget
 r611 case TSTART_COLUMN: {
auto range = variable->realRange();
return range != INVALID_RANGE
? DateUtils::dateTime(range.m_TStart).toString(DATETIME_FORMAT)
: QVariant{};
}
case TEND_COLUMN: {
auto range = variable->realRange();
return range != INVALID_RANGE
? DateUtils::dateTime(range.m_TEnd).toString(DATETIME_FORMAT)
: QVariant{};
}
Alexandre Leroux
Adds column to display nb points in variable widget
 r662 case NBPOINTS_COLUMN:
return variable->nbPoints();
Alexandre Leroux
Adds "unit" and "mission" columns to variable widget
 r519 case UNIT_COLUMN:
return variable->metadata().value(QStringLiteral("units"));
case MISSION_COLUMN:
return variable->metadata().value(QStringLiteral("mission"));
Alexandre Leroux
Adds plugin column to variable widget...
 r520 case PLUGIN_COLUMN:
return variable->metadata().value(QStringLiteral("plugin"));
Alexandre Leroux
Implements data() method
 r142 default:
// No action
break;
}
qWarning(LOG_VariableModel())
<< tr("Can't get data (unknown column %1)").arg(index.column());
}
else {
qWarning(LOG_VariableModel()) << tr("Can't get data (no variable)");
}
}
perrinel
Correction MR
 r370 else if (role == VariableRoles::ProgressRole) {
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369 if (auto variable = impl->m_Variables.at(index.row())) {
Alexandre Leroux
Corrects regression on variable destruction
 r387 auto it = impl->m_VariableToProgress.find(variable);
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369 if (it != impl->m_VariableToProgress.cend()) {
return it->second;
}
}
}
Alexandre Leroux
Implements data() method
 r142
Alexandre Leroux
Adapts VariableModel to be a QabstractTableModel...
 r140 return QVariant{};
}
QVariant VariableModel::headerData(int section, Qt::Orientation orientation, int role) const
{
Alexandre Leroux
Updates headerData() method to return column width/size for role Qt::SizeHintRole
 r257 if (role != Qt::DisplayRole && role != Qt::SizeHintRole) {
Alexandre Leroux
Implements headerData() method
 r141 return QVariant{};
}
if (orientation == Qt::Horizontal) {
Alexandre Leroux
Creates struct for column properties...
 r255 auto propertiesIt = COLUMN_PROPERTIES.find(section);
if (propertiesIt != COLUMN_PROPERTIES.cend()) {
// Role is either DisplayRole or SizeHintRole
Alexandre Leroux
Updates headerData() method to return column width/size for role Qt::SizeHintRole
 r257 return (role == Qt::DisplayRole)
? QVariant{propertiesIt->m_Name}
: QVariant{QSize{propertiesIt->m_Width, propertiesIt->m_Height}};
Alexandre Leroux
Creates struct for column properties...
 r255 }
else {
qWarning(LOG_VariableModel())
<< tr("Can't get header data (unknown column %1)").arg(section);
Alexandre Leroux
Implements headerData() method
 r141 }
}
Alexandre Leroux
Adapts VariableModel to be a QabstractTableModel...
 r140
return QVariant{};
}
Alexandre Leroux
Fixes refresh problem in Variable widget
 r340
perrinel
Implement of the abort download process
 r388 void VariableModel::abortProgress(const QModelIndex &index)
{
if (auto variable = impl->m_Variables.at(index.row())) {
emit abortProgessRequested(variable);
}
}
Alexandre Leroux
Fixes refresh problem in Variable widget
 r340 void VariableModel::onVariableUpdated() noexcept
{
// Finds variable that has been updated in the model
if (auto updatedVariable = dynamic_cast<Variable *>(sender())) {
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369 auto updatedVariableIndex = impl->indexOfVariable(updatedVariable);
if (updatedVariableIndex > -1) {
emit dataChanged(createIndex(updatedVariableIndex, 0),
createIndex(updatedVariableIndex, columnCount() - 1));
Alexandre Leroux
Fixes refresh problem in Variable widget
 r340 }
}
}
perrinel
Add implementation of progress bar on variable inspector connected to...
 r369
int VariableModel::VariableModelPrivate::indexOfVariable(Variable *variable) const noexcept
{
auto begin = std::cbegin(m_Variables);
auto end = std::cend(m_Variables);
auto it
= std::find_if(begin, end, [variable](const auto &var) { return var.get() == variable; });
if (it != end) {
// Gets the index of the variable in the model: we assume here that views have the same
// order as the model
return std::distance(begin, it);
}
else {
return -1;
}
}