From: Uwe Hermann Date: Wed, 4 Nov 2015 22:53:59 +0000 (+0100) Subject: Minor whitespace cosmetics. X-Git-Tag: pulseview-0.3.0~50 X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=3d79f521396c8e908fd237f5328153165099f5c3 Minor whitespace cosmetics. --- diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp index 30e4e67d..d43f89a9 100644 --- a/pv/data/logicsegment.cpp +++ b/pv/data/logicsegment.cpp @@ -47,7 +47,7 @@ const float LogicSegment::LogMipMapScaleFactor = logf(MipMapScaleFactor); const uint64_t LogicSegment::MipMapDataUnit = 64*1024; // bytes LogicSegment::LogicSegment(shared_ptr logic, uint64_t samplerate, - const uint64_t expected_num_samples) : + const uint64_t expected_num_samples) : Segment(samplerate, logic->unit_size()), last_append_sample_(0) { diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp index 4fcbf694..5baedcbc 100644 --- a/pv/dialogs/connect.cpp +++ b/pv/dialogs/connect.cpp @@ -108,7 +108,7 @@ void Connect::populate_drivers() */ bool supported_device = driver->config_check( ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) | - driver->config_check( + driver->config_check( ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS); if (supported_device) diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 8006b65d..ee2227d5 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -251,9 +251,9 @@ void MainWindow::export_file(shared_ptr format, const pv::util::Timestamp& end_time = view_->cursors()->second()->time(); const uint64_t start_sample = start_time.convert_to() * samplerate; - const uint64_t end_sample = end_time.convert_to() * samplerate; + const uint64_t end_sample = end_time.convert_to() * samplerate; - sample_range = std::make_pair(start_sample, end_sample); + sample_range = std::make_pair(start_sample, end_sample); } else { sample_range = std::make_pair(0, 0); } diff --git a/pv/storesession.cpp b/pv/storesession.cpp index 309fa1b3..5500292a 100644 --- a/pv/storesession.cpp +++ b/pv/storesession.cpp @@ -202,7 +202,7 @@ void StoreSession::store_proc(shared_ptr segment) const int unit_size = segment->unit_size(); assert(unit_size != 0); - // Qt needs the progress values to fit inside an int. If they would + // Qt needs the progress values to fit inside an int. If they would // not, scale the current and max values down until they do. while ((sample_count_ >> progress_scale) > INT_MAX) progress_scale ++; diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index 393af577..601e73b1 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -35,10 +35,10 @@ using std::vector; namespace pv { namespace view { -const float Ruler::RulerHeight = 2.5f; // x Text Height +const float Ruler::RulerHeight = 2.5f; // x Text Height const int Ruler::MinorTickSubdivision = 4; -const float Ruler::HoverArrowSize = 0.5f; // x Text Height +const float Ruler::HoverArrowSize = 0.5f; // x Text Height Ruler::Ruler(View &parent) : MarginWidget(parent) diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp index 140b8518..9c1d49ff 100644 --- a/pv/view/tracegroup.cpp +++ b/pv/view/tracegroup.cpp @@ -164,7 +164,7 @@ void TraceGroup::restack_items() [](const shared_ptr &a, const shared_ptr &b) { const auto aext = a->v_extents(); const auto bext = b->v_extents(); - return a->layout_v_offset() + + return a->layout_v_offset() + (aext.first + aext.second) / 2 < b->layout_v_offset() + (bext.first + bext.second) / 2; diff --git a/pv/widgets/hidingmenubar.cpp b/pv/widgets/hidingmenubar.cpp index dcc8fde5..0da364b1 100644 --- a/pv/widgets/hidingmenubar.cpp +++ b/pv/widgets/hidingmenubar.cpp @@ -52,5 +52,5 @@ void HidingMenuBar::item_triggered() setHidden(true); } -} // namespace widgets -} // namespace pv +} // namespace widgets +} // namespace pv