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
eb8589cb
Commit
eb8589cb
authored
Apr 16, 2015
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Xtt eventlog window, method toolbar added
parent
c4601f29
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
145 additions
and
38 deletions
+145
-38
xtt/lib/ge/src/ge_methods.cpp
xtt/lib/ge/src/ge_methods.cpp
+6
-6
xtt/lib/xtt/gtk/xtt_hist_gtk.cpp
xtt/lib/xtt/gtk/xtt_hist_gtk.cpp
+111
-30
xtt/lib/xtt/gtk/xtt_hist_gtk.h
xtt/lib/xtt/gtk/xtt_hist_gtk.h
+3
-0
xtt/lib/xtt/src/xtt_hist.cpp
xtt/lib/xtt/src/xtt_hist.cpp
+7
-0
xtt/lib/xtt/src/xtt_hist.h
xtt/lib/xtt/src/xtt_hist.h
+4
-0
xtt/mmi/xtt/en_us/xtt_lng.dat
xtt/mmi/xtt/en_us/xtt_lng.dat
+7
-1
xtt/mmi/xtt/sv_se/xtt_lng.dat
xtt/mmi/xtt/sv_se/xtt_lng.dat
+7
-1
No files found.
xtt/lib/ge/src/ge_methods.cpp
View file @
eb8589cb
...
...
@@ -88,7 +88,7 @@ pwr_tString80 GeMethods::op_image[GeMethods::opmeth_size] = {
pwr_tString80
GeMethods
::
op_tooltip
[
GeMethods
::
opmeth_size
]
=
{
"Graph"
,
"Object
g
raph"
,
"Object
G
raph"
,
"Trend"
,
"History"
,
"Fast curve"
,
...
...
@@ -162,13 +162,13 @@ pwr_tString80 GeMethods::mnt_image[GeMethods::mntmeth_size] = {
""
};
pwr_tString80
GeMethods
::
mnt_tooltip
[
GeMethods
::
mntmeth_size
]
=
{
"Open
o
bject"
,
"Open
p
lc"
,
"Open
O
bject"
,
"Open
P
lc"
,
"Navigator"
,
"Crossreferences"
,
"Help
c
lass"
,
"Data
s
heet"
,
"CicuitDiagram"
,
"Help
C
lass"
,
"Data
S
heet"
,
"Ci
r
cuitDiagram"
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
"Simulate"
};
...
...
xtt/lib/xtt/gtk/xtt_hist_gtk.cpp
View file @
eb8589cb
This diff is collapsed.
Click to expand it.
xtt/lib/xtt/gtk/xtt_hist_gtk.h
View file @
eb8589cb
...
...
@@ -83,6 +83,7 @@ class HistGtk : public Hist {
GtkWidget
*
search_string2_lbl_w
;
GtkWidget
*
search_string3_lbl_w
;
GtkWidget
*
search_string4_lbl_w
;
GtkWidget
*
search_vbox
;
void
set_num_of_events
(
int
nrOfEvents
);
void
set_search_string
(
const
char
*
s1
,
const
char
*
s2
,
...
...
@@ -97,6 +98,8 @@ class HistGtk : public Hist {
static
void
activate_zoom_in
(
GtkWidget
*
w
,
gpointer
data
);
static
void
activate_zoom_out
(
GtkWidget
*
w
,
gpointer
data
);
static
void
activate_zoom_reset
(
GtkWidget
*
w
,
gpointer
data
);
static
void
activate_hidesearch
(
GtkWidget
*
w
,
gpointer
data
);
static
void
activate_hide_search
(
GtkWidget
*
w
,
gpointer
data
);
static
void
activate_open_plc
(
GtkWidget
*
w
,
gpointer
data
);
static
void
activate_stat
(
GtkWidget
*
w
,
gpointer
data
);
static
void
activate_display_in_xnav
(
GtkWidget
*
w
,
gpointer
data
);
...
...
xtt/lib/xtt/src/xtt_hist.cpp
View file @
eb8589cb
...
...
@@ -72,6 +72,7 @@ extern "C" {
#include "xtt_hist.h"
#include "rt_xnav_msg.h"
#include "xtt_evlist.h"
#include "xtt_methodtoolbar.h"
#define SENS 1
#define INSENS 0
...
...
@@ -139,6 +140,12 @@ void Hist::help_event_cb( void *ctx, void *item)
}
}
void
Hist
::
selection_changed_cb
(
void
*
ctx
)
{
((
Hist
*
)
ctx
)
->
methodtoolbar
->
set_sensitive
();
((
Hist
*
)
ctx
)
->
sup_methodtoolbar
->
set_sensitive
();
}
void
Hist
::
hist_display_in_xnav_cb
(
void
*
ctx
,
pwr_sAttrRef
*
arp
)
{
if
(
((
Hist
*
)
ctx
)
->
display_in_xnav_cb
)
...
...
xtt/lib/xtt/src/xtt_hist.h
View file @
eb8589cb
...
...
@@ -57,6 +57,7 @@ extern "C" {
#define ERROR_TIME_CONVERT -99
class
CoWow
;
class
XttMethodToolbar
;
class
Hist
{
public:
...
...
@@ -117,6 +118,8 @@ class Hist {
int
check_conditions
(
sEvent
*
evp
);
int
compareStr
(
char
*
,
char
*
);
void
printSearchStr
();
XttMethodToolbar
*
methodtoolbar
;
XttMethodToolbar
*
sup_methodtoolbar
;
virtual
void
set_num_of_events
(
int
nrOfEvents
)
{}
virtual
void
set_search_string
(
const
char
*
s1
,
const
char
*
s2
,
...
...
@@ -154,6 +157,7 @@ class Hist {
unsigned
long
item_type
,
unsigned
long
utility
,
char
*
arg
,
int
x
,
int
y
);
static
void
help_event_cb
(
void
*
ctx
,
void
*
item
);
static
void
selection_changed_cb
(
void
*
ctx
);
static
void
hist_init_cb
(
void
*
ctx
);
};
...
...
xtt/mmi/xtt/en_us/xtt_lng.dat
View file @
eb8589cb
...
...
@@ -163,7 +163,7 @@ E 1.5.4 "_Hide Event Name"
E 1.5.5 "Hide _Event Text"
E 1.5.6 "Help Selected Event"
E 1.5.7 "_Remove Blocking"
E 1.5.8 "
Rt
Navigator for supervisory object"
E 1.5.8 "Navigator for supervisory object"
E 1.5.9 "Open Plc for supervisory object"
E 1.5.10 "Acknowledge"
#
...
...
@@ -221,6 +221,8 @@ E 1.9.32 " with type "
E 1.9.33 " with EventName "
E 1.9.34 " with EventText "
E 1.9.35 "S_tatistics"
E 1.9.36 "Hide _Search Dialog"
E 1.9.37 "Maximize"
#
# Ge Curve
E 1.10.1 "_Refresh"
...
...
@@ -503,6 +505,10 @@ E 1.20.1 "Input string too long"
E 1.20.2 "Object not found"
E 1.20.3 "Input syntax error"
#
# Method toolbar
E 1.21.1 "Fast curve"
E 1.21.2 "Block events"
#
# Postscript printing
E 2.1.1 "Contents"
E 2.1.2 "page"
...
...
xtt/mmi/xtt/sv_se/xtt_lng.dat
View file @
eb8589cb
...
...
@@ -163,7 +163,7 @@ E 1.5.4 "_D
E 1.5.5 "Dlj _hndelsetext"
E 1.5.6 "Hjlp fr utvald hndelse"
E 1.5.7 "_Ta bort blockering"
E 1.5.8 "
Rt
Navigator fr vervakningsobjekt"
E 1.5.8 "Navigator fr vervakningsobjekt"
E 1.5.9 "Open Plc fr vervakningsobjekt"
E 1.5.10 "Kvittera"
#
...
...
@@ -221,6 +221,8 @@ E 1.9.32 " med typ "
E 1.9.33 " med Hndelsenamn "
E 1.9.34 " med Hndelsetext "
E 1.9.35 "S_tatistik"
E 1.9.36 "Dlj _skfnster"
E 1.9.37 "Maximera"
#
# Ge Curve
E 1.10.1 "_Uppdatera"
...
...
@@ -500,6 +502,10 @@ E 1.20.1 "Inmatad str
E 1.20.2 "Objektet finns inte"
E 1.20.3 "Syntax fel i inmatning"
#
# Method toolbar
E 1.21.1 "Snabbkurva"
E 1.21.2 "Blockera hndelser"
#
# Postscript printing
E 2.1.1 "Innehll"
E 2.1.2 "sidan"
...
...
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