Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tree view again #226

Merged
merged 12 commits into from
Nov 9, 2019
Merged

Tree view again #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ece6b8b
WIP
facontidavide Nov 3, 2019
1f8eac1
WIP
facontidavide Nov 8, 2019
0513a16
WIP
facontidavide Nov 9, 2019
7ff00d2
WIP
facontidavide Nov 9, 2019
9441eed
custom seems to work
facontidavide Nov 9, 2019
c1ad9b0
WIP
facontidavide Nov 9, 2019
c8e30e5
WIP
facontidavide Nov 9, 2019
5b002c4
crash fixed
facontidavide Nov 9, 2019
8d1aa7c
WIP
facontidavide Nov 9, 2019
5ff9067
right value works
facontidavide Nov 9, 2019
6dfdb1a
done?
facontidavide Nov 9, 2019
076df15
final touch
facontidavide Nov 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions include/PlotJuggler/alphanum.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ namespace doj

@return negative if l<r, 0 if l==r, positive if l>r.
*/
template <>
template <> inline
int alphanum_comp<std::string>(const std::string& l, const std::string& r)
{
#ifdef DOJDEBUG
Expand All @@ -220,7 +220,7 @@ namespace doj

@return negative if l<r, 0 if l==r, positive if l>r.
*/
int alphanum_comp(char* l, char* r)
inline int alphanum_comp(char* l, char* r)
{
assert(l);
assert(r);
Expand All @@ -230,7 +230,7 @@ namespace doj
return alphanum_impl(l, r);
}

int alphanum_comp(const char* l, const char* r)
inline int alphanum_comp(const char* l, const char* r)
{
assert(l);
assert(r);
Expand All @@ -240,7 +240,7 @@ namespace doj
return alphanum_impl(l, r);
}

int alphanum_comp(char* l, const char* r)
inline int alphanum_comp(char* l, const char* r)
{
assert(l);
assert(r);
Expand All @@ -250,7 +250,7 @@ namespace doj
return alphanum_impl(l, r);
}

int alphanum_comp(const char* l, char* r)
inline int alphanum_comp(const char* l, char* r)
{
assert(l);
assert(r);
Expand All @@ -260,7 +260,7 @@ namespace doj
return alphanum_impl(l, r);
}

int alphanum_comp(const std::string& l, char* r)
inline int alphanum_comp(const std::string& l, char* r)
{
assert(r);
#ifdef DOJDEBUG
Expand All @@ -269,7 +269,7 @@ namespace doj
return alphanum_impl(l.c_str(), r);
}

int alphanum_comp(char* l, const std::string& r)
inline int alphanum_comp(char* l, const std::string& r)
{
assert(l);
#ifdef DOJDEBUG
Expand All @@ -278,7 +278,7 @@ namespace doj
return alphanum_impl(l, r.c_str());
}

int alphanum_comp(const std::string& l, const char* r)
inline int alphanum_comp(const std::string& l, const char* r)
{
assert(r);
#ifdef DOJDEBUG
Expand All @@ -287,7 +287,7 @@ namespace doj
return alphanum_impl(l.c_str(), r);
}

int alphanum_comp(const char* l, const std::string& r)
inline int alphanum_comp(const char* l, const std::string& r)
{
assert(l);
#ifdef DOJDEBUG
Expand Down
2 changes: 2 additions & 0 deletions plotter_gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ SET( PLOTTER_SRC
customtracker.cpp
curvecolorpick.cpp
curvelist_panel.cpp
curvelist_view.cpp
curvetree_view.cpp
main.cpp
mainwindow.cpp
menubar.cpp
Expand Down
Loading