X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=712244a9df8cc9a4399d80217ac413467abd0f5d;hb=d8d053b6e51abf651ca31d0d4822035c06fb7f9b;hp=393af57711c699732c84cfd05c1ee9933dff0f6d;hpb=7c6cbdda4d7beaaf41c752826091b407a203df51;p=pulseview.git
diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 393af57..712244a 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.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 .
*/
#include
@@ -29,16 +28,18 @@
using namespace Qt;
+using std::function;
using std::shared_ptr;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-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)
@@ -70,7 +71,7 @@ QSize Ruler::sizeHint() const
QSize Ruler::extended_size_hint() const
{
QRectF max_rect;
- std::vector< std::shared_ptr > items(view_.time_items());
+ vector< shared_ptr > items(view_.time_items());
for (auto &i : items)
max_rect = max_rect.united(i->label_rect(QRect()));
return QSize(0, sizeHint().height() - max_rect.top() / 2 +
@@ -128,8 +129,7 @@ shared_ptr Ruler::get_mouse_over_item(const QPoint &pt)
void Ruler::paintEvent(QPaintEvent*)
{
if (!tick_position_cache_) {
- auto ffunc = [this](const pv::util::Timestamp& t)
- {
+ auto ffunc = [this](const pv::util::Timestamp& t) {
return format_time_with_distance(
this->view_.tick_period(),
t,
@@ -194,7 +194,7 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
const pv::util::Timestamp& offset,
const double scale,
const int width,
- std::function format_function)
+ function format_function)
{
TickPositions tp;
@@ -226,9 +226,9 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
return tp;
}
-void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
+void Ruler::mouseDoubleClickEvent(QMouseEvent *event)
{
- view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
+ view_.add_flag(view_.offset() + ((double)event->x() + 0.5) * view_.scale());
}
void Ruler::draw_hover_mark(QPainter &p, int text_height)
@@ -272,5 +272,6 @@ void Ruler::resizeEvent(QResizeEvent*)
invalidate_tick_position_cache();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv