From 83ce2a29cb286b97b98c2a64b9e259b6409ef436 Mon Sep 17 00:00:00 2001 From: Person Date: Sun, 8 Mar 2020 14:30:47 -0700 Subject: [PATCH] --Bug fixes -Preserve prefix and suffix fields between open/close of the Final Render dialog. --- Source/Fractorium/FinalRenderDialog.cpp | 12 ++++++++++++ Source/Fractorium/FinalRenderDialog.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/Source/Fractorium/FinalRenderDialog.cpp b/Source/Fractorium/FinalRenderDialog.cpp index 821742d..0baee36 100644 --- a/Source/Fractorium/FinalRenderDialog.cpp +++ b/Source/Fractorium/FinalRenderDialog.cpp @@ -2,6 +2,10 @@ #include "FinalRenderDialog.h" #include "Fractorium.h" +QString FractoriumFinalRenderDialog::m_Prefix = ""; +QString FractoriumFinalRenderDialog::m_Suffix = ""; + + /// /// Constructor which sets up the GUI for the final rendering dialog. /// Settings used to populate widgets with initial values. @@ -83,8 +87,10 @@ FractoriumFinalRenderDialog::FractoriumFinalRenderDialog(QWidget* p, Qt::WindowF connect(m_Tbcw->m_Button2, SIGNAL(clicked(bool)), this, SLOT(OnShowFolderButtonClicked(bool)), Qt::QueuedConnection); connect(m_Tbcw->m_Combo, SIGNAL(currentIndexChanged(int)), this, SLOT(OnExtIndexChanged(int)), Qt::QueuedConnection); m_PrefixEdit = new QLineEdit(table); + m_PrefixEdit->setText(m_Prefix); table->setCellWidget(row++, 1, m_PrefixEdit); m_SuffixEdit = new QLineEdit(table); + m_SuffixEdit->setText(m_Suffix); table->setCellWidget(row++, 1, m_SuffixEdit); connect(m_PrefixEdit, SIGNAL(textChanged(const QString&)), this, SLOT(OnPrefixChanged(const QString&)), Qt::QueuedConnection); connect(m_SuffixEdit, SIGNAL(textChanged(const QString&)), this, SLOT(OnSuffixChanged(const QString&)), Qt::QueuedConnection); @@ -274,6 +280,12 @@ FractoriumFinalRenderDialog::FractoriumFinalRenderDialog(QWidget* p, Qt::WindowF w = SetTabOrder(this, w, ui.FinalRenderCloseButton); } +FractoriumFinalRenderDialog::~FractoriumFinalRenderDialog() +{ + m_Prefix = m_PrefixEdit->text(); + m_Suffix = m_SuffixEdit->text(); +} + /// /// Show the final render dialog and specify whether it was called from the toolbar or the sequence render button. /// diff --git a/Source/Fractorium/FinalRenderDialog.h b/Source/Fractorium/FinalRenderDialog.h index 9aac02e..22c44fe 100644 --- a/Source/Fractorium/FinalRenderDialog.h +++ b/Source/Fractorium/FinalRenderDialog.h @@ -51,6 +51,7 @@ class FractoriumFinalRenderDialog : public QDialog public: FractoriumFinalRenderDialog(QWidget* p, Qt::WindowFlags f = 0); + ~FractoriumFinalRenderDialog(); void Show(bool fromSequence); bool EarlyClip(); bool YAxisUp(); @@ -125,6 +126,8 @@ protected: private: bool CreateControllerFromGUI(bool createRenderer); bool SetMemory(); + static QString m_Prefix; + static QString m_Suffix; bool m_FromSequence; int m_MemoryCellIndex;