Differential D12682 Diff 33781 plugins/dockers/animation/timeline_frames_model.cpp

Changeset View

Standalone View

View Options

plugins/dockers/animation/timeline_frames_model.cpp

Context not available.
103 return (primaryChannel && primaryChannel->keyframeAt(column)); 103​ return (primaryChannel && primaryChannel->keyframeAt(column));
104 } 104​ }
105 105​
106​ bool frameHasContent(int row, int column) {
107​
108​ KisNodeDummy *dummy = converter->dummyFromRow(row);
109​
110​ KisKeyframeChannel *primaryChannel = dummy->node()->getKeyframeChannel(KisKeyframeChannel::Content.id());
111​ if (!primaryChannel) return false;
112​
113​ // first check if we are a key frame
114​ KisKeyframeSP frame = primaryChannel->activeKeyframeAt(column); // primaryChannel->keyframeAt(column);
115​ if (!frame) return false;
116​
117​ return frame->hasContent();
118​ }
119​
106 bool specialKeyframeExists(int row, int column) { 120​ bool specialKeyframeExists(int row, int column) {
107 KisNodeDummy *dummy = converter->dummyFromRow(row); 121​ KisNodeDummy *dummy = converter->dummyFromRow(row);
108 if (!dummy) return false; 122​ if (!dummy) return false;
Context not available.
140 frame->setColorLabel(color); 154​ frame->setColorLabel(color);
141 } 155​ }
142 156​
157​ void setHasContent(int row, int column)
dkazakovUnsubmitted
Not Done

I'm not sure what this function does? The value seem to be calculated from !layerDevice->extent().isEmpty(), why may anyone want to set this value?

dkazakov: I'm not sure what this function does? The value seem to be calculated from !layerDevice->extent…
scottpetrovicAuthorUnsubmitted
Not Done

This is only used once for this set function.

TimelineFramesModel::setData(...)

setData is the trigger that updates the frame data with this hasContent logic. Maybe there is a better place to call this when updating the state of the frame data

scottpetrovic: This is only used once for this set function. TimelineFramesModel::setData(...) setData is…
158​ {
159​ KisNodeDummy *dummy = converter->dummyFromRow(row);
160​ if (!dummy) return;
161​
162​ bool valueToSet;
163​ if ( dummy->node()->paintDevice()->extent().height() || dummy->node()->paintDevice()->extent().width()) {
164​ valueToSet = true;
165​ } else {
166​ valueToSet = false;
167​ }
168​
169​ KisKeyframeChannel *primaryChannel = dummy->node()->getKeyframeChannel(KisKeyframeChannel::Content.id());
170​ if (!primaryChannel) return;
171​
172​ KisKeyframeSP frame = primaryChannel->currentlyActiveKeyframe();
173​ if (!frame) return;
174​
175​ frame->setHasContent(valueToSet);
176​ }
177​
143 int layerColorLabel(int row) const { 178​ int layerColorLabel(int row) const {
144 KisNodeDummy *dummy = converter->dummyFromRow(row); 179​ KisNodeDummy *dummy = converter->dummyFromRow(row);
145 if (!dummy) return -1; 180​ if (!dummy) return -1;
Context not available.
338 case FrameEditableRole: { 373​ case FrameEditableRole: {
339 return m_d->layerEditable(index.row()); 374​ return m_d->layerEditable(index.row());
340 } 375​ }
376​ case FrameHasContent: {
377​ return m_d->frameHasContent(index.row(), index.column());
378​ }
341 case FrameExistsRole: { 379​ case FrameExistsRole: {
342 return m_d->frameExists(index.row(), index.column()); 380​ return m_d->frameExists(index.row(), index.column());
343 } 381​ }
Context not available.
346 } 384​ }
347 case FrameColorLabelIndexRole: { 385​ case FrameColorLabelIndexRole: {
348 int label = m_d->frameColorLabel(index.row(), index.column()); 386​ int label = m_d->frameColorLabel(index.row(), index.column());
387​
388​
389​ // hold frames inherit from their keyframe
390​ if( !m_d->frameExists(index.row(), index.column()) && m_d->frameHasContent(index.row(), index.column())){
391​ KisNodeSP node = nodeAt(index);
392​ KIS_SAFE_ASSERT_RECOVER(node) { return label > 0 ? label : QVariant(); }
393​
394​ KisKeyframeChannel *channel = node->getKeyframeChannel(KisKeyframeChannel::Content.id());
395​
396​
397​ KisKeyframeSP keyFrame = channel->activeKeyframeAt(index.column());
398​
399​ return keyFrame->colorLabel();
400​ }
401​
402​
403​
404​
349 return label > 0 ? label : QVariant(); 405​ return label > 0 ? label : QVariant();
350 } 406​ }
351 case Qt::DisplayRole: { 407​ case Qt::DisplayRole: {
Context not available.
407 break; 463​ break;
408 } 464​ }
409 465​
466​
467​ // don't calculate content if row does not have animation enabled.
468​ // this also fixes a crash if a vector layer accessed this function
469​ KisNodeDummy *dummy = m_d->converter->dummyFromRow(m_d->activeLayerIndex);
470​ if (dummy->node()->isAnimated()) {
471​ m_d->setHasContent(index.row(), index.column());
472​ }
473​
474​
410 return ModelWithExternalNotifications::setData(index, value, role); 475​ return ModelWithExternalNotifications::setData(index, value, role);
411} 476​}
412 477​
Context not available.