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
54727a8e
Commit
54727a8e
authored
Feb 24, 2010
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
valgrind check modifications
parent
d0182d42
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
58 additions
and
7 deletions
+58
-7
xtt/exe/rt_xtt/gtk/rt_xtt_gtk.cpp
xtt/exe/rt_xtt/gtk/rt_xtt_gtk.cpp
+2
-0
xtt/lib/flow/gtk/flow_draw_gtk.cpp
xtt/lib/flow/gtk/flow_draw_gtk.cpp
+2
-0
xtt/lib/flow/src/flow_array.cpp
xtt/lib/flow/src/flow_array.cpp
+2
-1
xtt/lib/flow/src/flow_ctx.cpp
xtt/lib/flow/src/flow_ctx.cpp
+16
-0
xtt/lib/flow/src/flow_node.cpp
xtt/lib/flow/src/flow_node.cpp
+2
-0
xtt/lib/ge/src/ge_graph.cpp
xtt/lib/ge/src/ge_graph.cpp
+3
-1
xtt/lib/glow/gtk/glow_draw_gtk.cpp
xtt/lib/glow/gtk/glow_draw_gtk.cpp
+6
-0
xtt/lib/glow/src/glow_array.cpp
xtt/lib/glow/src/glow_array.cpp
+2
-1
xtt/lib/glow/src/glow_grownode.cpp
xtt/lib/glow/src/glow_grownode.cpp
+4
-0
xtt/lib/glow/src/glow_growtrend.cpp
xtt/lib/glow/src/glow_growtrend.cpp
+4
-3
xtt/lib/glow/src/glow_polyline.cpp
xtt/lib/glow/src/glow_polyline.cpp
+2
-0
xtt/lib/xtt/gtk/xtt_trace_gtk.cpp
xtt/lib/xtt/gtk/xtt_trace_gtk.cpp
+5
-0
xtt/lib/xtt/src/xtt_trace.cpp
xtt/lib/xtt/src/xtt_trace.cpp
+1
-1
xtt/lib/xtt/src/xtt_xnav_command.cpp
xtt/lib/xtt/src/xtt_xnav_command.cpp
+7
-0
No files found.
xtt/exe/rt_xtt/gtk/rt_xtt_gtk.cpp
View file @
54727a8e
...
@@ -501,6 +501,7 @@ void XttGtk::activate_india_ok( GtkWidget *w, gpointer data)
...
@@ -501,6 +501,7 @@ void XttGtk::activate_india_ok( GtkWidget *w, gpointer data)
g_object_set
(
((
XttGtk
*
)
xtt
)
->
india_widget
,
"visible"
,
FALSE
,
NULL
);
g_object_set
(
((
XttGtk
*
)
xtt
)
->
india_widget
,
"visible"
,
FALSE
,
NULL
);
(
xtt
->
india_ok_cb
)(
xtt
,
text
);
(
xtt
->
india_ok_cb
)(
xtt
,
text
);
g_free
(
text
);
}
}
void
XttGtk
::
activate_india_cancel
(
GtkWidget
*
w
,
gpointer
data
)
void
XttGtk
::
activate_india_cancel
(
GtkWidget
*
w
,
gpointer
data
)
{
{
...
@@ -549,6 +550,7 @@ void XttGtk::valchanged_cmd_input( GtkWidget *w, gpointer data)
...
@@ -549,6 +550,7 @@ void XttGtk::valchanged_cmd_input( GtkWidget *w, gpointer data)
xtt
->
command_open
=
0
;
xtt
->
command_open
=
0
;
xtt
->
xnav
->
set_inputfocus
();
xtt
->
xnav
->
set_inputfocus
();
}
}
g_free
(
text
);
}
}
int
main
(
int
argc
,
char
*
argv
[])
int
main
(
int
argc
,
char
*
argv
[])
...
...
xtt/lib/flow/gtk/flow_draw_gtk.cpp
View file @
54727a8e
...
@@ -143,6 +143,8 @@ static int flow_create_gc( FlowDrawGtk *draw_ctx, GdkWindow *window)
...
@@ -143,6 +143,8 @@ static int flow_create_gc( FlowDrawGtk *draw_ctx, GdkWindow *window)
GdkGCValues
xgcv
;
GdkGCValues
xgcv
;
int
i
;
int
i
;
memset
(
&
xgcv
,
0
,
sizeof
(
xgcv
));
/* Inverse gc */
/* Inverse gc */
xgcv
.
background
=
draw_ctx
->
foreground
;
xgcv
.
background
=
draw_ctx
->
foreground
;
xgcv
.
foreground
=
draw_ctx
->
background
;
xgcv
.
foreground
=
draw_ctx
->
background
;
...
...
xtt/lib/flow/src/flow_array.cpp
View file @
54727a8e
...
@@ -341,6 +341,7 @@ void FlowArray::remove( FlowArrayElem *element)
...
@@ -341,6 +341,7 @@ void FlowArray::remove( FlowArrayElem *element)
{
{
if
(
*
(
a
+
i
)
==
element
)
if
(
*
(
a
+
i
)
==
element
)
{
{
if
(
a_size
-
i
-
1
>
0
)
memcpy
(
a
+
i
,
a
+
i
+
1
,
(
a_size
-
i
-
1
)
*
sizeof
(
*
a
));
memcpy
(
a
+
i
,
a
+
i
+
1
,
(
a_size
-
i
-
1
)
*
sizeof
(
*
a
));
a_size
--
;
a_size
--
;
return
;
return
;
...
...
xtt/lib/flow/src/flow_ctx.cpp
View file @
54727a8e
...
@@ -92,11 +92,27 @@ FlowCtx::FlowCtx( const char *ctx_name, double zoom_fact, int offs_x, int offs_y
...
@@ -92,11 +92,27 @@ FlowCtx::FlowCtx( const char *ctx_name, double zoom_fact, int offs_x, int offs_y
FlowCtx
::~
FlowCtx
()
FlowCtx
::~
FlowCtx
()
{
{
FlowArrayElem
*
element
;
delete
tiptext
;
delete
tiptext
;
set_nodraw
();
set_nodraw
();
a_sel
.
clear
();
a_sel
.
clear
();
move_clear
();
move_clear
();
paste_clear
();
paste_clear
();
delete_all
();
for
(
int
i
=
0
;
i
<
a_nc
.
a_size
;
i
++
)
{
element
=
a_nc
.
a
[
i
];
a_nc
.
remove
(
element
);
delete
element
;
i
--
;
}
for
(
int
i
=
0
;
i
<
a_cc
.
a_size
;
i
++
)
{
element
=
a_cc
.
a
[
i
];
a_cc
.
remove
(
element
);
delete
element
;
i
--
;
}
}
}
void
FlowCtx
::
delete_all
()
void
FlowCtx
::
delete_all
()
...
...
xtt/lib/flow/src/flow_node.cpp
View file @
54727a8e
...
@@ -84,6 +84,8 @@ FlowNode::~FlowNode()
...
@@ -84,6 +84,8 @@ FlowNode::~FlowNode()
{
{
if
(
annotv_inputmode
[
i
])
if
(
annotv_inputmode
[
i
])
close_annotation_input
(
i
);
close_annotation_input
(
i
);
if
(
annotsize
[
i
]
>
0
)
free
(
annotv
[
i
]);
}
}
ctx
->
object_deleted
(
this
);
ctx
->
object_deleted
(
this
);
if
(
ctx
->
nodraw
)
return
;
if
(
ctx
->
nodraw
)
return
;
...
...
xtt/lib/ge/src/ge_graph.cpp
View file @
54727a8e
...
@@ -157,6 +157,7 @@ Graph::Graph(
...
@@ -157,6 +157,7 @@ Graph::Graph(
grid_size_x
(
1
),
grid_size_y
(
1
),
con_type
(
glow_eConType_Routed
),
grid_size_x
(
1
),
grid_size_y
(
1
),
con_type
(
glow_eConType_Routed
),
con_corner
(
glow_eCorner_Rounded
),
con_corner
(
glow_eCorner_Rounded
),
conpoint_direction
(
glow_eDirection_Center
),
conpoint_direction
(
glow_eDirection_Center
),
current_polyline
(
0
),
current_slider
(
0
),
trace_started
(
0
),
gdh_init_done
(
xn_gdh_init_done
),
arglist_cnt
(
0
),
trace_started
(
0
),
gdh_init_done
(
xn_gdh_init_done
),
arglist_cnt
(
0
),
corner_round_amount
(
0.5
),
mode
(
graph_mode
),
scan_time
(
0.5
),
corner_round_amount
(
0.5
),
mode
(
graph_mode
),
scan_time
(
0.5
),
fast_scan_time
(
0.5
),
animation_scan_time
(
0.5
),
closing_down
(
0
),
fast_scan_time
(
0.5
),
animation_scan_time
(
0.5
),
closing_down
(
0
),
...
@@ -4782,6 +4783,7 @@ void Graph::swap( int mode)
...
@@ -4782,6 +4783,7 @@ void Graph::swap( int mode)
static
void
graph_free_dyn
(
grow_tObject
object
)
static
void
graph_free_dyn
(
grow_tObject
object
)
{
{
if
(
grow_GetObjectType
(
object
)
==
glow_eObjectType_GrowNode
||
if
(
grow_GetObjectType
(
object
)
==
glow_eObjectType_GrowNode
||
grow_GetObjectType
(
object
)
==
glow_eObjectType_GrowSlider
||
grow_GetObjectType
(
object
)
==
glow_eObjectType_GrowGroup
||
grow_GetObjectType
(
object
)
==
glow_eObjectType_GrowGroup
||
grow_GetObjectType
(
object
)
==
glow_eObjectType_GrowWindow
||
grow_GetObjectType
(
object
)
==
glow_eObjectType_GrowWindow
||
grow_GetObjectType
(
object
)
==
glow_eObjectType_GrowTrend
||
grow_GetObjectType
(
object
)
==
glow_eObjectType_GrowTrend
||
...
...
xtt/lib/glow/gtk/glow_draw_gtk.cpp
View file @
54727a8e
...
@@ -281,6 +281,8 @@ static int glow_create_gc( GlowDrawGtk *draw_ctx, GdkWindow *window)
...
@@ -281,6 +281,8 @@ static int glow_create_gc( GlowDrawGtk *draw_ctx, GdkWindow *window)
draw_sColor
*
color_array
,
*
color_p
;
draw_sColor
*
color_array
,
*
color_p
;
int
size
,
sts
;
int
size
,
sts
;
memset
(
&
xgcv
,
0
,
sizeof
(
xgcv
));
/* Inverse gc */
/* Inverse gc */
xgcv
.
background
=
glow_allocate_named_color
(
draw_ctx
,
"black"
);
xgcv
.
background
=
glow_allocate_named_color
(
draw_ctx
,
"black"
);
xgcv
.
foreground
=
draw_ctx
->
background
;
xgcv
.
foreground
=
draw_ctx
->
background
;
...
@@ -3184,6 +3186,7 @@ int GlowDrawGtk::gradient_fill_rect( GlowWind *wind, int x, int y, int w, int h,
...
@@ -3184,6 +3186,7 @@ int GlowDrawGtk::gradient_fill_rect( GlowWind *wind, int x, int y, int w, int h,
if
(
ww
->
clip_on
)
if
(
ww
->
clip_on
)
reset_cairo_clip
(
ww
,
cr
);
reset_cairo_clip
(
ww
,
cr
);
cairo_pattern_destroy
(
pat
);
cairo_destroy
(
cr
);
cairo_destroy
(
cr
);
}
}
return
1
;
return
1
;
...
@@ -3238,6 +3241,7 @@ int GlowDrawGtk::gradient_fill_rectrounded( GlowWind *wind, int x, int y, int w,
...
@@ -3238,6 +3241,7 @@ int GlowDrawGtk::gradient_fill_rectrounded( GlowWind *wind, int x, int y, int w,
if
(
ww
->
clip_on
)
if
(
ww
->
clip_on
)
reset_cairo_clip
(
ww
,
cr
);
reset_cairo_clip
(
ww
,
cr
);
cairo_pattern_destroy
(
pat
);
cairo_destroy
(
cr
);
cairo_destroy
(
cr
);
}
}
return
1
;
return
1
;
...
@@ -3292,6 +3296,7 @@ int GlowDrawGtk::gradient_fill_arc( GlowWind *wind, int x, int y, int w, int h,
...
@@ -3292,6 +3296,7 @@ int GlowDrawGtk::gradient_fill_arc( GlowWind *wind, int x, int y, int w, int h,
if
(
ww
->
clip_on
)
if
(
ww
->
clip_on
)
reset_cairo_clip
(
ww
,
cr
);
reset_cairo_clip
(
ww
,
cr
);
cairo_pattern_destroy
(
pat
);
cairo_destroy
(
cr
);
cairo_destroy
(
cr
);
}
}
return
1
;
return
1
;
...
@@ -3348,6 +3353,7 @@ int GlowDrawGtk::gradient_fill_polyline( GlowWind *wind, glow_sPointX *points, i
...
@@ -3348,6 +3353,7 @@ int GlowDrawGtk::gradient_fill_polyline( GlowWind *wind, glow_sPointX *points, i
if
(
ww
->
clip_on
)
if
(
ww
->
clip_on
)
reset_cairo_clip
(
ww
,
cr
);
reset_cairo_clip
(
ww
,
cr
);
cairo_pattern_destroy
(
pat
);
cairo_destroy
(
cr
);
cairo_destroy
(
cr
);
}
}
...
...
xtt/lib/glow/src/glow_array.cpp
View file @
54727a8e
...
@@ -653,6 +653,7 @@ void GlowArray::remove( GlowArrayElem *element)
...
@@ -653,6 +653,7 @@ void GlowArray::remove( GlowArrayElem *element)
{
{
if
(
*
(
a
+
i
)
==
element
)
if
(
*
(
a
+
i
)
==
element
)
{
{
if
(
a_size
-
i
-
1
>
0
)
memcpy
(
a
+
i
,
a
+
i
+
1
,
(
a_size
-
i
-
1
)
*
sizeof
(
*
a
));
memcpy
(
a
+
i
,
a
+
i
+
1
,
(
a_size
-
i
-
1
)
*
sizeof
(
*
a
));
a_size
--
;
a_size
--
;
return
;
return
;
...
...
xtt/lib/glow/src/glow_grownode.cpp
View file @
54727a8e
...
@@ -84,6 +84,10 @@ GrowNode::~GrowNode()
...
@@ -84,6 +84,10 @@ GrowNode::~GrowNode()
if
(
hot
)
if
(
hot
)
ctx
->
gdraw
->
set_cursor
(
&
ctx
->
mw
,
glow_eDrawCursor_Normal
);
ctx
->
gdraw
->
set_cursor
(
&
ctx
->
mw
,
glow_eDrawCursor_Normal
);
// delete nc;
// delete nc;
for
(
int
i
=
0
;
i
<
10
;
i
++
)
{
if
(
annotsize
[
i
]
>
0
)
free
(
annotv
[
i
]);
}
}
}
void
GrowNode
::
copy_from
(
const
GrowNode
&
n
)
void
GrowNode
::
copy_from
(
const
GrowNode
&
n
)
...
...
xtt/lib/glow/src/glow_growtrend.cpp
View file @
54727a8e
...
@@ -78,9 +78,10 @@ GrowTrend::GrowTrend( GrowCtx *glow_ctx, const char *name, double x, double y,
...
@@ -78,9 +78,10 @@ GrowTrend::GrowTrend( GrowCtx *glow_ctx, const char *name, double x, double y,
GrowTrend
::~
GrowTrend
()
GrowTrend
::~
GrowTrend
()
{
{
if
(
ctx
->
nodraw
)
return
;
if
(
!
ctx
->
nodraw
)
{
erase
(
&
ctx
->
mw
);
erase
(
&
ctx
->
mw
);
erase
(
&
ctx
->
navw
);
erase
(
&
ctx
->
navw
);
}
for
(
int
i
=
0
;
i
<
curve_cnt
;
i
++
)
for
(
int
i
=
0
;
i
<
curve_cnt
;
i
++
)
delete
curve
[
i
];
delete
curve
[
i
];
}
}
...
...
xtt/lib/glow/src/glow_polyline.cpp
View file @
54727a8e
...
@@ -118,6 +118,8 @@ void GlowPolyLine::open( ifstream& fp)
...
@@ -118,6 +118,8 @@ void GlowPolyLine::open( ifstream& fp)
if
(
end_found
)
if
(
end_found
)
break
;
break
;
}
}
if
(
points
)
free
((
char
*
)
points
);
points
=
(
glow_sPointX
*
)
calloc
(
a_points
.
a_size
,
sizeof
(
glow_sPointX
));
points
=
(
glow_sPointX
*
)
calloc
(
a_points
.
a_size
,
sizeof
(
glow_sPointX
));
}
}
...
...
xtt/lib/xtt/gtk/xtt_trace_gtk.cpp
View file @
54727a8e
...
@@ -236,6 +236,11 @@ RtTraceGtk::~RtTraceGtk()
...
@@ -236,6 +236,11 @@ RtTraceGtk::~RtTraceGtk()
/* Destroy the widgets */
/* Destroy the widgets */
if
(
toplevel
)
if
(
toplevel
)
gtk_widget_destroy
(
toplevel
);
gtk_widget_destroy
(
toplevel
);
if
(
wow
)
delete
wow
;
if
(
trace_timerid
)
delete
trace_timerid
;
}
}
void
RtTraceGtk
::
pop
()
void
RtTraceGtk
::
pop
()
...
...
xtt/lib/xtt/src/xtt_trace.cpp
View file @
54727a8e
...
@@ -1525,7 +1525,7 @@ RtTrace::RtTrace( void *tr_parent_ctx, pwr_tObjid tr_objid,
...
@@ -1525,7 +1525,7 @@ RtTrace::RtTrace( void *tr_parent_ctx, pwr_tObjid tr_objid,
trace_con_cc
(
0
),
trace_started
(
0
),
trace_timerid
(
0
),
trace_changenode
(
0
),
trace_con_cc
(
0
),
trace_started
(
0
),
trace_timerid
(
0
),
trace_changenode
(
0
),
objid
(
pwr_cNObjid
),
scan_time
(
0.5
),
close_cb
(
0
),
help_cb
(
0
),
subwindow_cb
(
0
),
objid
(
pwr_cNObjid
),
scan_time
(
0.5
),
close_cb
(
0
),
help_cb
(
0
),
subwindow_cb
(
0
),
display_object_cb
(
0
),
collect_insert_cb
(
0
),
is_authorized_cb
(
0
),
popup_menu_cb
(
0
),
display_object_cb
(
0
),
collect_insert_cb
(
0
),
is_authorized_cb
(
0
),
popup_menu_cb
(
0
),
call_method_cb
(
0
),
trace_list
(
0
),
version
(
0
),
m_has_host
(
0
)
call_method_cb
(
0
),
trace_list
(
0
),
version
(
0
),
m_has_host
(
0
)
,
wow
(
0
)
{
{
}
}
#endif
#endif
xtt/lib/xtt/src/xtt_xnav_command.cpp
View file @
54727a8e
...
@@ -2620,6 +2620,7 @@ static int xnav_open_func( void *client_data,
...
@@ -2620,6 +2620,7 @@ static int xnav_open_func( void *client_data,
else
{
else
{
if
(
classgraph
)
{
if
(
classgraph
)
{
// Get file from class of instance object
// Get file from class of instance object
pwr_tAttrRef
aref
;
pwr_tCid
cid
;
pwr_tCid
cid
;
if
(
!
instance_p
)
{
if
(
!
instance_p
)
{
...
@@ -2633,6 +2634,12 @@ static int xnav_open_func( void *client_data,
...
@@ -2633,6 +2634,12 @@ static int xnav_open_func( void *client_data,
return
XNAV__HOLDCOMMAND
;
return
XNAV__HOLDCOMMAND
;
}
}
sts
=
gdh_NameToAttrref
(
pwr_cNObjid
,
instance_p
,
&
aref
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
gdh_GetAttrRefTid
(
&
aref
,
&
cid
);
if
(
EVEN
(
sts
))
return
sts
;
switch
(
cid
)
{
switch
(
cid
)
{
case
pwr_cClass_NMpsCell
:
case
pwr_cClass_NMpsCell
:
case
pwr_cClass_NMpsStoreCell
:
case
pwr_cClass_NMpsStoreCell
:
...
...
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