X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Fflag.cpp;h=95cee716de453e6e288a4b1a2b1cce807b52ee88;hb=efdec55aec1a137460fa362a381ed1904182bfed;hp=81cfae873eb82365f355b109c15cc54b0d390e4a;hpb=97430d7726c69e1710aef223c39c760c79721ff5;p=pulseview.git
diff --git a/pv/view/flag.cpp b/pv/view/flag.cpp
index 81cfae8..95cee71 100644
--- a/pv/view/flag.cpp
+++ b/pv/view/flag.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 "timemarker.hpp"
@@ -26,18 +25,19 @@
#include
#include
-#include
+#include
#include
using std::shared_ptr;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QColor Flag::FillColour(0x73, 0xD2, 0x16);
-Flag::Flag(View &view, double time, const QString &text) :
+Flag::Flag(View &view, const pv::util::Timestamp& time, const QString &text) :
TimeMarker(view, FillColour, time),
text_(text)
{
@@ -45,7 +45,7 @@ Flag::Flag(View &view, double time, const QString &text) :
Flag::Flag(const Flag &flag) :
TimeMarker(flag.view_, FillColour, flag.time_),
- std::enable_shared_from_this(flag)
+ std::enable_shared_from_this(flag)
{
}
@@ -61,7 +61,12 @@ QString Flag::get_text() const
pv::widgets::Popup* Flag::create_popup(QWidget *parent)
{
- pv::widgets::Popup *const popup = TimeMarker::create_popup(parent);
+ using pv::widgets::Popup;
+
+ Popup *const popup = TimeMarker::create_popup(parent);
+ popup->set_position(parent->mapToGlobal(
+ point(parent->rect())), Popup::Bottom);
+
QFormLayout *const form = (QFormLayout*)popup->layout();
QLineEdit *const text_edit = new QLineEdit(popup);
@@ -103,5 +108,6 @@ void Flag::on_text_changed(const QString &text)
view_.time_item_appearance_changed(true, false);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv