projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch segment storage from single vector to vector of arrays
[pulseview.git]
/
pv
/
view
/
flag.hpp
diff --git
a/pv/view/flag.hpp
b/pv/view/flag.hpp
index fdebe1c0a6b4139b9675aa57c1771ed151fc7041..092a4b5a05966e7ec30126cd278fac9e99617d14 100644
(file)
--- a/
pv/view/flag.hpp
+++ b/
pv/view/flag.hpp
@@
-14,22
+14,24
@@
* 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_VIEW
_FLAG_H
-#define PULSEVIEW_PV_VIEW
_FLAG_H
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW_FLAG_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW_FLAG_HPP
#include <memory>
#include "timemarker.hpp"
#include <memory>
#include "timemarker.hpp"
+class QMenu;
+
namespace pv {
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class Flag : public TimeMarker,
class Flag : public TimeMarker,
- public std::enable_shared_from_this<
pv::view::
Flag>
+ public std::enable_shared_from_this<Flag>
{
Q_OBJECT
{
Q_OBJECT
@@
-43,7
+45,7
@@
public:
* @param time The time to set the flag to.
* @param text The text of the marker.
*/
* @param time The time to set the flag to.
* @param text The text of the marker.
*/
- Flag(View &view,
double
time, const QString &text);
+ Flag(View &view,
const pv::util::Timestamp&
time, const QString &text);
/**
* Copy constructor.
/**
* Copy constructor.
@@
-62,16
+64,21
@@
public:
pv::widgets::Popup* create_popup(QWidget *parent);
pv::widgets::Popup* create_popup(QWidget *parent);
+ QMenu* create_context_menu(QWidget *parent);
+
void delete_pressed();
private Q_SLOTS:
void delete_pressed();
private Q_SLOTS:
+ void on_delete();
+
void on_text_changed(const QString &text);
private:
QString text_;
};
void on_text_changed(const QString &text);
private:
QString text_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW
_FLAG_H
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW_FLAG_HPP