X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=fd428ed0ebacd0b5ebe628c2b9893c51101ef8b1;hb=0f8f8c180b32413177f3940ea6f216d1cbadf09b;hp=852de2981eb7bd43d9e82cf03154ae7bbeadbff7;hpb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index 852de29..fd428ed 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -45,6 +45,8 @@
 #include "devices/hardwaredevice.hpp"
 #include "devices/sessionfile.hpp"
 
+#include "toolbars/mainbar.hpp"
+
 #include "view/analogsignal.hpp"
 #include "view/decodetrace.hpp"
 #include "view/logicsignal.hpp"
@@ -131,6 +133,21 @@ shared_ptr<devices::Device> Session::device() const
 	return device_;
 }
 
+std::shared_ptr<pv::view::View> Session::main_view() const
+{
+	return main_view_;
+}
+
+void Session::set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar)
+{
+	main_bar_ = main_bar;
+}
+
+shared_ptr<pv::toolbars::MainBar> Session::main_bar() const
+{
+	return main_bar_;
+}
+
 void Session::set_device(shared_ptr<devices::Device> device)
 {
 	assert(device);
@@ -144,8 +161,12 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	device_.reset();
 
 	// Remove all stored data
-	for (std::shared_ptr<pv::view::View> view : views_)
+	for (std::shared_ptr<pv::view::View> view : views_) {
 		view->clear_signals();
+#ifdef ENABLE_DECODE
+		view->clear_decode_traces();
+#endif
+	}
 	for (const shared_ptr<data::SignalData> d : all_signal_data_)
 		d->clear();
 	all_signal_data_.clear();
@@ -158,7 +179,6 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	}
 
 	logic_data_.reset();
-	decode_traces_.clear();
 
 	signals_changed();
 
@@ -245,12 +265,23 @@ void Session::stop_capture()
 
 void Session::register_view(std::shared_ptr<pv::view::View> view)
 {
+	if (views_.empty()) {
+		main_view_ = view;
+	}
+
 	views_.insert(view);
 }
 
 void Session::deregister_view(std::shared_ptr<pv::view::View> view)
 {
 	views_.erase(view);
+
+	if (views_.empty()) {
+		main_view_.reset();
+
+		// Without a view there can be no main bar
+		main_bar_.reset();
+	}
 }
 
 double Session::get_samplerate() const
@@ -314,10 +345,10 @@ bool Session::add_decoder(srd_decoder *const dec)
 		shared_ptr<data::SignalBase> signalbase =
 			shared_ptr<data::SignalBase>(new data::SignalBase(nullptr));
 
-		shared_ptr<view::DecodeTrace> d(
-			new view::DecodeTrace(*this, signalbase, decoder_stack,
-				decode_traces_.size()));
-		decode_traces_.push_back(d);
+		signalbase->set_decoder_stack(decoder_stack);
+
+		for (std::shared_ptr<pv::view::View> view : views_)
+			view->add_decode_trace(signalbase);
 	} catch (std::runtime_error e) {
 		return false;
 	}
@@ -330,19 +361,10 @@ bool Session::add_decoder(srd_decoder *const dec)
 	return true;
 }
 
-vector< shared_ptr<view::DecodeTrace> > Session::get_decode_signals() const
+void Session::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
 {
-	return decode_traces_;
-}
-
-void Session::remove_decode_signal(view::DecodeTrace *signal)
-{
-	for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
-		if ((*i).get() == signal) {
-			decode_traces_.erase(i);
-			signals_changed();
-			return;
-		}
+	for (std::shared_ptr<pv::view::View> view : views_)
+		view->remove_decode_trace(signalbase);
 }
 #endif
 
@@ -365,8 +387,12 @@ void Session::update_signals()
 	if (!device_) {
 		signalbases_.clear();
 		logic_data_.reset();
-		for (std::shared_ptr<pv::view::View> view : views_)
+		for (std::shared_ptr<pv::view::View> view : views_) {
 			view->clear_signals();
+#ifdef ENABLE_DECODE
+			view->clear_decode_traces();
+#endif
+		}
 		return;
 	}
 
@@ -376,8 +402,12 @@ void Session::update_signals()
 	if (!sr_dev) {
 		signalbases_.clear();
 		logic_data_.reset();
-		for (std::shared_ptr<pv::view::View> view : views_)
+		for (std::shared_ptr<pv::view::View> view : views_) {
 			view->clear_signals();
+#ifdef ENABLE_DECODE
+			view->clear_decode_traces();
+#endif
+		}
 		return;
 	}