Wire up most of the functionality in the stims and responses tabs. Cu…

…stom stims tab still missing.
codereader · Dec 30, 2019 · 5dd1974 · 5dd1974
1 parent 5955243
commit 5dd1974
Show file tree

Hide file tree

Showing 8 changed files with 4,027 additions and 3,882 deletions.
diff --git a/install/ui/stimresponseeditor.fbp b/install/ui/stimresponseeditor.fbp
diff --git a/install/ui/stimresponseeditor.xrc b/install/ui/stimresponseeditor.xrc
diff --git a/plugins/dm.stimresponse/ClassEditor.cpp b/plugins/dm.stimresponse/ClassEditor.cpp
@@ -397,7 +397,7 @@ void ClassEditor::onContextMenu(wxDataViewEvent& ev)
 
 void ClassEditor::onStimTypeSelect(wxCommandEvent& ev)
 {
-	if (_updatesDisabled || _type == NULL) return; // Callback loop guard
+	if (_updatesDisabled || _type == nullptr) return; // Callback loop guard
 
 	std::string name = getStimTypeIdFromSelector(_type);
 
@@ -410,10 +410,10 @@ void ClassEditor::onStimTypeSelect(wxCommandEvent& ev)
 
 void ClassEditor::onAddTypeSelect(wxCommandEvent& ev)
 {
-	if (_updatesDisabled || _addType == NULL) return; // Callback loop guard
+	if (_updatesDisabled || _addType == nullptr) return; // Callback loop guard
 
 	wxComboBox* combo = dynamic_cast<wxComboBox*>(ev.GetEventObject());
-	assert(combo != NULL);
+	assert(combo != nullptr);
 
 	std::string name = getStimTypeIdFromSelector(combo);
 

diff --git a/plugins/dm.stimresponse/ResponseEditor.cpp b/plugins/dm.stimresponse/ResponseEditor.cpp
@@ -161,8 +161,6 @@ void ResponseEditor::setupPage()
 	_type->SetName("ResponseEditorTypeCombo");
 #endif
 
-	_stimTypes.populateComboBox(_type);
-
 	_type->Connect(wxEVT_COMBOBOX, wxCommandEventHandler(ResponseEditor::onStimTypeSelect), NULL, this); 
 
 	// Active
@@ -196,6 +194,28 @@ void ResponseEditor::setupPage()
 	makeLabelBold(_mainPanel, "ResponseEditorFXLabel");
 
 	createEffectWidgets();
+
+	_addType = findNamedObject<wxBitmapComboBox>(_mainPanel, "ResponseTypeComboBox");
+	_addType->Bind(wxEVT_COMBOBOX, std::bind(&ResponseEditor::onAddTypeSelect, this, std::placeholders::_1));
+
+	auto addButton = findNamedObject<wxButton>(_mainPanel, "AddResponseButton");
+	auto removeButton = findNamedObject<wxButton>(_mainPanel, "RemoveResponseButton");
+
+	addButton->Bind(wxEVT_BUTTON, std::bind(&ResponseEditor::onAddSR, this, std::placeholders::_1));
+	removeButton->Bind(wxEVT_BUTTON, std::bind(&ResponseEditor::onRemoveSR, this, std::placeholders::_1));
+
+	reloadStimTypes();
+}
+
+void ResponseEditor::reloadStimTypes()
+{
+	if (_stimTypes.getStimMap().empty())
+	{
+		_stimTypes.reload();
+	}
+
+	_stimTypes.populateComboBox(_addType);
+	_stimTypes.populateComboBox(_type);
 }
 
 void ResponseEditor::createEffectWidgets()

diff --git a/plugins/dm.stimresponse/ResponseEditor.h b/plugins/dm.stimresponse/ResponseEditor.h
@@ -57,6 +57,8 @@ class ResponseEditor :
 	 */
 	void update() override;
 
+	void reloadStimTypes();
+
 private:
 	/** greebo: Updates the associated text fields when a check box
 	 * 			is toggled.

diff --git a/plugins/dm.stimresponse/StimEditor.cpp b/plugins/dm.stimresponse/StimEditor.cpp
@@ -37,15 +37,27 @@ void StimEditor::setupPage()
 
 	setupEditPanel();
 
-	auto addType = findNamedObject<wxBitmapComboBox>(_mainPanel, "StimTypeComboBox");
-
-	addType->Bind(wxEVT_COMBOBOX, std::bind(&StimEditor::onAddTypeSelect, this, std::placeholders::_1));
+	_addType = findNamedObject<wxBitmapComboBox>(_mainPanel, "StimTypeComboBox");
+	_addType->Bind(wxEVT_COMBOBOX, std::bind(&StimEditor::onAddTypeSelect, this, std::placeholders::_1));
 
 	auto addButton = findNamedObject<wxButton>(_mainPanel, "AddStimButton");
 	auto removeButton = findNamedObject<wxButton>(_mainPanel, "RemoveStimButton");
 
 	addButton->Bind(wxEVT_BUTTON, std::bind(&StimEditor::onAddSR, this, std::placeholders::_1));
 	removeButton->Bind(wxEVT_BUTTON, std::bind(&StimEditor::onRemoveSR, this, std::placeholders::_1));
+
+	reloadStimTypes();
+}
+
+void StimEditor::reloadStimTypes()
+{
+	if (_stimTypes.getStimMap().empty())
+	{
+		_stimTypes.reload();
+	}
+
+	_stimTypes.populateComboBox(_addType);
+	_stimTypes.populateComboBox(_type);
 }
 
 void StimEditor::setEntity(const SREntityPtr& entity)

diff --git a/plugins/dm.stimresponse/StimEditor.h b/plugins/dm.stimresponse/StimEditor.h
@@ -99,6 +99,8 @@ class StimEditor :
 	 */
 	void update() override;
 
+	void reloadStimTypes();
+
 private:
 	/** greebo: Retrieves the formatted timer string h:m:s:ms
 	 */

diff --git a/plugins/dm.stimresponse/StimResponseEditor.cpp b/plugins/dm.stimresponse/StimResponseEditor.cpp
@@ -89,9 +89,8 @@ void StimResponseEditor::populateWindow()
 
 	_notebook = findNamedObject<wxNotebook>(this, "SREditorNotebook");
 
-	// Set up the list containing the stims and responses
-
 	_stimEditor = new StimEditor(mainPanel, _stimTypes);
+	_responseEditor = new ResponseEditor(mainPanel, _stimTypes);
 
 #if 0
 	SetSizer(new wxBoxSizer(wxVERTICAL));
@@ -128,9 +127,9 @@ void StimResponseEditor::populateWindow()
 	findNamedObject<wxButton>(this, "SREditorCancelButton")->Bind(
 		wxEVT_BUTTON, [this](wxCommandEvent& ev) { EndModal(wxID_CANCEL); });
 
-	if (_lastShownPage == -1 && _notebook->GetPageCount() > 0)
+	if (_lastShownPage == -1)
 	{
-		_lastShownPage = -1;
+		_lastShownPage = 0;
 	}
 
 	Layout();