[Commit-gnuradio] [gnuradio] 02/03: qtgui: fixed a bug in the constellation plots that didn't allow us to reduce the number of samples.

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch maint
in repository gnuradio.

commit d1373fca675f92b96aedc394d696a75afe38df2a
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 28 11:34:44 2014 -0400

    qtgui: fixed a bug in the constellation plots that didn't allow us to 
reduce the number of samples.
---
 gr-qtgui/lib/const_sink_c_impl.cc | 7 ++++---
 gr-qtgui/lib/const_sink_c_impl.h  | 3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gr-qtgui/lib/const_sink_c_impl.cc 
b/gr-qtgui/lib/const_sink_c_impl.cc
index 8d71cbb..a1e1d09 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -238,7 +238,7 @@ namespace gr {
                                        int channel,
                                        const std::string &tag_key)
     {
-      gr::thread::scoped_lock lock(d_mutex);
+      gr::thread::scoped_lock lock(d_setlock);
 
       d_trigger_mode = mode;
       d_trigger_slope = slope;
@@ -308,7 +308,7 @@ namespace gr {
     void
     const_sink_c_impl::set_nsamps(const int newsize)
     {
-      gr::thread::scoped_lock lock(d_mutex);
+      gr::thread::scoped_lock lock(d_setlock);
 
       if(newsize != d_size) {
        // Set new size and reset buffer index
@@ -331,6 +331,7 @@ namespace gr {
        }
 
        d_main_gui->setNPoints(d_size);
+        _reset();
       }
     }
 
@@ -355,7 +356,7 @@ namespace gr {
     void
     const_sink_c_impl::reset()
     {
-      gr::thread::scoped_lock lock(d_mutex);
+      gr::thread::scoped_lock lock(d_setlock);
       _reset();
     }
 
diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h
index 0f1540d..e28ac3f 100644
--- a/gr-qtgui/lib/const_sink_c_impl.h
+++ b/gr-qtgui/lib/const_sink_c_impl.h
@@ -25,7 +25,6 @@
 
 #include <gnuradio/qtgui/const_sink_c.h>
 #include <gnuradio/high_res_timer.h>
-#include <gnuradio/thread/thread.h>
 #include <gnuradio/qtgui/constellationdisplayform.h>
 
 namespace gr {
@@ -36,8 +35,6 @@ namespace gr {
     private:
       void initialize();
 
-      gr::thread::mutex d_mutex;
-
       int d_size, d_buffer_size;
       std::string d_name;
       int d_nconnections;