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
5c2ccbaa
Commit
5c2ccbaa
authored
Sep 27, 2019
by
Marcus Nordenberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rt_xtt: Operator window popup placement + show all available function buttons by default
parent
be9d0585
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
745 additions
and
611 deletions
+745
-611
src/wbl/pwrb/src/pwrb_c_opplace.wb_load
src/wbl/pwrb/src/pwrb_c_opplace.wb_load
+47
-35
xtt/lib/xtt/gtk/xtt_op_gtk.cpp
xtt/lib/xtt/gtk/xtt_op_gtk.cpp
+697
-576
xtt/lib/xtt/gtk/xtt_op_gtk.h
xtt/lib/xtt/gtk/xtt_op_gtk.h
+1
-0
No files found.
src/wbl/pwrb/src/pwrb_c_opplace.wb_load
View file @
5c2ccbaa
...
@@ -99,10 +99,10 @@ SObject pwrb:Class
...
@@ -99,10 +99,10 @@ SObject pwrb:Class
EndBody
EndBody
EndObject
EndObject
!/**
!/**
! Specifies on which
monitor
the operator dialogue will
! Specifies on which
display
the operator dialogue will
! take place.
! take place.
! If the operator communication is run on the local node
! If the operator communication is run on the local node
! and the display is to be displayed on the own
monitor
! and the display is to be displayed on the own
display
! ('default display') the Display attribute ought to be
! ('default display') the Display attribute ought to be
! left blank.
! left blank.
!*/
!*/
...
@@ -246,7 +246,7 @@ SObject pwrb:Class
...
@@ -246,7 +246,7 @@ SObject pwrb:Class
! in respective node. In each node the message handler
! in respective node. In each node the message handler
! has its own skyline of events (also named MaxNoOfEvents)
! has its own skyline of events (also named MaxNoOfEvents)
! defined by a MessageHandler object. In principle, the
! defined by a MessageHandler object. In principle, the
! User object's skyline of events should be selected as
å
! User object's skyline of events should be selected as
�
! MaxNoOfEvents, added up over MaxNoOfEvents in the
! MaxNoOfEvents, added up over MaxNoOfEvents in the
! MessageHandler objects in all nodes throughout the
! MessageHandler objects in all nodes throughout the
! ProviewR system, or make it simple and assign the
! ProviewR system, or make it simple and assign the
...
@@ -356,6 +356,17 @@ SObject pwrb:Class
...
@@ -356,6 +356,17 @@ SObject pwrb:Class
Body SysBody
Body SysBody
Attr TypeRef = "pwrs:Type-$String80"
Attr TypeRef = "pwrs:Type-$String80"
EndBody
EndBody
EndObject
!/**
! Override on what monitor the operator panel will show up. Default 0
! will use the primary monitor of the system. A value of 1 selects the first
! monitor and so on and so forth.
!*/
Object Monitor $Attribute 53
Body SysBody
Attr TypeRef = "pwrs:Type-$UInt32"
Attr Flags = 0
EndBody
EndObject
EndObject
EndObject
EndObject
Object Template OpPlace
Object Template OpPlace
...
@@ -366,6 +377,7 @@ SObject pwrb:Class
...
@@ -366,6 +377,7 @@ SObject pwrb:Class
Attr OpWindEventNameSegments = 2
Attr OpWindEventNameSegments = 2
Attr MaxNoOfAlarms = 200
Attr MaxNoOfAlarms = 200
Attr MaxNoOfEvents = 500
Attr MaxNoOfEvents = 500
Attr Monitor = 0
EndBody
EndBody
EndObject
EndObject
Object FastAvail $ReferenceList
Object FastAvail $ReferenceList
...
...
xtt/lib/xtt/gtk/xtt_op_gtk.cpp
View file @
5c2ccbaa
This diff is collapsed.
Click to expand it.
xtt/lib/xtt/gtk/xtt_op_gtk.h
View file @
5c2ccbaa
...
@@ -93,6 +93,7 @@ public:
...
@@ -93,6 +93,7 @@ public:
GdkColor
green_color
;
GdkColor
green_color
;
GdkColor
gray_color
;
GdkColor
gray_color
;
GdkColor
white_color
;
GdkColor
white_color
;
GdkRectangle
monitor_geometry
;
int
a_height
;
int
a_height
;
int
a_exist
[
5
];
int
a_exist
[
5
];
int
a_active
[
5
];
int
a_active
[
5
];
...
...
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