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
1d148b61
Commit
1d148b61
authored
Feb 03, 2011
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Xtt, problems with OpPlace and XttGraph objects in SharedVolume fixed
parent
dfb46882
Changes
11
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
349 additions
and
307 deletions
+349
-307
src/doc/man/en_us/changelog.html
src/doc/man/en_us/changelog.html
+301
-295
src/doc/man/en_us/man_gsg.odt
src/doc/man/en_us/man_gsg.odt
+0
-0
src/doc/man/en_us/man_gsg.pdf
src/doc/man/en_us/man_gsg.pdf
+0
-0
src/lib/rt/src/rt_gdh.c
src/lib/rt/src/rt_gdh.c
+11
-0
src/lib/rt/src/rt_gdh.h
src/lib/rt/src/rt_gdh.h
+5
-0
wb/changelog.txt
wb/changelog.txt
+2
-0
xtt/changelog.txt
xtt/changelog.txt
+1
-0
xtt/exe/rt_xtt/src/xtt_main.cpp
xtt/exe/rt_xtt/src/xtt_main.cpp
+9
-4
xtt/lib/xtt/gtk/xtt_op_gtk.cpp
xtt/lib/xtt/gtk/xtt_op_gtk.cpp
+9
-4
xtt/lib/xtt/src/xtt_op.cpp
xtt/lib/xtt/src/xtt_op.cpp
+2
-2
xtt/lib/xtt/src/xtt_xnav_command.cpp
xtt/lib/xtt/src/xtt_xnav_command.cpp
+9
-2
No files found.
src/doc/man/en_us/changelog.html
View file @
1d148b61
This diff is collapsed.
Click to expand it.
src/doc/man/en_us/man_gsg.odt
View file @
1d148b61
No preview for this file type
src/doc/man/en_us/man_gsg.pdf
View file @
1d148b61
No preview for this file type
src/lib/rt/src/rt_gdh.c
View file @
1d148b61
...
...
@@ -3655,6 +3655,17 @@ gdh_GetVolumeInfo(
return
rsts
;
}
/**
* @brief Get info for a volume.
*/
pwr_tStatus
gdh_GetRootVolume
(
pwr_tVid
*
vid
/**< Volume identity */
)
{
*
vid
=
gdbroot
->
my_volume
->
g
.
vid
;
return
GDH__SUCCESS
;
}
pwr_tStatus
gdh_GetObjectBodyDef
(
pwr_tCid
cid
,
...
...
src/lib/rt/src/rt_gdh.h
View file @
1d148b61
...
...
@@ -501,6 +501,11 @@ gdh_GetVolumeList(
pwr_tVid
*
vid
);
pwr_tStatus
gdh_GetRootVolume
(
pwr_tVid
*
vid
);
pwr_tStatus
gdh_SearchFile
(
pwr_tOid
oid
,
...
...
wb/changelog.txt
View file @
1d148b61
...
...
@@ -168,3 +168,5 @@
101006 cs wb Dev method PostCreate, inheritance added.
101006 cs wb IO objects, PostCreate method to automatically insert ThreadObject.
101123 cs wb Lockfile added to directory and class volumes.
110202 cs wb Bugfix in object editor, Ctrl+DoubleClick didn't work on attrrefs.
110202 cs wb Plc compile, problem with compilation of component subwindow from plc editor fixed.
xtt/changelog.txt
View file @
1d148b61
...
...
@@ -197,3 +197,4 @@
110121 cs xtt Languages zh_cn and fr_fr added.
110121 rk rtmon Runtime Monitor, problem with restart timeout fixed.
110202 cs flow Color alloc problem fixed.
110203 cs xtt Problems with OpPlace and XttGraph object in SharedVolume fixed.
\ No newline at end of file
xtt/exe/rt_xtt/src/xtt_main.cpp
View file @
1d148b61
...
...
@@ -561,7 +561,7 @@ Xtt::Xtt( int *argc, char **argv[], int *return_sts) :
while
(
ODD
(
sts
))
{
sts
=
gdh_ObjidToName
(
op_objid
,
oname
,
sizeof
(
oname
),
cdh_mName_object
);
if
(
ODD
(
sts
)
&&
cdh_NoCaseStrcmp
(
oname
,
opplace_str
)
==
0
)
{
sts
=
gdh_ObjidToName
(
op_objid
,
opplace_str
,
sizeof
(
opplace_str
),
cdh_mN
Name
);
sts
=
gdh_ObjidToName
(
op_objid
,
opplace_str
,
sizeof
(
opplace_str
),
cdh_mN
ame_volumeStrict
);
opplace_found
=
1
;
break
;
}
...
...
@@ -619,7 +619,7 @@ Xtt::Xtt( int *argc, char **argv[], int *return_sts) :
sts
=
gdh_ObjidToName
(
oid
,
name
,
sizeof
(
name
),
cdh_mName_object
);
if
(
EVEN
(
sts
)
||
cdh_NoCaseStrcmp
(
name
,
"opdefault"
)
==
0
)
continue
;
sts
=
gdh_ObjidToName
(
oid
,
fullname
,
sizeof
(
fullname
),
cdh_mN
Name
);
sts
=
gdh_ObjidToName
(
oid
,
fullname
,
sizeof
(
fullname
),
cdh_mN
ame_volumeStrict
);
if
(
EVEN
(
sts
))
continue
;
i
++
;
...
...
@@ -639,7 +639,7 @@ Xtt::Xtt( int *argc, char **argv[], int *return_sts) :
sts
=
gdh_GetNextObject
(
oid
,
&
oid
))
{
sts
=
gdh_ObjidToName
(
oid
,
name
,
sizeof
(
name
),
cdh_mName_object
);
if
(
ODD
(
sts
)
&&
cdh_NoCaseStrcmp
(
name
,
"opdefault"
)
==
0
)
{
sts
=
gdh_ObjidToName
(
oid
,
name
,
sizeof
(
name
),
cdh_mN
Name
);
sts
=
gdh_ObjidToName
(
oid
,
name
,
sizeof
(
name
),
cdh_mN
ame_volumeStrict
);
if
(
EVEN
(
sts
))
exit
(
sts
);
strcpy
(
opplace_str
,
name
);
...
...
@@ -759,13 +759,18 @@ void Xtt::list_opplace()
pwr_tObjName
name
;
pwr_tStatus
sts
;
pwr_tOid
oid
;
pwr_tVid
root_vid
;
gdh_GetRootVolume
(
&
root_vid
);
int
i
=
0
;
for
(
sts
=
gdh_GetClassList
(
pwr_cClass_OpPlace
,
&
oid
);
ODD
(
sts
);
sts
=
gdh_GetNextObject
(
oid
,
&
oid
))
{
if
(
oid
.
vid
==
root_vid
)
sts
=
gdh_ObjidToName
(
oid
,
texts
[
i
],
sizeof
(
texts
[
0
]),
cdh_mNName
);
else
sts
=
gdh_ObjidToName
(
oid
,
texts
[
i
],
sizeof
(
texts
[
0
]),
cdh_mName_volumeStrict
);
if
(
EVEN
(
sts
))
continue
;
sts
=
gdh_ObjidToName
(
oid
,
name
,
sizeof
(
name
),
cdh_mName_object
);
...
...
xtt/lib/xtt/gtk/xtt_op_gtk.cpp
View file @
1d148b61
...
...
@@ -73,6 +73,7 @@ OpGtk::OpGtk( void *op_parent_ctx,
Op
(
op_parent_ctx
,
opplace
,
status
),
parent_wid
(
op_parent_wid
),
title_label
(
0
),
a_height
(
2
),
text_size
(
12
)
{
pwr_tStatus
sts
;
memset
(
a_exist
,
0
,
sizeof
(
a_exist
));
memset
(
a_active
,
0
,
sizeof
(
a_active
));
GdkColor
red_color
;
...
...
@@ -538,7 +539,8 @@ OpGtk::OpGtk( void *op_parent_ctx,
gtk_box_pack_start
(
GTK_BOX
(
sysbutton_box
),
GTK_WIDGET
(
tools2
),
FALSE
,
FALSE
,
0
);
gtk_widget_set_size_request
(
sysbutton_box
,
160
,
-
1
);
configure
(
opplace
);
sts
=
configure
(
opplace
);
if
(
EVEN
(
sts
))
return
;
// Status bar
GtkWidget
*
status_bar
;
...
...
@@ -657,8 +659,11 @@ OpGtk::~OpGtk()
{
if
(
jop
)
delete
jop
;
if
(
sup_timerid
)
{
sup_timerid
->
remove
();
delete
sup_timerid
;
}
if
(
wow
)
delete
wow
;
gtk_widget_destroy
(
toplevel
);
}
...
...
xtt/lib/xtt/src/xtt_op.cpp
View file @
1d148b61
...
...
@@ -47,7 +47,7 @@ Op::Op( void *op_parent_ctx,
pwr_tStatus
*
status
)
:
parent_ctx
(
op_parent_ctx
),
start_jop
(
0
),
jop
(
NULL
),
command_cb
(
NULL
),
map_cb
(
NULL
),
help_cb
(
NULL
),
close_cb
(
NULL
),
get_alarm_info_cb
(
NULL
),
ack_last_cb
(
NULL
),
sup_timerid
(
0
)
close_cb
(
NULL
),
get_alarm_info_cb
(
NULL
),
ack_last_cb
(
NULL
),
wow
(
0
),
sup_timerid
(
0
)
{
sup_init
();
}
...
...
@@ -82,7 +82,7 @@ int Op::appl_action( int idx)
int
sts
;
if
(
command_cb
)
{
sts
=
gdh_AttrrefToName
(
&
button_aref
[
idx
],
name
,
sizeof
(
name
),
cdh_mN
Name
);
sts
=
gdh_AttrrefToName
(
&
button_aref
[
idx
],
name
,
sizeof
(
name
),
cdh_mN
ame_volumeStrict
);
strcpy
(
cmd
,
"ope gra/obj="
);
strcat
(
cmd
,
name
);
...
...
xtt/lib/xtt/src/xtt_xnav_command.cpp
View file @
1d148b61
...
...
@@ -1979,6 +1979,7 @@ static int xnav_show_func( void *client_data,
pwr_tOName
*
names
;
xnav_sObjectList
*
ctx
;
pwr_tCid
cid
;
pwr_tVid
root_vid
;
if
(
EVEN
(
dcli_get_qualifier
(
"/CLASS"
,
class_str
,
sizeof
(
class_str
))))
{
xnav
->
message
(
'E'
,
"Class is missing"
);
...
...
@@ -1991,6 +1992,8 @@ static int xnav_show_func( void *client_data,
return
XNAV__HOLDCOMMAND
;
}
gdh_GetRootVolume
(
&
root_vid
);
for
(
sts
=
gdh_GetClassListAttrRef
(
cid
,
&
aref
);
ODD
(
sts
);
sts
=
gdh_GetNextAttrRef
(
cid
,
&
aref
,
&
aref
))
{
...
...
@@ -2002,8 +2005,12 @@ static int xnav_show_func( void *client_data,
for
(
sts
=
gdh_GetClassListAttrRef
(
cid
,
&
aref
);
ODD
(
sts
);
sts
=
gdh_GetNextAttrRef
(
cid
,
&
aref
,
&
aref
))
{
if
(
aref
.
Objid
.
vid
==
root_vid
)
sts
=
gdh_AttrrefToName
(
&
aref
,
names
[
idx
],
sizeof
(
names
[
0
]),
cdh_mNName
/* cdh_mName_volumeStrict */
);
cdh_mNName
);
else
sts
=
gdh_AttrrefToName
(
&
aref
,
names
[
idx
],
sizeof
(
names
[
0
]),
cdh_mName_volumeStrict
);
if
(
EVEN
(
sts
))
continue
;
idx
++
;
...
...
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