projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce ViewBase::is_main_view
[pulseview.git]
/
pv
/
view
/
flag.cpp
diff --git
a/pv/view/flag.cpp
b/pv/view/flag.cpp
index 01d13670a70b87fbbb2042dcbb70c9278724e749..95cee716de453e6e288a4b1a2b1cce807b52ee88 100644
(file)
--- 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
* 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"
*/
#include "timemarker.hpp"
@@
-26,18
+25,19
@@
#include <QLineEdit>
#include <QMenu>
#include <QLineEdit>
#include <QMenu>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include <pv/widgets/popup.hpp>
using std::shared_ptr;
namespace pv {
#include <pv/widgets/popup.hpp>
using std::shared_ptr;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QColor Flag::FillColour(0x73, 0xD2, 0x16);
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)
{
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_),
Flag::Flag(const Flag &flag) :
TimeMarker(flag.view_, FillColour, flag.time_),
- std::enable_shared_from_this<
pv::view::
Flag>(flag)
+ std::enable_shared_from_this<Flag>(flag)
{
}
{
}
@@
-108,5
+108,6
@@
void Flag::on_text_changed(const QString &text)
view_.time_item_appearance_changed(true, false);
}
view_.time_item_appearance_changed(true, false);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv