Skip to content

P
proview
Commit 364bcc76 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Chinese characters, UTF-0 char coding of language and textfiles.

parent 4b8aa435
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6672 additions and 4877 deletions
bcomp/mmi/bcomp/src/pwr_c_comppid.pwg
View file @ 364bcc76
This diff is collapsed.
java/jpwr/jop/src/JopLang.java
View file @ 364bcc76
...@@ -153,6 +153,9 @@ public class JopLang { ...@@ -153,6 +153,9 @@ public class JopLang {
public static final int LANGUAGE_zh_TW = 134; public static final int LANGUAGE_zh_TW = 134;
public static final int LANGUAGE__ = 135; public static final int LANGUAGE__ = 135;
public static final int eCoding_ISO8859_1 = 0;
public static final int eCoding_UTF_8 = 1;
// //
// A node in a binary tree with string key // A node in a binary tree with string key
...@@ -342,6 +345,7 @@ public class JopLang { ...@@ -342,6 +345,7 @@ public class JopLang {
BufferedReader reader = null; BufferedReader reader = null;
String filename = ""; String filename = "";
int type; int type;
int coding = eCoding_ISO8859_1;
for ( int i = 0; i < 2; i++) { for ( int i = 0; i < 2; i++) {
if ( i == 0 && btree_en_us != null) if ( i == 0 && btree_en_us != null)
...@@ -364,7 +368,11 @@ public class JopLang { ...@@ -364,7 +368,11 @@ public class JopLang {
System.out.println( "Opening file " + filename); System.out.println( "Opening file " + filename);
URL fileURL = new URL( filename); URL fileURL = new URL( filename);
InputStream in = fileURL.openStream(); InputStream in = fileURL.openStream();
InputStreamReader r2 = new InputStreamReader(in); InputStreamReader r2;
if ( i == 1 && lang == LANGUAGE_zh_CN)
r2 = new InputStreamReader(in, "UTF-8");
else
r2 = new InputStreamReader(in);
reader = new BufferedReader( r2); reader = new BufferedReader( r2);
} }
catch ( Exception e) { catch ( Exception e) {
...@@ -379,7 +387,12 @@ public class JopLang { ...@@ -379,7 +387,12 @@ public class JopLang {
filename = "$pwr_exe/" + fname2; filename = "$pwr_exe/" + fname2;
filename = engine.gdh.translateFilename( filename); filename = engine.gdh.translateFilename( filename);
try { try {
reader = new BufferedReader(new FileReader(filename)); // reader = new BufferedReader(new FileReader(filename));
if ( i == 1 && lang == LANGUAGE_zh_CN) {
reader = new BufferedReader( new InputStreamReader( new FileInputStream( filename), "UTF-8"));
}
else
reader = new BufferedReader( new InputStreamReader( new FileInputStream( filename)));
} }
catch ( Exception e) { catch ( Exception e) {
System.out.println( "Unable to open file " + filename); System.out.println( "Unable to open file " + filename);
...@@ -395,10 +408,16 @@ public class JopLang { ...@@ -395,10 +408,16 @@ public class JopLang {
try { try {
while( (line = reader.readLine()) != null) { while( (line = reader.readLine()) != null) {
line = line.trim(); line = line.trim();
if ( line.equals("") || line.charAt(0) == '#') if ( line.equals("") || line.charAt(0) == '#')
continue; continue;
if ( line.equals("Coding:UTF-8"))
coding = eCoding_UTF_8;
else if ( line.equals("Coding:ISO8859-1"))
coding = eCoding_ISO8859_1;
if ( line.charAt(0) == 'E') if ( line.charAt(0) == 'E')
type = ITEM_TYPE_EXACT; type = ITEM_TYPE_EXACT;
else if ( line.charAt(0) == 'B') else if ( line.charAt(0) == 'B')
......
profibus/exe/profinet_viewer/gtk/os_linux/link_rule.mk
View file @ 364bcc76
...@@ -8,8 +8,8 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/profinet_viewe ...@@ -8,8 +8,8 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/profinet_viewe
$(wb_msg_eobjs) $(rt_msg_eobjs) \ $(wb_msg_eobjs) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib \ $(pwr_eobj)/rt_io_user.o -L/usr/X11R6/lib \
-L/opt/gnome/lib \ -L/opt/gnome/lib \
-lpwr_flow_gtk -lpwr_flow -lpwr_rt_gtk -lpwr_rt \ -lpwr_flow_gtk -lpwr_flow -lpwr_cow_gtk -lpwr_cow -lpwr_rt \
-lpwr_co_gtk -lpwr_co -lpwr_flow_gtk -lpwr_flow \ -lpwr_co -lpwr_flow_gtk -lpwr_flow \
`pkg-config --libs gtk+-2.0` \ `pkg-config --libs gtk+-2.0` \
-lpwr_msg_dummy -lantlr \ -lpwr_msg_dummy -lantlr \
-lcrypt -lrpcsvc -lpthread -lm -ldb_cxx -lz -lpnioif -lcrypt -lrpcsvc -lpthread -lm -ldb_cxx -lz -lpnioif
......
sev/exe/sev_xtt/src/xtt_tbl_command.cpp
View file @ 364bcc76
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
# include <stdlib.h> # include <stdlib.h>
# include <ctype.h> # include <ctype.h>
#include "pwr.h"
#include "co_nav_help.h" #include "co_nav_help.h"
#include "pwr_privilege.h" #include "pwr_privilege.h"
#include "co_cdh.h" #include "co_cdh.h"
......
src/exe/co_convert/src/cnv_readxtthelp.cpp
View file @ 364bcc76
...@@ -72,13 +72,13 @@ void *help_insert_cb( void *ctx, navh_eItemType item_type, const char *text1, ...@@ -72,13 +72,13 @@ void *help_insert_cb( void *ctx, navh_eItemType item_type, const char *text1,
const char *text2, const char *text3, const char *link, const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name, const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index, navh_eHelpFile file_type, int help_index,
const char *bookmark) const char *bookmark, int coding)
{ {
CnvReadXtthelp *xh = (CnvReadXtthelp *)ctx; CnvReadXtthelp *xh = (CnvReadXtthelp *)ctx;
return xh->xtthelpto->insert( item_type, text1, text2, text3, link, return xh->xtthelpto->insert( item_type, text1, text2, text3, link,
link_bookmark, file_name, file_type, help_index, link_bookmark, file_name, file_type, help_index,
bookmark); bookmark, coding);
} }
int CnvReadXtthelp::read_xtthelp() int CnvReadXtthelp::read_xtthelp()
......
src/exe/co_convert/src/cnv_xtthelpto.h
View file @ 364bcc76
...@@ -47,7 +47,7 @@ class CnvXtthelpTo { ...@@ -47,7 +47,7 @@ class CnvXtthelpTo {
const char *text2, const char *text3, const char *link, const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name, const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index, navh_eHelpFile file_type, int help_index,
const char *bookmark) const char *bookmark, int coding)
{ return 0;} { return 0;}
virtual bool confpass() { return false;} virtual bool confpass() { return false;}
virtual void set_confpass( bool conf) {}; virtual void set_confpass( bool conf) {};
......
src/exe/co_convert/src/cnv_xtthelptohtml.cpp
View file @ 364bcc76
...@@ -34,6 +34,7 @@ extern "C" { ...@@ -34,6 +34,7 @@ extern "C" {
#include "co_dcli.h" #include "co_dcli.h"
} }
#include "co_lng.h"
#include "co_nav_help.h" #include "co_nav_help.h"
#include "cnv_ctx.h" #include "cnv_ctx.h"
#include "cnv_readxtthelp.h" #include "cnv_readxtthelp.h"
...@@ -77,7 +78,7 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1, ...@@ -77,7 +78,7 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1,
const char *text2, const char *text3, const char *link, const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name, const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index, navh_eHelpFile file_type, int help_index,
const char *bookmark) const char *bookmark, int coding)
{ {
int i; int i;
static int in_table = 0; static int in_table = 0;
...@@ -105,6 +106,11 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1, ...@@ -105,6 +106,11 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1,
case navh_eItemType_Topic: case navh_eItemType_Topic:
{ {
pwr_tFileName fname; pwr_tFileName fname;
char codingstr[40] = "ISO-8859-1";
if ( coding == lng_eCoding_UTF_8)
strcpy( codingstr, "UTF-8");
subject_to_fname( fname, text1, 1); subject_to_fname( fname, text1, 1);
cf = new CnvFile(); cf = new CnvFile();
...@@ -114,7 +120,7 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1, ...@@ -114,7 +120,7 @@ void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1,
"<!--NewPage-->" << endl << "<!--NewPage-->" << endl <<
"<HTML>" << endl << "<HTML>" << endl <<
"<HEAD>" << endl << "<HEAD>" << endl <<
"<META http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">" << endl << "<META http-equiv=\"Content-Type\" content=\"text/html; charset=" << codingstr << "\">" << endl <<
"<!-- Generated by co_convert.-->" << endl << "<!-- Generated by co_convert.-->" << endl <<
"<TITLE>" << endl << "<TITLE>" << endl <<
"Generated Documentation (Untitled)" << endl << "Generated Documentation (Untitled)" << endl <<
......
src/exe/co_convert/src/cnv_xtthelptohtml.h
View file @ 364bcc76
...@@ -43,7 +43,7 @@ class CnvXtthelpToHtml : public CnvXtthelpTo { ...@@ -43,7 +43,7 @@ class CnvXtthelpToHtml : public CnvXtthelpTo {
const char *text2, const char *text3, const char *link, const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name, const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index, navh_eHelpFile file_type, int help_index,
const char *bookmark); const char *bookmark, int coding);
void subject_to_fname( char *fname, const char *subject, int path); void subject_to_fname( char *fname, const char *subject, int path);
CnvCtx *ctx; CnvCtx *ctx;
......
src/exe/co_convert/src/cnv_xtthelptopdf.cpp
View file @ 364bcc76
...@@ -78,7 +78,7 @@ void *CnvXtthelpToPdf::insert( navh_eItemType item_type, const char *text1, ...@@ -78,7 +78,7 @@ void *CnvXtthelpToPdf::insert( navh_eItemType item_type, const char *text1,
const char *text2, const char *text3, const char *alink, const char *text2, const char *text3, const char *alink,
const char *link_bookmark, const char *file_name, const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index, navh_eHelpFile file_type, int help_index,
const char *bookmark) const char *bookmark, int coding)
{ {
char link[80]; char link[80];
if ( alink) if ( alink)
......
src/exe/co_convert/src/cnv_xtthelptopdf.h
View file @ 364bcc76
...@@ -59,7 +59,7 @@ class CnvXtthelpToPdf : public CnvXtthelpTo { ...@@ -59,7 +59,7 @@ class CnvXtthelpToPdf : public CnvXtthelpTo {
const char *text2, const char *text3, const char *link, const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name, const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index, navh_eHelpFile file_type, int help_index,
const char *bookmark); const char *bookmark, int coding);
void subject_to_fname( char *fname, const char *subject, int path); void subject_to_fname( char *fname, const char *subject, int path);
bool confpass() { return true;} bool confpass() { return true;}
void set_confpass( bool conf) { void set_confpass( bool conf) {
......
src/exe/co_convert/src/cnv_xtthelptops.cpp
View file @ 364bcc76
...@@ -78,7 +78,7 @@ void *CnvXtthelpToPs::insert( navh_eItemType item_type, const char *text1, ...@@ -78,7 +78,7 @@ void *CnvXtthelpToPs::insert( navh_eItemType item_type, const char *text1,
const char *text2, const char *text3, const char *link, const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name, const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index, navh_eHelpFile file_type, int help_index,
const char *bookmark) const char *bookmark, int coding)
{ {
if ( option & ps_mOption_printDisable && if ( option & ps_mOption_printDisable &&
item_type != navh_eItemType_Option) item_type != navh_eItemType_Option)
......
src/exe/co_convert/src/cnv_xtthelptops.h
View file @ 364bcc76
...@@ -59,7 +59,7 @@ class CnvXtthelpToPs : public CnvXtthelpTo { ...@@ -59,7 +59,7 @@ class CnvXtthelpToPs : public CnvXtthelpTo {
const char *text2, const char *text3, const char *link, const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name, const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index, navh_eHelpFile file_type, int help_index,
const char *bookmark); const char *bookmark, int coding);
void subject_to_fname( char *fname, const char *subject, int path); void subject_to_fname( char *fname, const char *subject, int path);
bool confpass() { return true;} bool confpass() { return true;}
void set_confpass( bool conf) { void set_confpass( bool conf) {
......
src/exe/co_convert/src/cnv_xtthelptoxml.cpp
View file @ 364bcc76
...@@ -186,7 +186,7 @@ void *CnvXtthelpToXml::insert( navh_eItemType item_type, const char *t1, ...@@ -186,7 +186,7 @@ void *CnvXtthelpToXml::insert( navh_eItemType item_type, const char *t1,
const char *t2, const char *t3, const char *link, const char *t2, const char *t3, const char *link,
const char *link_bookmark, const char *file_name, const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index, navh_eHelpFile file_type, int help_index,
const char *bookmark) const char *bookmark, int coding)
{ {
int i; int i;
static int in_table = 0; static int in_table = 0;
......
src/exe/co_convert/src/cnv_xtthelptoxml.h
View file @ 364bcc76
...@@ -49,7 +49,7 @@ class CnvXtthelpToXml : public CnvXtthelpTo { ...@@ -49,7 +49,7 @@ class CnvXtthelpToXml : public CnvXtthelpTo {
const char *text2, const char *text3, const char *link, const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name, const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index, navh_eHelpFile file_type, int help_index,
const char *bookmark); const char *bookmark, int coding);
void subject_to_fname( char *fname, const char *subject, int path); void subject_to_fname( char *fname, const char *subject, int path);
void cnv_text( char *to, const char *from); void cnv_text( char *to, const char *from);
......
src/exe/co_convert/src/co_convert.cpp
View file @ 364bcc76
...@@ -71,33 +71,6 @@ static void usage() ...@@ -71,33 +71,6 @@ static void usage()
} }
static void help()
{
usage();
printf( "Tags in wb_loadfile:\n");
printf( " Class:\n");
printf(" !/**\n");
printf(" @Author 'author'\n");
printf(" @Version 'version'\n");
printf(" @Summary 'text'\n");
printf(" @Code 'filename'\n");
printf(" 'Description'\n");
printf(" !*/\n");
printf( " Attribute:\n");
printf(" !/**\n");
printf(" @Summay\n");
printf(" 'Description'\n");
printf(" !*/\n");
printf( "\n");
printf( "Tags in c or h file:\n");
printf(" /**\n");
printf(" @aref 'bookmark' 'text'\n");
printf(" */\n");
printf( "\n");
}
static int convert_sort_files( const void *file1, const void *file2) static int convert_sort_files( const void *file1, const void *file2)
{ {
// Types before classes // Types before classes
...@@ -179,7 +152,7 @@ int main( int argc, char *argv[]) ...@@ -179,7 +152,7 @@ int main( int argc, char *argv[])
while( *s) { while( *s) {
switch( *s) { switch( *s) {
case 'h': case 'h':
help(); usage();
exit(0); exit(0);
case 'w': case 'w':
ctx->generate_html = 1; ctx->generate_html = 1;
......
src/lib/co/src/co_lng.cpp
View file @ 364bcc76
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "co_dcli.h" #include "co_dcli.h"
#include "co_cdh.h" #include "co_cdh.h"
#include "co_lng.h" #include "co_lng.h"
#include "co_lng_msg.h"
// Note, this is matched with lng_eLanguage // Note, this is matched with lng_eLanguage
static char lng_cLanguageStr[lng_eLanguage__][6] = { static char lng_cLanguageStr[lng_eLanguage__][6] = {
...@@ -166,6 +167,7 @@ static char lng_cLanguageStr[lng_eLanguage__][6] = { ...@@ -166,6 +167,7 @@ static char lng_cLanguageStr[lng_eLanguage__][6] = {
"zh_HK", "zh_HK",
"zh_TW"}; "zh_TW"};
lng_eCoding Lng::translfile_coding = lng_eCoding_ISO8859_1;
lng_eLanguage Lng::lang = lng_eLanguage_en_US; lng_eLanguage Lng::lang = lng_eLanguage_en_US;
tree_sTable *Lng::tree = 0; tree_sTable *Lng::tree = 0;
...@@ -344,7 +346,7 @@ bool Lng::read() ...@@ -344,7 +346,7 @@ bool Lng::read()
char fname1[120]; char fname1[120];
char fname2[120]; char fname2[120];
pwr_tFileName filename1, filename2; pwr_tFileName filename1, filename2;
int sts; pwr_tStatus sts;
if ( tree) if ( tree)
tree_DeleteTable( &sts, tree); tree_DeleteTable( &sts, tree);
...@@ -392,7 +394,9 @@ bool Lng::read() ...@@ -392,7 +394,9 @@ bool Lng::read()
Row r1( fp1, fname1); Row r1( fp1, fname1);
Row r2( fp2, fname2); Row r2( fp2, fname2);
read_metadata( fp2, (i == 0), &sts);
bool hit = true; bool hit = true;
for (;;) { for (;;) {
if ( hit) { if ( hit) {
...@@ -567,6 +571,36 @@ bool Lng::is_installed( lng_eLanguage language) ...@@ -567,6 +571,36 @@ bool Lng::is_installed( lng_eLanguage language)
} }
void Lng::read_metadata( ifstream& fp2, bool global, pwr_tStatus *sts)
{
char line[40];
if ( !fp2.getline( line, sizeof( line))) {
*sts = LNG__EOF;
return;
}
*sts = LNG__SUCCESS;
if ( strncmp( line, "Coding:UTF-8", 12) == 0) {
if ( global)
translfile_coding = lng_eCoding_UTF_8;
else if ( translfile_coding != lng_eCoding_UTF_8)
*sts = LNG__DIFFCODING;
}
else if ( strncmp( line, "Coding:ISO8859-1", 16) == 0) {
if ( global)
translfile_coding = lng_eCoding_ISO8859_1;
else if ( translfile_coding != lng_eCoding_ISO8859_1)
*sts = LNG__DIFFCODING;
}
else {
fp2.seekg( 0, ios::beg);
if ( global)
translfile_coding = lng_eCoding_ISO8859_1;
else if ( translfile_coding != lng_eCoding_ISO8859_1)
*sts = LNG__DIFFCODING;
}
}
......
src/lib/co/src/co_lng.h
View file @ 364bcc76
...@@ -179,6 +179,11 @@ typedef enum { ...@@ -179,6 +179,11 @@ typedef enum {
lng_eLanguage__ lng_eLanguage__
} lng_eLanguage; } lng_eLanguage;
typedef enum {
lng_eCoding_ISO8859_1,
lng_eCoding_UTF_8
} lng_eCoding;
typedef struct { typedef struct {
char text[80]; char text[80];
char type; char type;
...@@ -236,6 +241,7 @@ class Lng { ...@@ -236,6 +241,7 @@ class Lng {
public: public:
Lng() {}; Lng() {};
static lng_eLanguage lang; static lng_eLanguage lang;
static lng_eCoding translfile_coding;
static const int Help = 0; static const int Help = 0;
static const int Help_Class = 1; static const int Help_Class = 1;
static const int Graph = 2; static const int Graph = 2;
...@@ -272,6 +278,8 @@ class Lng { ...@@ -272,6 +278,8 @@ class Lng {
static char *lang_to_str( lng_eLanguage language); static char *lang_to_str( lng_eLanguage language);
static char *lang_to_locale( lng_eLanguage language); static char *lang_to_locale( lng_eLanguage language);
static bool is_installed( lng_eLanguage language); static bool is_installed( lng_eLanguage language);
static lng_eCoding translatefile_coding() { return translfile_coding;}
static void read_metadata( ifstream& fp2, bool global, pwr_tStatus *sts);
}; };
#if defined __cplusplus #if defined __cplusplus
......
src/lib/co/src/co_nav_help.cpp
View file @ 364bcc76
This diff is collapsed.
src/lib/co/src/co_nav_help.h
View file @ 364bcc76
...@@ -62,15 +62,15 @@ class NavHelp { ...@@ -62,15 +62,15 @@ class NavHelp {
public: public:
NavHelp( void *h_parent_ctx, const char *h_base_file, const char *h_project_file) NavHelp( void *h_parent_ctx, const char *h_base_file, const char *h_project_file)
: parent_ctx(h_parent_ctx), noprop(0) : parent_ctx(h_parent_ctx), noprop(0)
{ strcpy(project_file, h_project_file); { strncpy(project_file, h_project_file, sizeof(project_file));
strcpy(base_file, h_base_file);}; strncpy(base_file, h_base_file, sizeof(base_file));};
void *parent_ctx; void *parent_ctx;
void *(*insert_cb)( void *, navh_eItemType, const char *, void *(*insert_cb)( void *, navh_eItemType, const char *,
const char *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, const char *,
navh_eHelpFile, int, const char *); navh_eHelpFile, int, const char *, int);
void (*draw_cb)( void *, int, void *); void (*draw_cb)( void *, int, void *);
char base_file[120]; pwr_tFileName base_file;
char project_file[120]; pwr_tFileName project_file;
int noprop; int noprop;
int help( const char *key, const char *help_bookmark, navh_eHelpFile file_type, int help( const char *key, const char *help_bookmark, navh_eHelpFile file_type,
......
src/msg/used_facility_numbers.txt
View file @ 364bcc76
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
105 dcli 105 dcli
106 nav 106 nav
107 dbs 107 dbs
108 lng
110 gdh 110 gdh
111 hash 111 hash
130 plc 130 plc
......
xtt/exe/rt_xtt/gtk/rt_xtt_gtk.cpp
View file @ 364bcc76
...@@ -145,9 +145,8 @@ void XttGtk::close( void *ctx, int terminate) ...@@ -145,9 +145,8 @@ void XttGtk::close( void *ctx, int terminate)
char title[80]; char title[80];
if ( terminate) { if ( terminate) {
strcpy( title, CoWowGtk::translate_utf8("Confirm")); strcpy( title, "Confirm");
xtt->wow->DisplayQuestion( xtt, title, xtt->wow->DisplayQuestion( xtt, title, "Do you want to close", close_ok, 0, 0);
Lng::translate( "Do you want to close"), close_ok, 0, 0);
} }
else { else {
xtt->xnav->displayed = 0; xtt->xnav->displayed = 0;
...@@ -212,7 +211,7 @@ void XttGtk::open_change_value() ...@@ -212,7 +211,7 @@ void XttGtk::open_change_value()
gtk_widget_grab_focus( cmd_input); gtk_widget_grab_focus( cmd_input);
gtk_editable_delete_text( GTK_EDITABLE(cmd_input), 0, -1); gtk_editable_delete_text( GTK_EDITABLE(cmd_input), 0, -1);
set_prompt( Lng::translate("value >")); set_prompt( CoWowGtk::translate_utf8("value >"));
input_open = 1; input_open = 1;
} }
...@@ -629,7 +628,7 @@ XttGtk::XttGtk( int argc, char *argv[], int *return_sts) : ...@@ -629,7 +628,7 @@ XttGtk::XttGtk( int argc, char *argv[], int *return_sts) :
g_signal_connect( file_login, "activate", g_signal_connect( file_login, "activate",
G_CALLBACK(XttGtk::activate_login), this); G_CALLBACK(XttGtk::activate_login), this);
GtkWidget *file_logout = gtk_menu_item_new_with_mnemonic(CoWowGtk::translate_utf8("Log_Out")); GtkWidget *file_logout = gtk_menu_item_new_with_mnemonic(CoWowGtk::translate_utf8("Log_out"));
g_signal_connect( file_logout, "activate", g_signal_connect( file_logout, "activate",
G_CALLBACK(XttGtk::activate_logout), this); G_CALLBACK(XttGtk::activate_logout), this);
......
xtt/exe/rt_xtt/src/xtt_main.cpp
View file @ 364bcc76
...@@ -103,6 +103,18 @@ xnav_sStartMenu Xtt::root_menu[] = { ...@@ -103,6 +103,18 @@ xnav_sStartMenu Xtt::root_menu[] = {
static void usage()
{
cout << "Usage: rt_xtt -saqc -l lang -u user -f flavor opplace" << endl << endl <<
" Argument OpPlace object." << endl << endl <<
" -l Language (sv_se, zh_cn etc)." << endl <<
" -u Use opplace with the same name as the user." << endl <<
" -s Show a selection list of OpPlace objects." << endl <<
" -a Connect to audio device." << endl <<
" -q Hide license information." << endl <<
" -c Add close button to operator window." << endl << endl;
}
void Xtt::hotkey_activate_command( char *cmdp) void Xtt::hotkey_activate_command( char *cmdp)
{ {
pwr_tCmd cmd; pwr_tCmd cmd;
...@@ -499,67 +511,100 @@ Xtt::Xtt( int *argc, char **argv[], int *return_sts) : ...@@ -499,67 +511,100 @@ Xtt::Xtt( int *argc, char **argv[], int *return_sts) :
} }
// Set language // Set language
pwr_tClassId op_class;
for ( i = 1; i < *argc; i++) { for ( i = 1; i < *argc; i++) {
if ( strcmp( (*argv)[i], "-l") == 0 && i + 1 < *argc) { if ( (*argv)[i][0] == '-') {
strncpy( language, (*argv)[i+1], sizeof(language)); int i_incr = 0;
i++; for ( int j = 1;
} (*argv)[i][j] != 0 && (*argv)[i][j] != ' ' && (*argv)[i][j] != ' ';
else if ( strcmp( (*argv)[i], "-q") == 0) j++) {
quiet = 1; switch ( (*argv)[i][j]) {
else if ( strcmp( (*argv)[i], "-a") == 0) case 'q':
attach_audio = 1; quiet = 1;
else if ( strcmp( (*argv)[i], "-s") == 0) break;
select_opplace = 1; case 'a':
else if ( strcmp( (*argv)[i], "-c") == 0) attach_audio = 1;
op_close_button = 1;
else if ( strcmp( (*argv)[i], "-d") == 0)
no_advanceduser = 1;
else if ( strcmp( (*argv)[i], "-u") == 0 && i + 1 < *argc) {
char oname[80];
strcpy( opplace_str, (*argv)[i+1]);
sts = gdh_GetClassList( pwr_cClass_OpPlace, &op_objid);
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_mNName);
opplace_found = 1;
break; break;
case 's':
select_opplace = 1;
break;
case 'h':
usage();
exit(0);
case 'c':
op_close_button = 1;
break;
case 'd':
no_advanceduser = 1;
break;
case 'l':
if ( i + 1 >= *argc ||
!((*argv)[i][j+1] == ' ' || (*argv)[i][j+1] != ' ')) {
usage();
exit(0);
}
strncpy( language, (*argv)[i+1], sizeof(language));
i++;
i_incr = 1;
break;
case 'u': {
if ( i + 1 >= *argc ||
!((*argv)[i][j+1] == ' ' || (*argv)[i][j+1] != ' ')) {
usage();
exit(0);
}
char oname[80];
strcpy( opplace_str, (*argv)[i+1]);
sts = gdh_GetClassList( pwr_cClass_OpPlace, &op_objid);
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_mNName);
opplace_found = 1;
break;
}
sts = gdh_GetNextObject( op_objid, &op_objid);
}
if ( !opplace_found) {
printf("** Unable to find opplace\n");
exit(sts);
}
i_incr = 1;
i++;
break;
}
default:
usage();
exit(0);
} }
sts = gdh_GetNextObject( op_objid, &op_objid); if ( i_incr)
break;
} }
if ( !opplace_found) { }
else {
// Opplace argument
strcpy( opplace_str, (*argv)[i]);
sts = gdh_NameToObjid( opplace_str, &op_objid);
if ( EVEN(sts)) {
printf("** Unable to find opplace\n"); printf("** Unable to find opplace\n");
exit(sts); exit(sts);
} }
i++;
}
}
if ( !opplace_found && *argc >= 2 && strncmp( (*argv)[1], "-", 1) != 0) { sts = gdh_GetObjectClass( op_objid, &op_class);
pwr_tClassId op_class; if ( EVEN(sts)) exit( sts);
// First argument is opplace object if ( op_class != pwr_cClass_OpPlace) {
strcpy( opplace_str, (*argv)[1]); printf("** Error in opplace object class\n");
exit(sts);
sts = gdh_NameToObjid( opplace_str, &op_objid); }
if ( EVEN(sts)) { opplace_found = 1;
printf("** Unable to find opplace\n");
exit(sts);
}
sts = gdh_GetObjectClass( op_objid, &op_class);
if ( EVEN(sts)) exit( sts);
if ( op_class != pwr_cClass_OpPlace) {
printf("** Error in opplace object class\n");
exit(sts);
} }
opplace_found = 1;
} }
else if ( select_opplace) {
if ( select_opplace) {
// Check if there is only one single opplace // Check if there is only one single opplace
pwr_tOName fullname; pwr_tOName fullname;
pwr_tObjName name; pwr_tObjName name;
...@@ -584,7 +629,7 @@ Xtt::Xtt( int *argc, char **argv[], int *return_sts) : ...@@ -584,7 +629,7 @@ Xtt::Xtt( int *argc, char **argv[], int *return_sts) :
opplace_found = 1; opplace_found = 1;
} }
} }
else if ( !opplace_found) { if ( !opplace_found) {
// Look for default opplace // Look for default opplace
pwr_tOid oid; pwr_tOid oid;
pwr_tOName name; pwr_tOName name;
......
xtt/exe/wb_ge/gtk/os_linux/link_rule.mk
View file @ 364bcc76
...@@ -7,8 +7,8 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_gtk \ ...@@ -7,8 +7,8 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_gtk \
-L/usr/local/BerkeleyDB.4.0/lib \ -L/usr/local/BerkeleyDB.4.0/lib \
-L/opt/gnome/lib \ -L/opt/gnome/lib \
-lpwr_ge_gtk -lpwr_ge -lpwr_wb_gtk -lpwr_wb -lpwr_wb_gtk -l pwr_wb -lpwr_ge_gtk -lpwr_ge \ -lpwr_ge_gtk -lpwr_ge -lpwr_wb_gtk -lpwr_wb -lpwr_wb_gtk -l pwr_wb -lpwr_ge_gtk -lpwr_ge \
-lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow -lpwr_rt \ -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow -lpwr_cow_gtk -lpwr_cow -lpwr_rt \
-lpwr_cow_gtk -lpwr_cow -lpwr_co -lpwr_flow_gtk -lpwr_flow \ -lpwr_co -lpwr_flow_gtk -lpwr_flow \
`pkg-config --libs gtk+-2.0` \ `pkg-config --libs gtk+-2.0` \
-lpwr_msg_dummy -lantlr \ -lpwr_msg_dummy -lantlr \
-lcrypt -lrpcsvc -lpthread -lm -ldb_cxx -lz $(linkmysql) -lcrypt -lrpcsvc -lpthread -lm -ldb_cxx -lz $(linkmysql)
......
xtt/exp/ge/src/pwr_c_ai.pwg
View file @ 364bcc76
...@@ -4,22 +4,22 @@ ...@@ -4,22 +4,22 @@
100 20 100 20
135 20 135 20
101 20 101 20
102 -33 102 124
103 -75 103 -115
104 3.89525 104 3.89525
136 3.89525 136 3.89525
105 100 105 100
106 -6 106 2
107 -14 107 -22
108 41.6019 108 41.6019
109 0.7 109 0.7
110 12.6985 110 12.6985
111 0.96412 111 0.96412
116 0 116 22
117 0 117 0
118 131 118 154
119 118 119 118
120 1 120 0
121 Claes context 121 Claes context
122 0 122 0
126 1 126 1
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
134 134
22 22
2200 0 2200 0
2201 59 2201 61
2202 pwr_c_ai 2202 pwr_c_ai
2203 51 2203 51
2205 0 2205 0
...@@ -89,6 +89,118 @@ pwr_exe: ...@@ -89,6 +89,118 @@ pwr_exe:
123 123
2 2
3 3
300 pwr_smallbutton
301
2
19
1904
1900 2.4
1901 0.2
1902 1.05
1903 0.2
1908 0
1909 102
1910 102
1911 1
1915 1
1913 16
1916 2
1914 0
1918 0
1919 0
1920 0
1917 0
1921 0
1922 4
1923 0
1907 0
1906
1905
5
500 0
501 1
504 1
505 1
502
7
700 0.2
701 0.2
99
503
7
700 2.4
701 1.05
99
99
1912
28
2800 1
2801 0
2802 6.07153e-17
2803 0
2804 1
2805 -2.63678e-16
2806 0
99
99
29
2907
13
1300 1
1301 304
1306 0
1302 2
1305 1
1303
7
700 0.55
701 0.65
99
1304 0
1307 0
99
2908
28
2800 1
2801 0
2802 -0.1
2803 0
2804 1
2805 0.2
2806 0
99
2901 2
99
99
302 0
304 0
303
305 0
306
307
308 0
321 16
309 0
313 0
322 0
323 0
324 0
325 0
326 0
327 0
310 0
311 0
312 JopSmallbutton
314
315 1
316 1
317 0
318 0
319 0
320 0
328 139170568
99
3
300 pwr_buttoncommandcenter 300 pwr_buttoncommandcenter
301 301
2 2
...@@ -3860,118 +3972,6 @@ pwr_exe: ...@@ -3860,118 +3972,6 @@ pwr_exe:
99 99
99 99
3 3
300 pwr_smallbutton
301
2
19
1904
1900 2.4
1901 0.2
1902 1.05
1903 0.2
1908 0
1909 102
1910 102
1911 1
1915 1
1913 16
1916 2
1914 0
1918 0
1919 0
1920 0
1917 0
1921 0
1922 4
1923 0
1907 0
1906
1905
5
500 0
501 1
504 1
505 1
502
7
700 0.2
701 0.2
99
503
7
700 2.4
701 1.05
99
99
1912
28
2800 1
2801 0
2802 6.07153e-17
2803 0
2804 1
2805 -2.63678e-16
2806 0
99
99
29
2907
13
1300 1
1301 304
1306 0
1302 2
1305 1
1303
7
700 0.55
701 0.65
99
1304 0
1307 0
99
2908
28
2800 1
2801 0
2802 -0.1
2803 0
2804 1
2805 0.2
2806 0
99
2901 2
99
99
302 0
304 0
303
305 0
306
307
308 0
321 16
309 0
313 0
322 0
323 0
324 0
325 0
326 0
327 0
310 0
311 0
312 JopSmallbutton
314
315 1
316 1
317 0
318 0
319 0
320 0
328 143681912
99
3
300 pwr_sliderbackground1 300 pwr_sliderbackground1
301 301
2 2
...@@ -4697,38 +4697,157 @@ pwr_exe: ...@@ -4697,38 +4697,157 @@ pwr_exe:
320 0 320 0
328 143681912 328 143681912
99 99
99 3
124 300 pwr_smallbuttoncenter
2 301
99
125
2 2
30 19
3004 O52 1904 O0
3000 5.6 1900 2.4
3001 1.1 1901 0.2
3002 3.08703 1902 1.05
3003 2.23703 1903 0.2
3008 103 1908 0
3010 4 1909 102
3007 0 1910 102
3006 1911 1
3005 1915 1
9 1913 16
900 4 1916 2
901 303 1914 0
904 0 1918 0
902 Description 1919 0
903 1920 0
7 1917 0
700 1.1 1921 0
701 2.5 1922 2
99 1923 0
99 1907 0
3009 1906
28 1905
2800 1 5
2801 0 500 0
501 1
504 1
505 1
502
7
700 0.2
701 0.2
99
503
7
700 2.4
701 1.05
99
99
1912
28
2800 1
2801 0
2802 6.07153e-17
2803 0
2804 1
2805 -2.63678e-16
2806 0
99
99
29
2907
13
1300 1
1301 304
1306 0
1302 2
1305 1
1303
7
700 0.55
701 0.65
99
1304 0
1307 0
99
2908
28
2800 1
2801 0
2802 0.781156
2803 0
2804 1
2805 0.2
2806 0
99
2901 0
99
99
302 0
304 0
303
305 0
306
307
308 0
321 16
309 0
313 0
322 0
323 0
324 0
325 0
326 0
327 0
310 0
311 0
312
314
315 1
316 1
317 0
318 0
319 0
320 0
328 0
329
1
100 1
101 1
102 33619964
103 0
99
99
99
124
2
99
125
2
30
3004 O52
3000 5.6
3001 1.1
3002 3.08703
3003 2.23703
3008 103
3010 4
3007 0
3006
3005
9
900 4
901 303
904 0
902 Description
903
7
700 1.1
701 2.5
99
99
3009
28
2800 1
2801 0
2802 2.91434e-16 2802 2.91434e-16
2803 0 2803 0
2804 1 2804 1
...@@ -5698,139 +5817,6 @@ pwr_exe: ...@@ -5698,139 +5817,6 @@ pwr_exe:
99 99
99 99
27 27
2703 10000
2704 10000
2722 10000
2705 10000
2723 10000
2706 10000
2708 1
2709 1
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_smallbutton
1002 TrendHold
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 29.2086
1007 26.3486
1008 12.4662
1009 11.6162
1013 29.2086
1014 26.3486
1015 12.4662
1016 11.6162
1003
0
8
0
0
0
0
0
0
0
0
1004
" Hold"
1001
7
700 19.4206
701 11.9411
99
1010 $local.TrendHold##Boolean
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 1000
1017 9999
1027 9999
1026 65535
1028 0
1029
99
2707
28
2800 1.3
2801 0
2802 26.0886
2803 0
2804 1
2805 11.4162
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 4
2721
1
100 4
101 16
102 65535
103 0
2
200 !$local.TrendHold##Boolean
201 102
99
53
5300 $local.TrendHold##Boolean
99
99
99
27
2703 46 2703 46
2704 41 2704 41
2722 10000 2722 10000
...@@ -6176,140 +6162,7 @@ pwr_exe: ...@@ -6176,140 +6162,7 @@ pwr_exe:
700 40.2932 700 40.2932
701 3.96067 701 3.96067
99 99
1010 $object.ActualValue##Float32 1010 $object.ActualValue##Float32
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 0
1017 9999
1027 9999
1026 6
1028 0
1029
99
2707
28
2800 0.618182
2801 0
2802 40.6005
2803 0
2804 0.538462
2805 3.86136
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 9999
2721
1
100 1
101 1
102 6
103 0
60
6000 $object.ActualValue##Float32
6001 $object.PresMinLimit##Float32
6002 $object.PresMaxLimit##Float32
6003 !$local.SliderEnable##Boolean
99
99
99
99
27
2703 10000
2704 10000
2722 10000
2705 10000
2723 10000
2706 10000
2708 1
2709 1
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_smallbutton
1002 SliderDisable
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 38.1283
1007 35.0603
1008 12.4662
1009 11.6162
1013 38.1283
1014 35.0603
1015 12.4662
1016 11.6162
1003
0
8
0
0
0
0
0
0
0
0
1004
" Slider"
1001
7
700 19.4206
701 11.9411
99
1010 $local.SliderDisable##Boolean
1011 1011
1018 1018
1019 1019
...@@ -6319,7 +6172,7 @@ pwr_exe: ...@@ -6319,7 +6172,7 @@ pwr_exe:
1023 1023
1024 1024
1025 1025
1012 1000 1012 0
1017 9999 1017 9999
1027 9999 1027 9999
1026 6 1026 6
...@@ -6328,12 +6181,12 @@ pwr_exe: ...@@ -6328,12 +6181,12 @@ pwr_exe:
99 99
2707 2707
28 28
2800 1.39455 2800 0.618182
2801 0 2801 0
2802 34.7814 2802 40.6005
2803 0 2803 0
2804 1 2804 0.538462
2805 11.4162 2805 3.86136
2806 0 2806 0
99 99
2716 0 2716 0
...@@ -6343,19 +6196,19 @@ pwr_exe: ...@@ -6343,19 +6196,19 @@ pwr_exe:
2724 0 2724 0
2727 0 2727 0
2728 303 2728 303
2729 4 2729 9999
2721 2721
1 1
100 4 100 1
101 16 101 1
102 6 102 6
103 0 103 0
2 60
200 !$local.SliderEnable##Boolean 6000 $object.ActualValue##Float32
201 102 6001 $object.PresMinLimit##Float32
6002 $object.PresMaxLimit##Float32
6003 !$local.SliderEnable##Boolean
99 99
53
5300 $local.SliderEnable##Boolean
99 99
99 99
99 99
...@@ -9104,5 +8957,271 @@ pwr_exe: ...@@ -9104,5 +8957,271 @@ pwr_exe:
99 99
99 99
99 99
27
2703 10000
2704 32
2722 10000
2705 32
2723 10000
2706 10000
2708 0
2709 0
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_smallbuttoncenter
1002 TrendHold
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 29.2986
1007 26.4486
1008 12.5
1009 11.65
1013 29.2986
1014 26.4486
1015 12.5
1016 11.65
1003
0
5
0
0
0
0
0
0
0
0
1004
"Hold"
1001
7
700 26.35
701 13.85
99
1010
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 0
1017 9999
1027 9999
1026 33619964
1028 0
1029
99
2707
28
2800 1.29545
2801 0
2802 26.1895
2803 0
2804 1
2805 11.45
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 4
2721
1
100 4
101 16
102 65535
103 0
2
200 !$local.TrendHold##Boolean
201 102
99
53
5300 $local.TrendHold##Boolean
99
99
99
27
2703 10000
2704 32
2722 10000
2705 32
2723 10000
2706 10000
2708 0
2709 0
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_smallbuttoncenter
1002 O60
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 38.2095
1007 35.0486
1008 12.5
1009 11.65
1013 38.2095
1014 35.0486
1015 12.5
1016 11.65
1003
0
7
0
0
0
0
0
0
0
0
1004
"Slider"
1001
7
700 26.35
701 13.85
99
1010
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 0
1017 9999
1027 9999
1026 33619964
1028 0
1029
99
2707
28
2800 1.43678
2801 0
2802 34.7612
2803 0
2804 1
2805 11.45
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 4
2721
1
100 4
101 16
102 6
103 0
2
200 !$local.SliderEnable##Boolean
201 102
99
53
5300 $local.SliderEnable##Boolean
99
99
99
99 99
99 99
xtt/exp/ge/src/pwr_c_ao.pwg
View file @ 364bcc76
...@@ -4,22 +4,22 @@ ...@@ -4,22 +4,22 @@
100 20 100 20
135 20 135 20
101 20 101 20
102 -91 102 239
103 -82 103 -117
104 3.89525 104 3.89525
136 3.89525 136 3.89525
105 100 105 100
106 -17 106 2
107 -15 107 -22
108 41.652 108 41.652
109 0.65 109 0.65
110 12.6985 110 12.6985
111 0.96412 111 0.96412
116 0 116 44
117 0 117 0
118 131 118 176
119 118 119 118
120 1 120 0
121 Claes context 121 Claes context
122 0 122 0
126 1 126 1
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
134 134
22 22
2200 0 2200 0
2201 55 2201 57
2202 pwr_c_ao 2202 pwr_c_ao
2203 51 2203 51
2205 0 2205 0
...@@ -89,6 +89,237 @@ pwr_exe: ...@@ -89,6 +89,237 @@ pwr_exe:
123 123
2 2
3 3
300 pwr_smallbutton
301
2
19
1904
1900 2.4
1901 0.2
1902 1.05
1903 0.2
1908 0
1909 102
1910 102
1911 1
1915 1
1913 16
1916 2
1914 0
1918 0
1919 0
1920 0
1917 0
1921 0
1922 4
1923 0
1907 0
1906
1905
5
500 0
501 1
504 1
505 1
502
7
700 0.2
701 0.2
99
503
7
700 2.4
701 1.05
99
99
1912
28
2800 1
2801 0
2802 6.07153e-17
2803 0
2804 1
2805 -2.63678e-16
2806 0
99
99
29
2907
13
1300 1
1301 304
1306 0
1302 2
1305 1
1303
7
700 0.55
701 0.65
99
1304 0
1307 0
99
2908
28
2800 1
2801 0
2802 -0.1
2803 0
2804 1
2805 0.2
2806 0
99
2901 2
99
99
302 0
304 0
303
305 0
306
307
308 0
321 16
309 0
313 0
322 0
323 0
324 0
325 0
326 0
327 0
310 0
311 0
312 JopSmallbutton
314
315 1
316 1
317 0
318 0
319 0
320 0
328 139170568
99
3
300 pwr_smallbuttoncenter
301
2
19
1904 O0
1900 2.4
1901 0.2
1902 1.05
1903 0.2
1908 0
1909 102
1910 102
1911 1
1915 1
1913 16
1916 2
1914 0
1918 0
1919 0
1920 0
1917 0
1921 0
1922 2
1923 0
1907 0
1906
1905
5
500 0
501 1
504 1
505 1
502
7
700 0.2
701 0.2
99
503
7
700 2.4
701 1.05
99
99
1912
28
2800 1
2801 0
2802 6.07153e-17
2803 0
2804 1
2805 -2.63678e-16
2806 0
99
99
29
2907
13
1300 1
1301 304
1306 0
1302 2
1305 1
1303
7
700 0.55
701 0.65
99
1304 0
1307 0
99
2908
28
2800 1
2801 0
2802 0.781156
2803 0
2804 1
2805 0.2
2806 0
99
2901 0
99
99
302 0
304 0
303
305 0
306
307
308 0
321 16
309 0
313 0
322 0
323 0
324 0
325 0
326 0
327 0
310 0
311 0
312
314
315 1
316 1
317 0
318 0
319 0
320 0
328 0
329
1
100 1
101 1
102 33619964
103 0
99
99
3
300 pwr_buttoncommandcenter 300 pwr_buttoncommandcenter
301 301
2 2
...@@ -3860,119 +4091,7 @@ pwr_exe: ...@@ -3860,119 +4091,7 @@ pwr_exe:
328 10000 328 10000
99 99
3 3
300 pwr_smallbutton 300 pwr_sliderbackground1
301
2
19
1904
1900 2.4
1901 0.2
1902 1.05
1903 0.2
1908 0
1909 102
1910 102
1911 1
1915 1
1913 16
1916 2
1914 0
1918 0
1919 0
1920 0
1917 0
1921 0
1922 4
1923 0
1907 0
1906
1905
5
500 0
501 1
504 1
505 1
502
7
700 0.2
701 0.2
99
503
7
700 2.4
701 1.05
99
99
1912
28
2800 1
2801 0
2802 6.07153e-17
2803 0
2804 1
2805 -2.63678e-16
2806 0
99
99
29
2907
13
1300 1
1301 304
1306 0
1302 2
1305 1
1303
7
700 0.55
701 0.65
99
1304 0
1307 0
99
2908
28
2800 1
2801 0
2802 -0.1
2803 0
2804 1
2805 0.2
2806 0
99
2901 2
99
99
302 0
304 0
303
305 0
306
307
308 0
321 16
309 0
313 0
322 0
323 0
324 0
325 0
326 0
327 0
310 0
311 0
312 JopSmallbutton
314
315 1
316 1
317 0
318 0
319 0
320 0
328 144230704
99
3
300 pwr_sliderbackground1
301 301
2 2
26 26
...@@ -5698,139 +5817,6 @@ pwr_exe: ...@@ -5698,139 +5817,6 @@ pwr_exe:
99 99
99 99
27 27
2703 10000
2704 10000
2722 10000
2705 10000
2723 10000
2706 10000
2708 1
2709 1
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_smallbutton
1002 TrendHold
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 29.2086
1007 26.3486
1008 12.4662
1009 11.6162
1013 29.2086
1014 26.3486
1015 12.4662
1016 11.6162
1003
0
8
0
0
0
0
0
0
0
0
1004
" Hold"
1001
7
700 19.4206
701 11.9411
99
1010 $local.TrendHold##Boolean
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 1000
1017 9999
1027 9999
1026 65535
1028 0
1029
99
2707
28
2800 1.3
2801 0
2802 26.0886
2803 0
2804 1
2805 11.4162
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 4
2721
1
100 4
101 16
102 65535
103 0
2
200 !$local.TrendHold##Boolean
201 102
99
53
5300 $local.TrendHold##Boolean
99
99
99
27
2703 46 2703 46
2704 41 2704 41
2722 10000 2722 10000
...@@ -6195,145 +6181,12 @@ pwr_exe: ...@@ -6195,145 +6181,12 @@ pwr_exe:
99 99
2707 2707
28 28
2800 0.618182 2800 0.618182
2801 0
2802 40.6005
2803 0
2804 0.538462
2805 3.86136
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 9999
2721
1
100 1
101 1
102 6
103 0
60
6000 $object.ActualValue##Float32
6001 $object.PresMinLimit##Float32
6002 $object.PresMaxLimit##Float32
6003 !$local.SliderEnable##Boolean
99
99
99
99
27
2703 10000
2704 10000
2722 10000
2705 10000
2723 10000
2706 10000
2708 1
2709 1
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_smallbutton
1002 SliderDisable
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 38.1321
1007 35.0603
1008 12.4662
1009 11.6162
1013 38.1321
1014 35.0603
1015 12.4662
1016 11.6162
1003
0
8
0
0
0
0
0
0
0
0
1004
" Slider"
1001
7
700 19.4206
701 11.9411
99
1010 $local.SliderDisable##Boolean
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 1000
1017 9999
1027 9999
1026 6
1028 0
1029
99
2707
28
2800 1.3963
2801 0 2801 0
2802 34.781 2802 40.6005
2803 0 2803 0
2804 1 2804 0.538462
2805 11.4162 2805 3.86136
2806 0 2806 0
99 99
2716 0 2716 0
...@@ -6343,19 +6196,19 @@ pwr_exe: ...@@ -6343,19 +6196,19 @@ pwr_exe:
2724 0 2724 0
2727 0 2727 0
2728 303 2728 303
2729 4 2729 9999
2721 2721
1 1
100 4 100 1
101 16 101 1
102 6 102 6
103 0 103 0
2 60
200 !$local.SliderEnable##Boolean 6000 $object.ActualValue##Float32
201 102 6001 $object.PresMinLimit##Float32
6002 $object.PresMaxLimit##Float32
6003 !$local.SliderEnable##Boolean
99 99
53
5300 $local.SliderEnable##Boolean
99 99
99 99
99 99
...@@ -9104,5 +8957,271 @@ pwr_exe: ...@@ -9104,5 +8957,271 @@ pwr_exe:
99 99
99 99
99 99
27
2703 10000
2704 32
2722 10000
2705 32
2723 10000
2706 10000
2708 0
2709 0
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_smallbuttoncenter
1002 TrendHold
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 29.1986
1007 26.3486
1008 12.5
1009 11.65
1013 29.1986
1014 26.3486
1015 12.5
1016 11.65
1003
0
5
0
0
0
0
0
0
0
0
1004
"Hold"
1001
7
700 26.35
701 13.85
99
1010
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 0
1017 9999
1027 9999
1026 33619964
1028 0
1029
99
2707
28
2800 1.29545
2801 0
2802 26.0895
2803 0
2804 1
2805 11.45
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 4
2721
1
100 4
101 16
102 65535
103 0
2
200 !$local.TrendHold##Boolean
201 102
99
53
5300 $local.TrendHold##Boolean
99
99
99
27
2703 10000
2704 32
2722 10000
2705 32
2723 10000
2706 10000
2708 0
2709 0
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_smallbuttoncenter
1002 O56
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 38.1095
1007 34.9486
1008 12.5
1009 11.65
1013 38.1095
1014 34.9486
1015 12.5
1016 11.65
1003
0
7
0
0
0
0
0
0
0
0
1004
"Slider"
1001
7
700 26.35
701 13.85
99
1010
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 0
1017 9999
1027 9999
1026 33619964
1028 0
1029
99
2707
28
2800 1.43678
2801 0
2802 34.6612
2803 0
2804 1
2805 11.45
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 4
2721
1
100 4
101 16
102 6
103 0
2
200 !$local.SliderEnable##Boolean
201 102
99
53
5300 $local.SliderEnable##Boolean
99
99
99
99 99
99 99
xtt/exp/ge/src/pwr_c_av.pwg
View file @ 364bcc76
This diff is collapsed.
xtt/exp/ge/src/pwr_c_di.pwg
View file @ 364bcc76
This diff is collapsed.
xtt/exp/ge/src/pwr_c_do.pwg
View file @ 364bcc76
This diff is collapsed.
xtt/exp/ge/src/pwr_c_dv.pwg
View file @ 364bcc76
...@@ -4,22 +4,22 @@ ...@@ -4,22 +4,22 @@
100 20 100 20
135 20 135 20
101 20 101 20
102 -67 102 210
103 -119 103 -114
104 3.89525 104 3.89525
136 3.89525 136 3.89525
105 100 105 100
106 -13 106 2
107 -23 107 -22
108 40.5857 108 40.5857
109 0.702272 109 0.702272
110 6.86591 110 6.86591
111 1.25546 111 1.25546
116 0 116 38
117 0 117 0
118 131 118 170
119 118 119 118
120 1 120 0
121 Claes context 121 Claes context
122 0 122 0
126 1 126 1
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
134 134
22 22
2200 0 2200 0
2201 47 2201 49
2202 pwr_c_dv 2202 pwr_c_dv
2203 51 2203 51
2205 0 2205 0
...@@ -201,6 +201,125 @@ pwr_exe: ...@@ -201,6 +201,125 @@ pwr_exe:
328 139170568 328 139170568
99 99
3 3
300 pwr_smallbuttoncenter
301
2
19
1904 O0
1900 2.4
1901 0.2
1902 1.05
1903 0.2
1908 0
1909 102
1910 102
1911 1
1915 1
1913 16
1916 2
1914 0
1918 0
1919 0
1920 0
1917 0
1921 0
1922 2
1923 0
1907 0
1906
1905
5
500 0
501 1
504 1
505 1
502
7
700 0.2
701 0.2
99
503
7
700 2.4
701 1.05
99
99
1912
28
2800 1
2801 0
2802 6.07153e-17
2803 0
2804 1
2805 -2.63678e-16
2806 0
99
99
29
2907
13
1300 1
1301 304
1306 0
1302 2
1305 1
1303
7
700 0.55
701 0.65
99
1304 0
1307 0
99
2908
28
2800 1
2801 0
2802 0.781156
2803 0
2804 1
2805 0.2
2806 0
99
2901 0
99
99
302 0
304 0
303
305 0
306
307
308 0
321 16
309 0
313 0
322 0
323 0
324 0
325 0
326 0
327 0
310 0
311 0
312
314
315 1
316 1
317 0
318 0
319 0
320 0
328 0
329
1
100 1
101 1
102 33619964
103 0
99
99
3
300 pwr_mbopenobject 300 pwr_mbopenobject
301 301
2 2
...@@ -5036,139 +5155,6 @@ pwr_exe: ...@@ -5036,139 +5155,6 @@ pwr_exe:
99 99
99 99
27 27
2703 10000
2704 10000
2722 10000
2705 10000
2723 10000
2706 10000
2708 1
2709 1
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_smallbutton
1002 TrendHold
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 24.7377
1007 21.8777
1008 6.62311
1009 5.77311
1013 24.7377
1014 21.8777
1015 6.62311
1016 5.77311
1003
0
8
0
0
0
0
0
0
0
0
1004
" Hold"
1001
7
700 19.4206
701 11.9411
99
1010 $local.TrendHold##Boolean
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 1000
1017 9999
1027 9999
1026 65535
1028 0
1029
99
2707
28
2800 1.3
2801 0
2802 21.6177
2803 0
2804 1
2805 5.57311
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 4
2721
1
100 4
101 16
102 65535
103 0
2
200 !$local.TrendHold##Boolean
201 102
99
53
5300 $local.TrendHold##Boolean
99
99
99
27
2703 56 2703 56
2704 51 2704 51
2722 10000 2722 10000
...@@ -8063,13 +8049,13 @@ pwr_exe: ...@@ -8063,13 +8049,13 @@ pwr_exe:
99 99
27 27
2703 10000 2703 10000
2704 10000 2704 32
2722 10000 2722 10000
2705 10000 2705 32
2723 10000 2723 10000
2706 10000 2706 10000
2708 1 2708 0
2709 1 2709 0
2710 0 2710 0
2711 0 2711 0
2712 0 2712 0
...@@ -8083,8 +8069,8 @@ pwr_exe: ...@@ -8083,8 +8069,8 @@ pwr_exe:
2701 2701
2700 2700
10 10
1000 pwr_smallbutton 1000 pwr_smallbuttoncenter
1002 O42 1002 TrendHold
1005 1005
0 0
0 0
...@@ -8118,17 +8104,17 @@ pwr_exe: ...@@ -8118,17 +8104,17 @@ pwr_exe:
0 0
0 0
0 0
1006 37.1362 1006 29.2986
1007 34.0603 1007 26.4486
1008 6.6662 1008 6.65
1009 5.8162 1009 5.8
1013 37.1362 1013 29.2986
1014 34.0603 1014 26.4486
1015 6.6662 1015 6.65
1016 5.8162 1016 5.8
1003 1003
0 0
8 5
0 0
0 0
0 0
...@@ -8138,13 +8124,13 @@ pwr_exe: ...@@ -8138,13 +8124,13 @@ pwr_exe:
0 0
0 0
1004 1004
" Slider" "Hold"
1001 1001
7 7
700 19.4206 700 26.35
701 11.9411 701 13.85
99 99
1010 $local.SliderDisable##Boolean 1010
1011 1011
1018 1018
1019 1019
...@@ -8154,21 +8140,154 @@ pwr_exe: ...@@ -8154,21 +8140,154 @@ pwr_exe:
1023 1023
1024 1024
1025 1025
1012 1000 1012 0
1017 9999 1017 9999
1027 9999 1027 9999
1026 6 1026 33619964
1028 0
1029
99
2707
28
2800 1.29545
2801 0
2802 26.1895
2803 0
2804 1
2805 5.6
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 4
2721
1
100 4
101 16
102 65535
103 0
2
200 !$local.TrendHold##Boolean
201 102
99
53
5300 $local.TrendHold##Boolean
99
99
99
27
2703 10000
2704 32
2722 10000
2705 32
2723 10000
2706 10000
2708 0
2709 0
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_smallbuttoncenter
1002 O48
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 38.2095
1007 35.0486
1008 6.65
1009 5.8
1013 38.2095
1014 35.0486
1015 6.65
1016 5.8
1003
0
7
0
0
0
0
0
0
0
0
1004
"Slider"
1001
7
700 26.35
701 13.85
99
1010
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 0
1017 9999
1027 9999
1026 33619964
1028 0 1028 0
1029 1029
99 99
2707 2707
28 28
2800 1.39811 2800 1.43678
2801 0 2801 0
2802 33.7807 2802 34.7612
2803 0 2803 0
2804 1 2804 1
2805 5.6162 2805 5.6
2806 0 2806 0
99 99
2716 0 2716 0
......
xtt/exp/ge/src/pwr_c_ii.pwg
View file @ 364bcc76
This diff is collapsed.
xtt/exp/ge/src/pwr_c_io.pwg
View file @ 364bcc76
This diff is collapsed.
xtt/exp/ge/src/pwr_c_iv.pwg
View file @ 364bcc76
This diff is collapsed.
xtt/exp/ge/src/pwr_c_pid.pwg
View file @ 364bcc76
This diff is collapsed.
xtt/lib/cow/gtk/cow_wow_gtk.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/cow/gtk/cow_xhelp_gtk.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/cow/src/cow_xhelpnav.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/flow/gtk/flow_draw_gtk.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/flow/src/flow.h
View file @ 364bcc76
...@@ -158,6 +158,11 @@ typedef enum { ...@@ -158,6 +158,11 @@ typedef enum {
flow_eDrawType_Inherit = 9999 flow_eDrawType_Inherit = 9999
} flow_eDrawType; } flow_eDrawType;
typedef enum {
flow_eTextCoding_ISO8859_1,
flow_eTextCoding_UTF_8
} flow_eTextCoding;
typedef enum { typedef enum {
draw_eCursor_Normal, draw_eCursor_Normal,
draw_eCursor_CrossHair, draw_eCursor_CrossHair,
......
xtt/lib/flow/src/flow_browapi.cpp
View file @ 364bcc76
...@@ -771,3 +771,9 @@ int brow_GetObjectLevel( brow_tObject object) ...@@ -771,3 +771,9 @@ int brow_GetObjectLevel( brow_tObject object)
{ {
return ((FlowNode *)object)->get_level(); return ((FlowNode *)object)->get_level();
} }
void brow_SetTextCoding( brow_tCtx ctx, flow_eTextCoding coding)
{
ctx->set_text_coding( coding);
}
xtt/lib/flow/src/flow_browapi.h
View file @ 364bcc76
This diff is collapsed.
xtt/lib/flow/src/flow_ctx.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/flow/src/flow_ctx.h
View file @ 364bcc76
This diff is collapsed.
xtt/lib/ge/src/ge_curve.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/ge/src/ge_graph.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/glow/gtk/glow_draw_gtk.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/glow/src/glow.h
View file @ 364bcc76
This diff is collapsed.
xtt/lib/glow/src/glow_growapi.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/glow/src/glow_growapi.h
View file @ 364bcc76
This diff is collapsed.
xtt/lib/glow/src/glow_growctx.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/glow/src/glow_growctx.h
View file @ 364bcc76
This diff is collapsed.
xtt/lib/xtt/gtk/xtt_ev_gtk.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/xtt/src/xtt_evlist.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/xtt/src/xtt_xnav.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/xtt/src/xtt_xnav_command.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/lib/xtt/src/xtt_xnav_help.cpp
View file @ 364bcc76
This diff is collapsed.
xtt/mmi/xtt/en_us/xtt_lng.dat
View file @ 364bcc76
This diff is collapsed.
xtt/mmi/xtt/zh_cn/acceptlicense.txt 0 → 100644
View file @ 364bcc76
This diff is collapsed.
xtt/mmi/xtt/zh_cn/license.txt 0 → 100644
View file @ 364bcc76
This diff is collapsed.
xtt/mmi/xtt/zh_cn/xtt_lng.dat 0 → 100644
View file @ 364bcc76
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7