ngscopeclient · May 17, 2021 · May 17, 2021
Showing with 97 additions and 58 deletions.

+4 −55 scopehal/Filter.cpp

+1 −1 scopehal/Filter.h

+63 −0 scopehal/FlowGraphNode.cpp

+7 −0 scopehal/FlowGraphNode.h

+4 −2 scopehal/Oscilloscope.cpp

+11 −0 scopehal/Trigger.cpp

+7 −0 scopehal/Trigger.h
diff --git a/scopehal/Filter.cpp b/scopehal/Filter.cpp
@@ -722,16 +722,13 @@ void Filter::LoadInputs(const YAML::Node& node, IDTable& table)
 	}
 }
 
-string Filter::SerializeConfiguration(IDTable& table)
+string Filter::SerializeConfiguration(IDTable& table, size_t /*indent*/)
 {
-	//Save basic decode info
-	char tmp[1024];
-	snprintf(tmp, sizeof(tmp), "    : \n");
-	string config = tmp;
-	snprintf(tmp, sizeof(tmp), "        id:              %d\n", table.emplace(this));
-	config += tmp;
+	string config = "    : \n";
+	config += FlowGraphNode::SerializeConfiguration(table, 8);
 
 	//Channel info
+	char tmp[1024];
 	snprintf(tmp, sizeof(tmp), "        protocol:        \"%s\"\n", GetProtocolDisplayName().c_str());
 	config += tmp;
 	snprintf(tmp, sizeof(tmp), "        color:           \"%s\"\n", m_displaycolor.c_str());
@@ -741,54 +738,6 @@ string Filter::SerializeConfiguration(IDTable& table)
 	snprintf(tmp, sizeof(tmp), "        name:            \"%s\"\n", GetHwname().c_str());
 	config += tmp;
 
-	//Inputs
-	snprintf(tmp, sizeof(tmp), "        inputs: \n");
-	config += tmp;
-	for(size_t i=0; i<m_inputs.size(); i++)
-	{
-		auto desc = m_inputs[i];
-		if(desc.m_channel == NULL)
-			snprintf(tmp, sizeof(tmp), "            %-20s 0\n", (m_signalNames[i] + ":").c_str());
-		else
-		{
-			snprintf(tmp, sizeof(tmp), "            %-20s %d/%zu\n",
-				(m_signalNames[i] + ":").c_str(),
-				table.emplace(desc.m_channel),
-				desc.m_stream
-			);
-		}
-		config += tmp;
-	}
-
-	//Parameters
-	snprintf(tmp, sizeof(tmp), "        parameters: \n");
-	config += tmp;
-	for(auto it : m_parameters)
-	{
-		switch(it.second.GetType())
-		{
-			case FilterParameter::TYPE_FLOAT:
-			case FilterParameter::TYPE_INT:
-			case FilterParameter::TYPE_BOOL:
-				snprintf(
-					tmp,
-					sizeof(tmp),
-					"            %-20s %s\n", (it.first+":").c_str(), it.second.ToString().c_str());
-				break;
-
-			case FilterParameter::TYPE_FILENAME:
-			case FilterParameter::TYPE_FILENAMES:
-			default:
-				snprintf(
-					tmp,
-					sizeof(tmp),
-					"            %-20s \"%s\"\n", (it.first+":").c_str(), it.second.ToString().c_str());
-				break;
-		}
-
-		config += tmp;
-	}
-
 	return config;
 }
 

diff --git a/scopehal/Filter.h b/scopehal/Filter.h
@@ -139,7 +139,7 @@ class Filter	: public OscilloscopeChannel
 	/**
 		@brief Serialize this decoder's configuration to a string
 	 */
-	virtual std::string SerializeConfiguration(IDTable& table);
+	virtual std::string SerializeConfiguration(IDTable& table, size_t indent = 8);
 
 	/**
 		@brief Load configuration from a save file

diff --git a/scopehal/FlowGraphNode.cpp b/scopehal/FlowGraphNode.cpp
@@ -206,3 +206,66 @@ string FlowGraphNode::GetInputDisplayName(size_t i)
 	else
 		return in.m_channel->GetDisplayName();
 }
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Serialization
+
+string FlowGraphNode::SerializeConfiguration(IDTable& table, size_t indent)
+{
+	string sindent = "";
+	for(size_t i=0; i<indent; i++)
+		sindent += ' ';
+
+	//Basic header
+	char tmp[1024];
+	snprintf(tmp, sizeof(tmp), "id:              %d\n", table.emplace(this));
+	string config = sindent + tmp;
+
+	//Inputs
+	config += sindent + "inputs:\n";
+	for(size_t i=0; i<m_inputs.size(); i++)
+	{
+		auto desc = m_inputs[i];
+		if(desc.m_channel == NULL)
+			snprintf(tmp, sizeof(tmp), "    %-20s 0\n", (m_signalNames[i] + ":").c_str());
+		else
+		{
+			snprintf(tmp, sizeof(tmp), "    %-20s %d/%zu\n",
+				(m_signalNames[i] + ":").c_str(),
+				table.emplace(desc.m_channel),
+				desc.m_stream
+			);
+		}
+		config += sindent + tmp;
+	}
+
+	//Parameters
+	config += sindent + "parameters:\n";
+	for(auto it : m_parameters)
+	{
+		switch(it.second.GetType())
+		{
+			case FilterParameter::TYPE_FLOAT:
+			case FilterParameter::TYPE_INT:
+			case FilterParameter::TYPE_BOOL:
+				snprintf(
+					tmp,
+					sizeof(tmp),
+					"    %-20s %s\n", (it.first+":").c_str(), it.second.ToString().c_str());
+				break;
+
+			case FilterParameter::TYPE_FILENAME:
+			case FilterParameter::TYPE_FILENAMES:
+			default:
+				snprintf(
+					tmp,
+					sizeof(tmp),
+					"    %-20s \"%s\"\n", (it.first+":").c_str(), it.second.ToString().c_str());
+				break;
+		}
+
+		config += sindent + tmp;
+	}
+
+	return config;
+}
diff --git a/scopehal/FlowGraphNode.h b/scopehal/FlowGraphNode.h
@@ -116,6 +116,13 @@ class FlowGraphNode
 	ParameterMapType::iterator GetParamEnd()
 	{ return m_parameters.end(); }
 
+	/**
+		@brief Serializes this trigger's configuration to a YAML string.
+
+		@return YAML block with this trigger's configuration
+	 */
+	virtual std::string SerializeConfiguration(IDTable& table, size_t indent = 8);
+
 	//Input handling helpers
 protected:
 

diff --git a/scopehal/Oscilloscope.cpp b/scopehal/Oscilloscope.cpp
@@ -246,8 +246,6 @@ string Oscilloscope::SerializeConfiguration(IDTable& table)
 	snprintf(tmp, sizeof(tmp), "        interleave:     %d\n", IsInterleaving());
 	config += tmp;
 
-	//TODO: triggers
-
 	//Save channels
 	config += "        channels:\n";
 	for(size_t i=0; i<GetChannelCount(); i++)
@@ -337,6 +335,10 @@ string Oscilloscope::SerializeConfiguration(IDTable& table)
 		}
 	}
 
+	//Save trigger
+	auto trig = GetTrigger();
+	config += trig->SerializeConfiguration(table);
+
 	return config;
 }
 

diff --git a/scopehal/Trigger.cpp b/scopehal/Trigger.cpp
@@ -70,3 +70,14 @@ Trigger* Trigger::CreateTrigger(string name, Oscilloscope* scope)
 	LogError("Invalid trigger name: %s\n", name.c_str());
 	return NULL;
 }
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Serialization
+
+string Trigger::SerializeConfiguration(IDTable& table, size_t /*indent*/)
+{
+	string config = "        trigger:\n";
+	config += FlowGraphNode::SerializeConfiguration(table, 12);
+	config += string("            type:            ") + GetTriggerDisplayName() + "\n";
+	return config;
+}
diff --git a/scopehal/Trigger.h b/scopehal/Trigger.h
@@ -79,6 +79,13 @@ class Trigger : public FlowGraphNode
 	static void EnumTriggers(std::vector<std::string>& names);
 	static Trigger* CreateTrigger(std::string name, Oscilloscope* scope);
 
+	/**
+		@brief Serializes this trigger's configuration to a YAML string.
+
+		@return YAML block with this trigger's configuration
+	 */
+	virtual std::string SerializeConfiguration(IDTable& table, size_t indent = 8);
+
 protected:
 	//Class enumeration
 	typedef std::map< std::string, CreateProcType > CreateMapType;