Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
bc947761
Commit
bc947761
authored
Dec 18, 2018
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Fixed xtt_fast, xtt_sevhist and xtt_trend destructors.
parent
6a4c3e62
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
17 deletions
+20
-17
xtt/lib/ge/src/ge_curve.cpp
xtt/lib/ge/src/ge_curve.cpp
+1
-3
xtt/lib/ge/src/ge_curve.h
xtt/lib/ge/src/ge_curve.h
+1
-1
xtt/lib/xtt/qt/xtt_fast_qt.cpp
xtt/lib/xtt/qt/xtt_fast_qt.cpp
+7
-7
xtt/lib/xtt/qt/xtt_sevhist_qt.cpp
xtt/lib/xtt/qt/xtt_sevhist_qt.cpp
+8
-5
xtt/lib/xtt/qt/xtt_trend_qt.cpp
xtt/lib/xtt/qt/xtt_trend_qt.cpp
+3
-1
No files found.
xtt/lib/ge/src/ge_curve.cpp
View file @
bc947761
...
@@ -1358,9 +1358,7 @@ int GeCurve::configure_axes()
...
@@ -1358,9 +1358,7 @@ int GeCurve::configure_axes()
grow_ResetNodraw
(
growaxis_ctx
);
grow_ResetNodraw
(
growaxis_ctx
);
grow_Redraw
(
growaxis_ctx
);
grow_Redraw
(
growaxis_ctx
);
if
(
cd
->
x_data
[
0
])
{
update_times_markers
();
update_times_markers
();
}
return
1
;
return
1
;
}
}
...
...
xtt/lib/ge/src/ge_curve.h
View file @
bc947761
...
@@ -182,7 +182,7 @@ public:
...
@@ -182,7 +182,7 @@ public:
grow_tObject
curve_axisobject
;
grow_tObject
curve_axisobject
;
grow_tObject
curve_markobject1
;
grow_tObject
curve_markobject1
;
grow_tObject
curve_markobject2
;
grow_tObject
curve_markobject2
;
GeCurveData
*
cd
;
GeCurveData
*
cd
=
NULL
;
grow_tObject
mark1_text
;
grow_tObject
mark1_text
;
grow_tObject
mark2_text
;
grow_tObject
mark2_text
;
grow_tObject
mark1_rect
;
grow_tObject
mark1_rect
;
...
...
xtt/lib/xtt/qt/xtt_fast_qt.cpp
View file @
bc947761
...
@@ -53,14 +53,13 @@ XttFastQt::XttFastQt(void* parent_ctx, QWidget* parent_wid, char* name,
...
@@ -53,14 +53,13 @@ XttFastQt::XttFastQt(void* parent_ctx, QWidget* parent_wid, char* name,
unsigned
int
options
,
int
xn_color_theme
,
void
*
basewidget
,
int
*
sts
)
unsigned
int
options
,
int
xn_color_theme
,
void
*
basewidget
,
int
*
sts
)
:
XttFast
(
parent_ctx
,
name
,
fast_arp
,
xn_color_theme
,
sts
)
:
XttFast
(
parent_ctx
,
name
,
fast_arp
,
xn_color_theme
,
sts
)
{
{
char
title
[
250
];
if
(
EVEN
(
*
sts
))
{
if
(
EVEN
(
*
sts
))
{
// Error from XttFast constructor
return
;
return
;
}
}
*
sts
=
XNAV__SUCCESS
;
*
sts
=
XNAV__SUCCESS
;
char
title
[
250
];
if
(
!
streq
(
name
,
""
))
{
if
(
!
streq
(
name
,
""
))
{
strncpy
(
title
,
name
,
sizeof
(
title
));
strncpy
(
title
,
name
,
sizeof
(
title
));
}
else
{
}
else
{
...
@@ -88,10 +87,9 @@ XttFastQt::XttFastQt(void* parent_ctx, QWidget* parent_wid, const char* name,
...
@@ -88,10 +87,9 @@ XttFastQt::XttFastQt(void* parent_ctx, QWidget* parent_wid, const char* name,
strncpy
(
title
,
filename
,
sizeof
(
title
));
strncpy
(
title
,
filename
,
sizeof
(
title
));
if
(
EVEN
(
*
sts
))
{
if
(
EVEN
(
*
sts
))
{
// Error from XttFast
// Error from XttFast
constructor
return
;
return
;
}
}
*
sts
=
XNAV__SUCCESS
;
*
sts
=
XNAV__SUCCESS
;
curve
=
new
GeCurveQt
(
curve
=
new
GeCurveQt
(
...
@@ -108,15 +106,17 @@ XttFastQt::XttFastQt(void* parent_ctx, QWidget* parent_wid, const char* name,
...
@@ -108,15 +106,17 @@ XttFastQt::XttFastQt(void* parent_ctx, QWidget* parent_wid, const char* name,
XttFastQt
::~
XttFastQt
()
XttFastQt
::~
XttFastQt
()
{
{
debug_print
(
"XttFastQt::~XttFastQt
\n
"
);
if
(
timerid
)
{
if
(
timerid
)
{
timerid
->
remove
();
timerid
->
remove
();
}
}
for
(
int
i
=
0
;
i
<
fast_cnt
;
i
++
)
{
for
(
int
i
=
0
;
i
<
fast_cnt
;
i
++
)
{
gdh_UnrefObjectInfo
(
new_subid
);
gdh_UnrefObjectInfo
(
new_subid
);
}
}
if
(
curve
)
{
delete
curve
;
}
if
(
gcd
)
{
if
(
gcd
)
{
delete
gcd
;
delete
gcd
;
}
}
delete
wow
;
}
}
\ No newline at end of file
xtt/lib/xtt/qt/xtt_sevhist_qt.cpp
View file @
bc947761
...
@@ -58,10 +58,9 @@ XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
...
@@ -58,10 +58,9 @@ XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
strncpy
(
title
,
name
,
sizeof
(
title
));
strncpy
(
title
,
name
,
sizeof
(
title
));
if
(
EVEN
(
*
sts
))
{
if
(
EVEN
(
*
sts
))
{
// Error from XttSevHist
// Error from XttSevHist
constructor
return
;
return
;
}
}
*
sts
=
XNAV__SUCCESS
;
*
sts
=
XNAV__SUCCESS
;
curve
=
new
GeCurveQt
(
this
,
parent_wid
,
title
,
NULL
,
gcd
,
1
,
xn_width
,
curve
=
new
GeCurveQt
(
this
,
parent_wid
,
title
,
NULL
,
gcd
,
1
,
xn_width
,
...
@@ -104,10 +103,9 @@ XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
...
@@ -104,10 +103,9 @@ XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
strncpy
(
title
,
name
,
sizeof
(
title
));
strncpy
(
title
,
name
,
sizeof
(
title
));
if
(
EVEN
(
*
sts
))
{
if
(
EVEN
(
*
sts
))
{
// Error from XttSevHist
// Error from XttSevHist
constructor
return
;
return
;
}
}
*
sts
=
XNAV__SUCCESS
;
*
sts
=
XNAV__SUCCESS
;
curve
=
new
GeCurveQt
(
curve
=
new
GeCurveQt
(
...
@@ -124,16 +122,21 @@ XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
...
@@ -124,16 +122,21 @@ XttSevHistQt::XttSevHistQt(void* parent_ctx, QWidget* x_parent_wid,
XttSevHistQt
::~
XttSevHistQt
()
XttSevHistQt
::~
XttSevHistQt
()
{
{
debug_print
(
"XttSevHistQt::~XttSevHistQt
\n
"
);
if
(
otree
)
{
if
(
otree
)
{
delete
otree
;
delete
otree
;
}
}
if
(
timerid
)
{
if
(
timerid
)
{
timerid
->
remove
();
timerid
->
remove
();
}
}
if
(
curve
)
{
delete
curve
;
}
if
(
gcd
)
{
if
(
gcd
)
{
delete
gcd
;
delete
gcd
;
}
}
if
(
wow
)
{
delete
wow
;
}
}
}
XttOTree
*
XttSevHistQt
::
tree_new
(
const
char
*
title
,
pwr_tAttrRef
*
itemlist
,
XttOTree
*
XttSevHistQt
::
tree_new
(
const
char
*
title
,
pwr_tAttrRef
*
itemlist
,
...
...
xtt/lib/xtt/qt/xtt_trend_qt.cpp
View file @
bc947761
...
@@ -58,6 +58,7 @@ XttTrendQt::XttTrendQt(void* parent_ctx, QWidget* x_parent_wid, char* name,
...
@@ -58,6 +58,7 @@ XttTrendQt::XttTrendQt(void* parent_ctx, QWidget* x_parent_wid, char* name,
parent_wid
(
x_parent_wid
)
parent_wid
(
x_parent_wid
)
{
{
if
(
EVEN
(
*
sts
))
{
if
(
EVEN
(
*
sts
))
{
// Error from XttTrend constructor
return
;
return
;
}
}
*
sts
=
XNAV__SUCCESS
;
*
sts
=
XNAV__SUCCESS
;
...
@@ -88,7 +89,6 @@ XttTrendQt::XttTrendQt(void* parent_ctx, QWidget* x_parent_wid, char* name,
...
@@ -88,7 +89,6 @@ XttTrendQt::XttTrendQt(void* parent_ctx, QWidget* x_parent_wid, char* name,
XttTrendQt
::~
XttTrendQt
()
XttTrendQt
::~
XttTrendQt
()
{
{
debug_print
(
"XttTrendQt::~XttTrendQt
\n
"
);
if
(
timerid
)
{
if
(
timerid
)
{
timerid
->
remove
();
timerid
->
remove
();
}
}
...
@@ -96,12 +96,14 @@ XttTrendQt::~XttTrendQt()
...
@@ -96,12 +96,14 @@ XttTrendQt::~XttTrendQt()
for
(
int
i
=
0
;
i
<
trend_cnt
;
i
++
)
{
for
(
int
i
=
0
;
i
<
trend_cnt
;
i
++
)
{
gdh_UnrefObjectInfo
(
subid
[
i
]);
gdh_UnrefObjectInfo
(
subid
[
i
]);
}
}
delete
curve
;
if
(
gcd
)
{
if
(
gcd
)
{
delete
gcd
;
delete
gcd
;
}
}
if
(
otree
)
{
if
(
otree
)
{
delete
otree
;
delete
otree
;
}
}
delete
wow
;
}
}
XttOTree
*
XttTrendQt
::
tree_new
(
const
char
*
title
,
pwr_tAttrRef
*
itemlist
,
XttOTree
*
XttTrendQt
::
tree_new
(
const
char
*
title
,
pwr_tAttrRef
*
itemlist
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment