revised keyframe system for graph editor

project/effectrow.cpp

@@ -56,6 +56,7 @@ void EffectRow::setKeyframing(bool b) {
 void EffectRow::set_keyframe_enabled(bool enabled) {
 	if (enabled) {
 		ComboAction* ca = new ComboAction();
+		ca->append(new SetKeyframing(this, true));
 		set_keyframe_now(ca);
 		undo_stack.push(ca);
 	} else {
@@ -156,7 +157,74 @@ EffectRow::~EffectRow() {
 }
 
 void EffectRow::set_keyframe_now(ComboAction* ca) {
-	int index = -1;
+	long time = sequence->playhead-parent_effect->parent_clip->timeline_in+parent_effect->parent_clip->clip_in;
+
+	if (!just_made_unsafe_keyframe) {
+		EffectKeyframe key;
+		key.time = time;
+
+		unsafe_keys.resize(fieldCount());
+		unsafe_old_data.resize(fieldCount());
+		key_is_new.resize(fieldCount());
+
+		for (int i=0;i<fieldCount();i++) {
+			EffectField* f = field(i);
+
+			int exist_key = -1;
+			int closest_key = 0;
+			for (int j=0;j<f->keyframes.size();j++) {
+				if (f->keyframes.at(j).time == time) {
+					exist_key = j;
+				} else if (f->keyframes.at(j).time < time
+						   && f->keyframes.at(closest_key).time < f->keyframes.at(j).time) {
+					closest_key = j;
+				}
+			}
+			if (exist_key == -1) {
+				key.type = (f->keyframes.size() == 0) ? KEYFRAME_TYPE_LINEAR : f->keyframes.at(closest_key).type;
+				key.data = f->get_current_data();//f->keyframes.at(closest_key).data;
+				unsafe_keys[i] = f->keyframes.size();
+				f->keyframes.append(key);
+				key_is_new[i] = true;
+			} else {
+				unsafe_keys[i] = exist_key;
+				key_is_new[i] = false;
+			}
+			unsafe_old_data[i] = f->get_current_data();
+		}
+		just_made_unsafe_keyframe = true;
+	}
+
+	for (int i=0;i<fieldCount();i++) {
+		field(i)->keyframes[unsafe_keys.at(i)].data = field(i)->get_current_data();
+	}
+
+	if (ca != NULL)	{
+		for (int i=0;i<fieldCount();i++) {
+			if (key_is_new.at(i)) ca->append(new KeyframeFieldSet(field(i), unsafe_keys.at(i)));
+			ca->append(new SetQVariant(&field(i)->keyframes[unsafe_keys.at(i)].data, unsafe_old_data.at(i), field(i)->get_current_data()));
+		}
+		unsafe_keys.clear();
+		unsafe_old_data.clear();
+		just_made_unsafe_keyframe = false;
+	}
+
+	panel_effect_controls->update_keyframes();
+
+
+
+
+
+	/*if (ca != NULL) {
+		just_made_unsafe_keyframe = false;
+	} else {
+		if (!just_made_unsafe_keyframe) {
+			just_made_unsafe_keyframe = true;
+		}
+	}*/
+
+
+	/*int index = -1;
 	long time = sequence->playhead-parent_effect->parent_clip->timeline_in+parent_effect->parent_clip->clip_in;
 	for (int j=0;j<fieldCount();j++) {
 		EffectField* f = field(j);
@@ -179,7 +247,7 @@ void EffectRow::set_keyframe_now(ComboAction* ca) {
 		delete ks;
 	}
 
-	panel_effect_controls->update_keyframes();
+	panel_effect_controls->update_keyframes();*/
 }
 
 void EffectRow::delete_keyframe_at_time(ComboAction* ca, long time) {

project/effectrow.h

@@ -48,6 +48,10 @@ private:
 	KeyframeNavigator* keyframe_nav;
 
 	bool just_made_unsafe_keyframe;
+	QVector<int> unsafe_keys;
+	QVector<QVariant> unsafe_old_data;
+	QVector<bool> key_is_new;
+
 };
 
 #endif // EFFECTROW_H

project/undo.cpp

@@ -752,66 +752,6 @@ void KeyframeDelete::redo() {
 	mainWindow->setWindowModified(true);
 }
 
-KeyframeSet::KeyframeSet(EffectRow* r, int i, long t, bool justMadeKeyframe) :
-	old_project_changed(mainWindow->isWindowModified()),
-	row(r),
-	index(i),
-	time(t),
-	just_made_keyframe(justMadeKeyframe),
-	done(true)
-{
-	enable_keyframes = !row->isKeyframing();
-	if (index != -1) old_values.resize(row->fieldCount());
-	new_values.resize(row->fieldCount());
-	for (int i=0;i<row->fieldCount();i++) {
-		EffectField* field = row->field(i);
-		if (index != -1) {
-			if (field->type == EFFECT_FIELD_DOUBLE) {
-				old_values[i] = static_cast<LabelSlider*>(field->ui_element)->getPreviousValue();
-			} else {
-				old_values[i] = field->keyframes.at(index).data;
-			}
-		}
-		new_values[i] = field->get_current_data();
-	}
-}
-
-void KeyframeSet::undo() {
-	if (enable_keyframes) row->setKeyframing(false);
-
-	bool append = (index == -1 || just_made_keyframe);
-	for (int i=0;i<row->fieldCount();i++) {
-		if (append) {
-			row->field(i)->keyframes.removeLast();
-		} else {
-			row->field(i)->keyframes[index].data = old_values.at(i);
-		}
-	}
-
-	mainWindow->setWindowModified(old_project_changed);
-	done = false;
-}
-
-void KeyframeSet::redo() {
-	bool append = (index == -1 || (just_made_keyframe && !done));
-	for (int i=0;i<row->fieldCount();i++) {
-		EffectField* f = row->field(i);
-		if (append) {
-			EffectKeyframe k;
-			k.data = new_values.at(i);
-			k.time = time;
-			k.type = (f->keyframes.size() > 0) ? f->keyframes.last().type : EFFECT_KEYFRAME_LINEAR;
-			f->keyframes.append(k);
-		} else {
-			f->keyframes[index].data = new_values.at(i);
-		}
-	}
-	row->setKeyframing(true);
-
-	mainWindow->setWindowModified(true);
-	done = true;
-}
-
 EffectFieldUndo::EffectFieldUndo(EffectField* f) :
 	field(f),
 	done(true),

project/undo.h

@@ -342,24 +342,6 @@ private:
 	bool old_project_changed;
 };
 
-
-class KeyframeSet : public QUndoCommand {
-public:
-	KeyframeSet(EffectRow* r, int i, long t, bool justMadeKeyframe);
-	void undo();
-	void redo();
-	QVector<QVariant> old_values;
-	QVector<QVariant> new_values;
-private:
-	bool old_project_changed;
-	EffectRow* row;
-	int index;
-	long time;
-	bool enable_keyframes;
-	bool just_made_keyframe;
-	bool done;
-};
-
 // a more modern version of the above, could probably replace it
 // assumes the keyframe already exists
 class KeyframeFieldSet : public QUndoCommand {