X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=cbe9a2a2eb4fd7bd6b0ddb828739381261c5b597;hp=fdb97728f59fe080506c81ecd9acbae0039f3d6d;hb=3b6c4a1fe75289e56be6bc2a5d1b9e24ccdd1744;hpb=d13d95b3eaee713cc4eabbc0682ca545b4c31800

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index fdb97728..cbe9a2a2 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -100,16 +100,23 @@ Channels::Channels(Session &session, QWidget *parent) :
 	}
 
 	// Make a vector of the remaining channels
-	vector< shared_ptr<SignalBase> > global_sigs;
+	vector< shared_ptr<SignalBase> > global_analog_sigs, global_logic_sigs;
 	for (auto channel : device->channels()) {
 		const map<shared_ptr<Channel>, shared_ptr<SignalBase> >::
 			const_iterator iter = signal_map.find(channel);
-		if (iter != signal_map.end())
-			global_sigs.push_back((*iter).second);
+
+		if (iter != signal_map.end()) {
+			const shared_ptr<SignalBase> signal = (*iter).second;
+			if (signal->type() == SignalBase::AnalogChannel)
+				global_analog_sigs.push_back(signal);
+			else
+				global_logic_sigs.push_back(signal);
+		}
 	}
 
-	// Create a group
-	populate_group(nullptr, global_sigs);
+	// Create the groups for the ungrouped channels
+	populate_group(nullptr, global_logic_sigs);
+	populate_group(nullptr, global_analog_sigs);
 
 	// Create the enable/disable all buttons
 	connect(&enable_all_channels_, SIGNAL(clicked()), this, SLOT(enable_all_channels()));