X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=188786f1f1691019499e402a0c2ce425774d1fba;hp=e77f18bb4e7ec861f32c55ccc38377080d9e5724;hb=49ec9e075c345c18feb7be1eb59c31578ef532f0;hpb=e0ba4f6fb263b4cc1dae96df2a0ff1e1ef8984ce

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index e77f18b..188786f 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <extdef.h>
@@ -214,9 +213,11 @@ MainBar::MainBar(Session &session, QWidget *parent,
 
 	set_capture_state(pv::Session::Stopped);
 
+	configure_button_.setToolTip(tr("Configure Device"));
 	configure_button_.setIcon(QIcon::fromTheme("configure",
 		QIcon(":/icons/configure.png")));
 
+	channels_button_.setToolTip(tr("Configure Channels"));
 	channels_button_.setIcon(QIcon::fromTheme("channels",
 		QIcon(":/icons/channels.svg")));
 
@@ -227,7 +228,7 @@ MainBar::MainBar(Session &session, QWidget *parent,
 
 	// Setup session_ events
 	connect(&session_, SIGNAL(capture_state_changed(int)),
-		this, SLOT(capture_state_changed(int)));
+		this, SLOT(on_capture_state_changed(int)));
 	connect(&session, SIGNAL(device_changed()),
 		this, SLOT(on_device_changed()));
 
@@ -402,9 +403,12 @@ void MainBar::update_sample_count_selector()
 	uint64_t sample_count = sample_count_.value();
 	uint64_t min_sample_count = 0;
 	uint64_t max_sample_count = MaxSampleCount;
+	bool default_count_set = false;
 
-	if (sample_count == 0)
+	if (sample_count == 0) {
 		sample_count = DefaultSampleCount;
+		default_count_set = true;
+	}
 
 	if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::LIST)) {
 		auto gvar = sr_dev->config_list(ConfigKey::LIMIT_SAMPLES);
@@ -422,8 +426,10 @@ void MainBar::update_sample_count_selector()
 	if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::GET)) {
 		auto gvar = sr_dev->config_get(ConfigKey::LIMIT_SAMPLES);
 		sample_count = g_variant_get_uint64(gvar.gobj());
-		if (sample_count == 0)
+		if (sample_count == 0) {
 			sample_count = DefaultSampleCount;
+			default_count_set = true;
+		}
 		sample_count = min(max(sample_count, MinSampleCount),
 			max_sample_count);
 	}
@@ -431,6 +437,10 @@ void MainBar::update_sample_count_selector()
 	sample_count_.set_value(sample_count);
 
 	updating_sample_count_ = false;
+
+	// If we show the default rate then make sure the device uses the same
+	if (default_count_set)
+		commit_sample_count();
 }
 
 void MainBar::update_device_config_widgets()
@@ -561,11 +571,6 @@ void MainBar::show_session_error(const QString text, const QString info_text)
 	msg.exec();
 }
 
-void MainBar::capture_state_changed(int state)
-{
-	set_capture_state((pv::Session::capture_state)state);
-}
-
 void MainBar::add_decoder(srd_decoder *decoder)
 {
 #ifdef ENABLE_DECODE
@@ -606,9 +611,10 @@ void MainBar::export_file(shared_ptr<OutputFormat> format,
 		const pv::util::Timestamp& start_time = trace_view->cursors()->first()->time();
 		const pv::util::Timestamp& end_time = trace_view->cursors()->second()->time();
 
-		const uint64_t start_sample =
-			std::max((double)0, start_time.convert_to<double>() * samplerate);
-		const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
+		const uint64_t start_sample = (uint64_t)std::max(
+			(double)0, start_time.convert_to<double>() * samplerate);
+		const uint64_t end_sample = (uint64_t)std::max(
+			(double)0, end_time.convert_to<double>() * samplerate);
 
 		sample_range = std::make_pair(start_sample, end_sample);
 	} else {
@@ -715,6 +721,11 @@ void MainBar::on_device_changed()
 	update_device_config_widgets();
 }
 
+void MainBar::on_capture_state_changed(int state)
+{
+	set_capture_state((pv::Session::capture_state)state);
+}
+
 void MainBar::on_sample_count_changed()
 {
 	if (!updating_sample_count_)