X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fflag.cpp;h=662a6d02d56df89ada5671e4d4b62fe61c8da967;hp=81cfae873eb82365f355b109c15cc54b0d390e4a;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=97430d7726c69e1710aef223c39c760c79721ff5

diff --git a/pv/view/flag.cpp b/pv/view/flag.cpp
index 81cfae8..662a6d0 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 <http://www.gnu.org/licenses/>.
  */
 
 #include "timemarker.hpp"
@@ -26,18 +25,20 @@
 #include <QLineEdit>
 #include <QMenu>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <pv/widgets/popup.hpp>
 
+using std::enable_shared_from_this;
 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 +46,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<pv::view::Flag>(flag)
+	enable_shared_from_this<Flag>(flag)
 {
 }
 
@@ -61,7 +62,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 +109,6 @@ void Flag::on_text_changed(const QString &text)
 	view_.time_item_appearance_changed(true, false);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv