Merge branch 'master' of https://github.com/ngscopeclient/scopehal-apps

Author: lainy

src/ngscopeclient/FilterGraphEditor.h

@@ -162,6 +162,8 @@ class FilterGraphEditor : public Dialog
 
 	std::map<uintptr_t, std::string> GetGroupIDs();
 
+	static bool IsBackEdge(FlowGraphNode* src, FlowGraphNode* dst);
+
 protected:
 	friend class FilterGraphGroup;
 
@@ -189,7 +191,6 @@ class FilterGraphEditor : public Dialog
 	void HandleLinkDeletionRequests(Filter*& fReconfigure);
 	void HandleBackgroundContextMenu();
 	void DoAddMenu();
-	bool IsBackEdge(FlowGraphNode* src, FlowGraphNode* dst);
 
 	void HandleOverlaps();
 	void CalculateNodeForces(

src/ngscopeclient/FilterPropertiesDialog.cpp

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2024 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -41,6 +41,7 @@
 #include "NFDFileBrowser.h"
 #include "../scopehal/ActionProvider.h"
 #include "../scopeprotocols/TouchstoneImportFilter.h"
+#include "FilterGraphEditor.h"
 
 using namespace std;
 
@@ -169,6 +170,9 @@ bool FilterPropertiesDialog::DoRender()
 				int sel = -1;
 				for(auto stream : streams)
 				{
+					if(FilterGraphEditor::IsBackEdge(stream.m_channel, f))
+						continue;
+
 					if(!f->ValidateChannel(i, stream))
 						continue;