projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rework new segment notification mechanism
[pulseview.git]
/
pv
/
views
/
trace
/
standardbar.hpp
diff --git
a/pv/views/trace/standardbar.hpp
b/pv/views/trace/standardbar.hpp
index e41beebc79448d41ccfed7927b33ee5c2e5214fc..8640b4c9520ae01b0f41a2721a8cd4da8261a13a 100644
(file)
--- a/
pv/views/trace/standardbar.hpp
+++ b/
pv/views/trace/standardbar.hpp
@@
-15,16
+15,16
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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/>.
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACE_STANDARDBAR_HPP
#define PULSEVIEW_PV_VIEWS_TRACE_STANDARDBAR_HPP
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACE_STANDARDBAR_HPP
#define PULSEVIEW_PV_VIEWS_TRACE_STANDARDBAR_HPP
-#include <
stdint.h
>
+#include <
cstdint
>
#include <QAction>
#include <QAction>
+#include <QSpinBox>
#include <QToolBar>
#include <QWidget>
#include <QToolBar>
#include <QWidget>
@@
-37,7
+37,7
@@
class Session;
namespace views {
namespace views {
-namespace
TraceView
{
+namespace
trace
{
class View;
}
class View;
}
@@
-49,9
+49,9
@@
class StandardBar : public QToolBar
public:
StandardBar(Session &session, QWidget *parent,
public:
StandardBar(Session &session, QWidget *parent,
-
TraceView::View *view, bool add_default_widgets=
true);
+
trace::View *view, bool add_default_widgets =
true);
- Session &session(
void
) const;
+ Session &session() const;
QAction* action_view_zoom_in() const;
QAction* action_view_zoom_out() const;
QAction* action_view_zoom_in() const;
QAction* action_view_zoom_out() const;
@@
-62,8
+62,10
@@
public:
protected:
virtual void add_toolbar_widgets();
protected:
virtual void add_toolbar_widgets();
+ virtual void show_multi_segment_ui(const bool state);
+
Session &session_;
Session &session_;
-
TraceView
::View *view_;
+
trace
::View *view_;
QAction *const action_view_zoom_in_;
QAction *const action_view_zoom_out_;
QAction *const action_view_zoom_in_;
QAction *const action_view_zoom_out_;
@@
-71,18
+73,25
@@
protected:
QAction *const action_view_zoom_one_to_one_;
QAction *const action_view_show_cursors_;
QAction *const action_view_zoom_one_to_one_;
QAction *const action_view_show_cursors_;
+ QSpinBox *segment_selector_;
+
protected Q_SLOTS:
void on_actionViewZoomIn_triggered();
void on_actionViewZoomOut_triggered();
protected Q_SLOTS:
void on_actionViewZoomIn_triggered();
void on_actionViewZoomOut_triggered();
- void on_actionViewZoomFit_triggered();
+ void on_actionViewZoomFit_triggered(
bool checked
);
void on_actionViewZoomOneToOne_triggered();
void on_actionViewShowCursors_triggered();
void on_always_zoom_to_fit_changed(bool state);
void on_actionViewZoomOneToOne_triggered();
void on_actionViewShowCursors_triggered();
void on_always_zoom_to_fit_changed(bool state);
+
+ void on_new_segment(int new_segment_id);
+
+private:
+ vector<QAction*> multi_segment_actions_;
};
} // namespace trace
};
} // namespace trace