GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1264:17c80e548bb4

115

Q_ASSERT(false);

115

Q_ASSERT(false);

116

return QStringLiteral("Unknown Data");

116

return QStringLiteral("Unknown Data");

117

}

117

}

118

119

void refreshChildrenOfIndex(CatalogueEventsModel *model, const QModelIndex &index) const

120

{

121

auto childCount = model->rowCount(index);

122

auto colCount = model->columnCount();

123

emit model->dataChanged(model->index(0, 0, index),

124

model->index(childCount, colCount, index));

125

}

118

};

126

};

119

127

120

CatalogueEventsModel::CatalogueEventsModel(QObject *parent)

128

CatalogueEventsModel::CatalogueEventsModel(QObject *parent)

170

178

171

void CatalogueEventsModel::addEvent(const std::shared_ptr<DBEvent> &event)

179

void CatalogueEventsModel::addEvent(const std::shared_ptr<DBEvent> &event)

172

{

180

{

173

beginInsertRows(QModelIndex(), impl->m_Events.count() - 1, impl->m_Events.count() - 1);

181

beginInsertRows(QModelIndex(), impl->m_Events.count(), impl->m_Events.count());

174

impl->m_Events.append(event);

182

impl->m_Events.append(event);

175

impl->parseEventProduct(event);

183

impl->parseEventProduct(event);

176

endInsertRows();

184

endInsertRows();

185

186

// Also refreshes its children event products

187

auto eventIndex = index(impl->m_Events.count(), 0);

188

impl->refreshChildrenOfIndex(this, eventIndex);

177

}

189

}

178

190

179

void CatalogueEventsModel::removeEvent(const std::shared_ptr<DBEvent> &event)

191

void CatalogueEventsModel::removeEvent(const std::shared_ptr<DBEvent> &event)

203

emit dataChanged(eventIndex, index(eventIndex.row(), colCount));

215

emit dataChanged(eventIndex, index(eventIndex.row(), colCount));

204

216

205

// Also refreshes its children event products

217

// Also refreshes its children event products

206

auto childCount = rowCount(eventIndex);

218

impl->refreshChildrenOfIndex(this, eventIndex);

207

emit dataChanged(index(0, 0, eventIndex), index(childCount, colCount, eventIndex));

208

}

219

}

209

else {

220

else {

210

qCWarning(LOG_CatalogueEventsModel()) << "refreshEvent: event not found.";

221

qCWarning(LOG_CatalogueEventsModel()) << "refreshEvent: event not found.";

355

366

356

void CatalogueEventsModel::sort(int column, Qt::SortOrder order)

367

void CatalogueEventsModel::sort(int column, Qt::SortOrder order)

357

{

368

{

369

beginResetModel();

358

std::sort(impl->m_Events.begin(), impl->m_Events.end(),

370

std::sort(impl->m_Events.begin(), impl->m_Events.end(),

359

[this, column, order](auto e1, auto e2) {

371

[this, column, order](auto e1, auto e2) {

360

auto data1 = impl->sortData(column, e1);

372

auto data1 = impl->sortData(column, e1);

365

return order == Qt::AscendingOrder ? result : !result;

377

return order == Qt::AscendingOrder ? result : !result;

366

});

378

});

367

379

368

emit dataChanged(QModelIndex(), QModelIndex());

380

endResetModel();

369

emit modelSorted();

381

emit modelSorted();

370

}

382

}

371

383

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

                     Q_ASSERT(false);
                     return QStringLiteral("Unknown Data");
                 }
+                void refreshChildrenOfIndex(CatalogueEventsModel *model, const QModelIndex &index) const
+                {
+                    auto childCount = model->rowCount(index);
+                    auto colCount = model->columnCount();
+                    emit model->dataChanged(model->index(0, 0, index),
+                                            model->index(childCount, colCount, index));
+                }
             };
             CatalogueEventsModel::CatalogueEventsModel(QObject *parent)
             void CatalogueEventsModel::addEvent(const std::shared_ptr<DBEvent> &event)
             {
-                beginInsertRows(QModelIndex(), impl->m_Events.count() - 1, impl->m_Events.count() - 1);
+                beginInsertRows(QModelIndex(), impl->m_Events.count(), impl->m_Events.count());
                 impl->m_Events.append(event);
                 impl->parseEventProduct(event);
                 endInsertRows();
+                // Also refreshes its children event products
+                auto eventIndex = index(impl->m_Events.count(), 0);
+                impl->refreshChildrenOfIndex(this, eventIndex);
             }
             void CatalogueEventsModel::removeEvent(const std::shared_ptr<DBEvent> &event)
                     emit dataChanged(eventIndex, index(eventIndex.row(), colCount));
                     // Also refreshes its children event products
-                    auto childCount = rowCount(eventIndex);
+                    impl->refreshChildrenOfIndex(this, eventIndex);
-                    emit dataChanged(index(0, 0, eventIndex), index(childCount, colCount, eventIndex));
                 }
                 else {
                     qCWarning(LOG_CatalogueEventsModel()) << "refreshEvent: event not found.";
             void CatalogueEventsModel::sort(int column, Qt::SortOrder order)
             {
+                beginResetModel();
                 std::sort(impl->m_Events.begin(), impl->m_Events.end(),
                           [this, column, order](auto e1, auto e2) {
                               auto data1 = impl->sortData(column, e1);
                               return order == Qt::AscendingOrder ? result : !result;
                           });
-                emit dataChanged(QModelIndex(), QModelIndex());
+                endResetModel();
                 emit modelSorted();
             }