Commit d657e28c authored by claes's avatar claes

Xtt Motif version can be started from rtmon

parent 4f097a00
/* /*
* Proview $Id: co_statusmon_nodelist_gtk.cpp,v 1.4 2007-05-25 13:39:28 claes Exp $ * Proview $Id: co_statusmon_nodelist_gtk.cpp,v 1.5 2007-06-01 11:29:02 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -126,6 +126,28 @@ NodelistGtk::NodelistGtk( void *nodelist_parent_ctx, ...@@ -126,6 +126,28 @@ NodelistGtk::NodelistGtk( void *nodelist_parent_ctx,
GtkWidget *view_pop_events = gtk_check_menu_item_new_with_mnemonic(CoWowGtk::translate_utf8("_Pop Events")); GtkWidget *view_pop_events = gtk_check_menu_item_new_with_mnemonic(CoWowGtk::translate_utf8("_Pop Events"));
g_signal_connect(view_pop_events, "activate", G_CALLBACK(activate_pop_events), this); g_signal_connect(view_pop_events, "activate", G_CALLBACK(activate_pop_events), this);
// Submenu Remote GUI
GSList *rg_group = NULL;
GtkWidget *view_gui_gtk = gtk_radio_menu_item_new_with_mnemonic( rg_group, "_GTK");
rg_group = gtk_radio_menu_item_get_group( GTK_RADIO_MENU_ITEM(view_gui_gtk));
g_signal_connect( view_gui_gtk, "activate",
G_CALLBACK(activate_gui_gtk), this);
GtkWidget *view_gui_motif = gtk_radio_menu_item_new_with_mnemonic( rg_group, "_Motif");
rg_group = gtk_radio_menu_item_get_group( GTK_RADIO_MENU_ITEM(view_gui_motif));
g_signal_connect( view_gui_motif, "activate",
G_CALLBACK(activate_gui_motif), this);
GtkWidget *view_gui = gtk_menu_item_new_with_mnemonic( "_Remote GUI");
GtkMenu *view_gui_menu = (GtkMenu *) g_object_new( GTK_TYPE_MENU, NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(view_gui_menu), view_gui_gtk);
gtk_menu_shell_append(GTK_MENU_SHELL(view_gui_menu), view_gui_motif);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(view_gui),
GTK_WIDGET(view_gui_menu));
GtkWidget *view_zoom_in = gtk_image_menu_item_new_with_mnemonic(CoWowGtk::translate_utf8("Zoom _In")); GtkWidget *view_zoom_in = gtk_image_menu_item_new_with_mnemonic(CoWowGtk::translate_utf8("Zoom _In"));
gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(view_zoom_in), gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(view_zoom_in),
gtk_image_new_from_stock( "gtk-zoom-in", GTK_ICON_SIZE_MENU)); gtk_image_new_from_stock( "gtk-zoom-in", GTK_ICON_SIZE_MENU));
...@@ -148,6 +170,7 @@ NodelistGtk::NodelistGtk( void *nodelist_parent_ctx, ...@@ -148,6 +170,7 @@ NodelistGtk::NodelistGtk( void *nodelist_parent_ctx,
GtkMenu *view_menu = (GtkMenu *) g_object_new( GTK_TYPE_MENU, NULL); GtkMenu *view_menu = (GtkMenu *) g_object_new( GTK_TYPE_MENU, NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_show_events); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_show_events);
gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_pop_events); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_pop_events);
gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_gui);
gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_zoom_in); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_zoom_in);
gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_zoom_out); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_zoom_out);
gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_zoom_reset); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), view_zoom_reset);
...@@ -379,6 +402,26 @@ void NodelistGtk::activate_pop_events( GtkWidget *w, gpointer data) ...@@ -379,6 +402,26 @@ void NodelistGtk::activate_pop_events( GtkWidget *w, gpointer data)
nodelist->nodelistnav->set_msgw_pop( set); nodelist->nodelistnav->set_msgw_pop( set);
} }
void NodelistGtk::activate_gui_motif( GtkWidget *w, gpointer data)
{
Nodelist *nodelist = (Nodelist *)data;
int set = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM(w)) ? 1 : 0;
if ( set)
strcpy( nodelist->remote_gui, "motif");
else
strcpy( nodelist->remote_gui, "");
}
void NodelistGtk::activate_gui_gtk( GtkWidget *w, gpointer data)
{
Nodelist *nodelist = (Nodelist *)data;
int set = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM(w)) ? 1 : 0;
if ( set)
strcpy( nodelist->remote_gui, "");
}
void NodelistGtk::activate_zoom_in( GtkWidget *w, gpointer data) void NodelistGtk::activate_zoom_in( GtkWidget *w, gpointer data)
{ {
Nodelist *nodelist = (Nodelist *)data; Nodelist *nodelist = (Nodelist *)data;
......
/* /*
* Proview $Id: co_statusmon_nodelist_gtk.h,v 1.3 2007-05-25 13:39:28 claes Exp $ * Proview $Id: co_statusmon_nodelist_gtk.h,v 1.4 2007-06-01 11:29:02 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -70,6 +70,8 @@ class NodelistGtk : public Nodelist { ...@@ -70,6 +70,8 @@ class NodelistGtk : public Nodelist {
static void activate_save( GtkWidget*w, gpointer data); static void activate_save( GtkWidget*w, gpointer data);
static void activate_show_events( GtkWidget *w, gpointer data); static void activate_show_events( GtkWidget *w, gpointer data);
static void activate_pop_events( GtkWidget *w, gpointer data); static void activate_pop_events( GtkWidget *w, gpointer data);
static void activate_gui_motif( GtkWidget *w, gpointer data);
static void activate_gui_gtk( GtkWidget *w, gpointer data);
static void activate_zoom_in( GtkWidget*w, gpointer data); static void activate_zoom_in( GtkWidget*w, gpointer data);
static void activate_zoom_out( 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_zoom_reset( GtkWidget*w, gpointer data);
......
/* /*
* Proview $Id: co_statusmon_nodelist.cpp,v 1.5 2007-05-25 13:39:28 claes Exp $ * Proview $Id: co_statusmon_nodelist.cpp,v 1.6 2007-06-01 11:29:02 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -40,6 +40,7 @@ Nodelist::Nodelist( void *nodelist_parent_ctx, ...@@ -40,6 +40,7 @@ Nodelist::Nodelist( void *nodelist_parent_ctx,
parent_ctx(nodelist_parent_ctx), parent_ctx(nodelist_parent_ctx),
nodelistnav(NULL), nodelist_displayed(0), help_cb(0), close_cb(0) nodelistnav(NULL), nodelist_displayed(0), help_cb(0), close_cb(0)
{ {
strcpy( remote_gui, "");
*status = 1; *status = 1;
} }
...@@ -132,7 +133,7 @@ void Nodelist::activate_open_xtt() ...@@ -132,7 +133,7 @@ void Nodelist::activate_open_xtt()
} }
get_display( display); get_display( display);
statussrv_XttStart( node_name, "", "", display); statussrv_XttStart( node_name, "", "", display, remote_gui);
} }
void Nodelist::activate_open_opplace() void Nodelist::activate_open_opplace()
...@@ -150,7 +151,7 @@ void Nodelist::activate_open_opplace() ...@@ -150,7 +151,7 @@ void Nodelist::activate_open_opplace()
sts = nodelistnav->get_selected_opplace( opplace); sts = nodelistnav->get_selected_opplace( opplace);
get_display( display); get_display( display);
statussrv_XttStart( node_name, opplace, "", display); statussrv_XttStart( node_name, opplace, "", display, remote_gui);
} }
void Nodelist::activate_open_rtmon() void Nodelist::activate_open_rtmon()
...@@ -166,7 +167,7 @@ void Nodelist::activate_open_rtmon() ...@@ -166,7 +167,7 @@ void Nodelist::activate_open_rtmon()
} }
get_display( display); get_display( display);
statussrv_RtMonStart( node_name, "", display); statussrv_RtMonStart( node_name, "", display, remote_gui);
} }
void Nodelist::activate_save() void Nodelist::activate_save()
......
/* /*
* Proview $Id: co_statusmon_nodelist.h,v 1.3 2007-05-25 13:39:28 claes Exp $ * Proview $Id: co_statusmon_nodelist.h,v 1.4 2007-06-01 11:29:02 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -49,6 +49,7 @@ class Nodelist { ...@@ -49,6 +49,7 @@ class Nodelist {
void (*india_ok_cb)( Nodelist *, char *, char *); void (*india_ok_cb)( Nodelist *, char *, char *);
CoWow *wow; CoWow *wow;
MsgWindow *msg_window; MsgWindow *msg_window;
char remote_gui[20];
virtual void pop() {} virtual void pop() {}
virtual void set_clock_cursor() {} virtual void set_clock_cursor() {}
......
...@@ -183,6 +183,7 @@ ...@@ -183,6 +183,7 @@
<s:element minOccurs="0" maxOccurs="1" name="OpPlace" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="OpPlace" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Language" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="Language" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Display" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="Display" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="GUI" type="s:string" />
</s:sequence> </s:sequence>
</s:complexType> </s:complexType>
</s:element> </s:element>
...@@ -197,6 +198,7 @@ ...@@ -197,6 +198,7 @@
<s:sequence> <s:sequence>
<s:element minOccurs="0" maxOccurs="1" name="Language" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="Language" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Display" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="Display" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="GUI" type="s:string" />
</s:sequence> </s:sequence>
</s:complexType> </s:complexType>
</s:element> </s:element>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "statussrv_H.h" #include "statussrv_H.h"
SOAP_SOURCE_STAMP("@(#) statussrv_C.cpp ver 2.7.9d 2007-05-25 06:59:31 GMT") SOAP_SOURCE_STAMP("@(#) statussrv_C.cpp ver 2.7.9d 2007-05-30 13:46:12 GMT")
#ifndef WITH_NOGLOBAL #ifndef WITH_NOGLOBAL
...@@ -978,6 +978,7 @@ void _s0__RtMonStart::soap_default(struct soap *soap) ...@@ -978,6 +978,7 @@ void _s0__RtMonStart::soap_default(struct soap *soap)
this->soap = soap; this->soap = soap;
((_s0__RtMonStart*)this)->Language = NULL; ((_s0__RtMonStart*)this)->Language = NULL;
((_s0__RtMonStart*)this)->Display = NULL; ((_s0__RtMonStart*)this)->Display = NULL;
((_s0__RtMonStart*)this)->GUI = NULL;
((_s0__RtMonStart*)this)->ClientRequestHandle = NULL; ((_s0__RtMonStart*)this)->ClientRequestHandle = NULL;
/* transient soap skipped */ /* transient soap skipped */
} }
...@@ -987,6 +988,7 @@ void _s0__RtMonStart::soap_serialize(struct soap *soap) const ...@@ -987,6 +988,7 @@ void _s0__RtMonStart::soap_serialize(struct soap *soap) const
(void)soap; /* appease -Wall -Werror */ (void)soap; /* appease -Wall -Werror */
soap_serialize_PointerTostd__string(soap, &((_s0__RtMonStart*)this)->Language); soap_serialize_PointerTostd__string(soap, &((_s0__RtMonStart*)this)->Language);
soap_serialize_PointerTostd__string(soap, &((_s0__RtMonStart*)this)->Display); soap_serialize_PointerTostd__string(soap, &((_s0__RtMonStart*)this)->Display);
soap_serialize_PointerTostd__string(soap, &((_s0__RtMonStart*)this)->GUI);
/* transient soap skipped */ /* transient soap skipped */
} }
...@@ -1010,6 +1012,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__s0__RtMonStart(struct soap *soap, const char ...@@ -1010,6 +1012,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__s0__RtMonStart(struct soap *soap, const char
soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__s0__RtMonStart), type); soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__s0__RtMonStart), type);
soap_out_PointerTostd__string(soap, "s0:Language", -1, &(((_s0__RtMonStart*)a)->Language), ""); soap_out_PointerTostd__string(soap, "s0:Language", -1, &(((_s0__RtMonStart*)a)->Language), "");
soap_out_PointerTostd__string(soap, "s0:Display", -1, &(((_s0__RtMonStart*)a)->Display), ""); soap_out_PointerTostd__string(soap, "s0:Display", -1, &(((_s0__RtMonStart*)a)->Display), "");
soap_out_PointerTostd__string(soap, "s0:GUI", -1, &(((_s0__RtMonStart*)a)->GUI), "");
/* transient soap skipped */ /* transient soap skipped */
soap_element_end_out(soap, tag); soap_element_end_out(soap, tag);
return SOAP_OK; return SOAP_OK;
...@@ -1061,7 +1064,7 @@ SOAP_FMAC3 _s0__RtMonStart * SOAP_FMAC4 soap_in__s0__RtMonStart(struct soap *soa ...@@ -1061,7 +1064,7 @@ SOAP_FMAC3 _s0__RtMonStart * SOAP_FMAC4 soap_in__s0__RtMonStart(struct soap *soa
} }
} }
} }
short soap_flag_Language1 = 1, soap_flag_Display1 = 1; short soap_flag_Language1 = 1, soap_flag_Display1 = 1, soap_flag_GUI1 = 1;
if (soap->body && !*soap->href) if (soap->body && !*soap->href)
{ {
for (;;) for (;;)
...@@ -1076,6 +1079,11 @@ SOAP_FMAC3 _s0__RtMonStart * SOAP_FMAC4 soap_in__s0__RtMonStart(struct soap *soa ...@@ -1076,6 +1079,11 @@ SOAP_FMAC3 _s0__RtMonStart * SOAP_FMAC4 soap_in__s0__RtMonStart(struct soap *soa
{ soap_flag_Display1--; { soap_flag_Display1--;
continue; continue;
} }
if (soap_flag_GUI1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
if (soap_in_PointerTostd__string(soap, "s0:GUI", &(((_s0__RtMonStart*)a)->GUI), "xsd:string"))
{ soap_flag_GUI1--;
continue;
}
/* transient soap skipped */ /* transient soap skipped */
if (soap->error == SOAP_TAG_MISMATCH) if (soap->error == SOAP_TAG_MISMATCH)
soap->error = soap_ignore_element(soap); soap->error = soap_ignore_element(soap);
...@@ -1300,6 +1308,7 @@ void _s0__XttStart::soap_default(struct soap *soap) ...@@ -1300,6 +1308,7 @@ void _s0__XttStart::soap_default(struct soap *soap)
((_s0__XttStart*)this)->OpPlace = NULL; ((_s0__XttStart*)this)->OpPlace = NULL;
((_s0__XttStart*)this)->Language = NULL; ((_s0__XttStart*)this)->Language = NULL;
((_s0__XttStart*)this)->Display = NULL; ((_s0__XttStart*)this)->Display = NULL;
((_s0__XttStart*)this)->GUI = NULL;
((_s0__XttStart*)this)->ClientRequestHandle = NULL; ((_s0__XttStart*)this)->ClientRequestHandle = NULL;
/* transient soap skipped */ /* transient soap skipped */
} }
...@@ -1310,6 +1319,7 @@ void _s0__XttStart::soap_serialize(struct soap *soap) const ...@@ -1310,6 +1319,7 @@ void _s0__XttStart::soap_serialize(struct soap *soap) const
soap_serialize_PointerTostd__string(soap, &((_s0__XttStart*)this)->OpPlace); soap_serialize_PointerTostd__string(soap, &((_s0__XttStart*)this)->OpPlace);
soap_serialize_PointerTostd__string(soap, &((_s0__XttStart*)this)->Language); soap_serialize_PointerTostd__string(soap, &((_s0__XttStart*)this)->Language);
soap_serialize_PointerTostd__string(soap, &((_s0__XttStart*)this)->Display); soap_serialize_PointerTostd__string(soap, &((_s0__XttStart*)this)->Display);
soap_serialize_PointerTostd__string(soap, &((_s0__XttStart*)this)->GUI);
/* transient soap skipped */ /* transient soap skipped */
} }
...@@ -1334,6 +1344,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__s0__XttStart(struct soap *soap, const char * ...@@ -1334,6 +1344,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__s0__XttStart(struct soap *soap, const char *
soap_out_PointerTostd__string(soap, "s0:OpPlace", -1, &(((_s0__XttStart*)a)->OpPlace), ""); soap_out_PointerTostd__string(soap, "s0:OpPlace", -1, &(((_s0__XttStart*)a)->OpPlace), "");
soap_out_PointerTostd__string(soap, "s0:Language", -1, &(((_s0__XttStart*)a)->Language), ""); soap_out_PointerTostd__string(soap, "s0:Language", -1, &(((_s0__XttStart*)a)->Language), "");
soap_out_PointerTostd__string(soap, "s0:Display", -1, &(((_s0__XttStart*)a)->Display), ""); soap_out_PointerTostd__string(soap, "s0:Display", -1, &(((_s0__XttStart*)a)->Display), "");
soap_out_PointerTostd__string(soap, "s0:GUI", -1, &(((_s0__XttStart*)a)->GUI), "");
/* transient soap skipped */ /* transient soap skipped */
soap_element_end_out(soap, tag); soap_element_end_out(soap, tag);
return SOAP_OK; return SOAP_OK;
...@@ -1385,7 +1396,7 @@ SOAP_FMAC3 _s0__XttStart * SOAP_FMAC4 soap_in__s0__XttStart(struct soap *soap, c ...@@ -1385,7 +1396,7 @@ SOAP_FMAC3 _s0__XttStart * SOAP_FMAC4 soap_in__s0__XttStart(struct soap *soap, c
} }
} }
} }
short soap_flag_OpPlace1 = 1, soap_flag_Language1 = 1, soap_flag_Display1 = 1; short soap_flag_OpPlace1 = 1, soap_flag_Language1 = 1, soap_flag_Display1 = 1, soap_flag_GUI1 = 1;
if (soap->body && !*soap->href) if (soap->body && !*soap->href)
{ {
for (;;) for (;;)
...@@ -1405,6 +1416,11 @@ SOAP_FMAC3 _s0__XttStart * SOAP_FMAC4 soap_in__s0__XttStart(struct soap *soap, c ...@@ -1405,6 +1416,11 @@ SOAP_FMAC3 _s0__XttStart * SOAP_FMAC4 soap_in__s0__XttStart(struct soap *soap, c
{ soap_flag_Display1--; { soap_flag_Display1--;
continue; continue;
} }
if (soap_flag_GUI1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
if (soap_in_PointerTostd__string(soap, "s0:GUI", &(((_s0__XttStart*)a)->GUI), "xsd:string"))
{ soap_flag_GUI1--;
continue;
}
/* transient soap skipped */ /* transient soap skipped */
if (soap->error == SOAP_TAG_MISMATCH) if (soap->error == SOAP_TAG_MISMATCH)
soap->error = soap_ignore_element(soap); soap->error = soap_ignore_element(soap);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#include "statussrv_H.h" #include "statussrv_H.h"
SOAP_SOURCE_STAMP("@(#) statussrv_Client.cpp ver 2.7.9d 2007-05-25 06:59:31 GMT") SOAP_SOURCE_STAMP("@(#) statussrv_Client.cpp ver 2.7.9d 2007-05-30 13:46:12 GMT")
SOAP_FMAC5 int SOAP_FMAC6 soap_call___s0__GetStatus(struct soap *soap, const char *soap_endpoint, const char *soap_action, _s0__GetStatus *s0__GetStatus, _s0__GetStatusResponse *s0__GetStatusResponse) SOAP_FMAC5 int SOAP_FMAC6 soap_call___s0__GetStatus(struct soap *soap, const char *soap_endpoint, const char *soap_action, _s0__GetStatus *s0__GetStatus, _s0__GetStatusResponse *s0__GetStatusResponse)
......
...@@ -364,6 +364,7 @@ public: ...@@ -364,6 +364,7 @@ public:
std::string *OpPlace; /* optional element of type xsd:string */ std::string *OpPlace; /* optional element of type xsd:string */
std::string *Language; /* optional element of type xsd:string */ std::string *Language; /* optional element of type xsd:string */
std::string *Display; /* optional element of type xsd:string */ std::string *Display; /* optional element of type xsd:string */
std::string *GUI; /* optional element of type xsd:string */
std::string *ClientRequestHandle; /* optional attribute */ std::string *ClientRequestHandle; /* optional attribute */
struct soap *soap; /* transient */ struct soap *soap; /* transient */
public: public:
...@@ -374,7 +375,7 @@ public: ...@@ -374,7 +375,7 @@ public:
virtual int soap_out(struct soap*, const char*, int, const char*) const; virtual int soap_out(struct soap*, const char*, int, const char*) const;
virtual void *soap_get(struct soap*, const char*, const char*); virtual void *soap_get(struct soap*, const char*, const char*);
virtual void *soap_in(struct soap*, const char*, const char*); virtual void *soap_in(struct soap*, const char*, const char*);
_s0__XttStart() : OpPlace(NULL), Language(NULL), Display(NULL), ClientRequestHandle(NULL), soap(NULL) { } _s0__XttStart() : OpPlace(NULL), Language(NULL), Display(NULL), GUI(NULL), ClientRequestHandle(NULL), soap(NULL) { }
virtual ~_s0__XttStart() { } virtual ~_s0__XttStart() { }
}; };
#endif #endif
...@@ -408,6 +409,7 @@ class SOAP_CMAC _s0__RtMonStart ...@@ -408,6 +409,7 @@ class SOAP_CMAC _s0__RtMonStart
public: public:
std::string *Language; /* optional element of type xsd:string */ std::string *Language; /* optional element of type xsd:string */
std::string *Display; /* optional element of type xsd:string */ std::string *Display; /* optional element of type xsd:string */
std::string *GUI; /* optional element of type xsd:string */
std::string *ClientRequestHandle; /* optional attribute */ std::string *ClientRequestHandle; /* optional attribute */
struct soap *soap; /* transient */ struct soap *soap; /* transient */
public: public:
...@@ -418,7 +420,7 @@ public: ...@@ -418,7 +420,7 @@ public:
virtual int soap_out(struct soap*, const char*, int, const char*) const; virtual int soap_out(struct soap*, const char*, int, const char*) const;
virtual void *soap_get(struct soap*, const char*, const char*); virtual void *soap_get(struct soap*, const char*, const char*);
virtual void *soap_in(struct soap*, const char*, const char*); virtual void *soap_in(struct soap*, const char*, const char*);
_s0__RtMonStart() : Language(NULL), Display(NULL), ClientRequestHandle(NULL), soap(NULL) { } _s0__RtMonStart() : Language(NULL), Display(NULL), GUI(NULL), ClientRequestHandle(NULL), soap(NULL) { }
virtual ~_s0__RtMonStart() { } virtual ~_s0__RtMonStart() { }
}; };
#endif #endif
......
/* statussrv_msg.h /* statussrv_msg.h
Generated by wsdl2h 1.2.9d from statussrv.wsdl and typemap.dat Generated by wsdl2h 1.2.9d from statussrv.wsdl and typemap.dat
2007-05-25 06:59:12 GMT 2007-05-30 13:46:06 GMT
Copyright (C) 2001-2006 Robert van Engelen, Genivia Inc. All Rights Reserved. Copyright (C) 2001-2006 Robert van Engelen, Genivia Inc. All Rights Reserved.
This part of the software is released under one of the following licenses: This part of the software is released under one of the following licenses:
GPL or Genivia's license for commercial use. GPL or Genivia's license for commercial use.
...@@ -474,6 +474,8 @@ class _s0__XttStart ...@@ -474,6 +474,8 @@ class _s0__XttStart
std::string* Language 0; ///< Optional element. std::string* Language 0; ///< Optional element.
/// Element Display of type xs:string. /// Element Display of type xs:string.
std::string* Display 0; ///< Optional element. std::string* Display 0; ///< Optional element.
/// Element GUI of type xs:string.
std::string* GUI 0; ///< Optional element.
/// Attribute ClientRequestHandle of type xs:string. /// Attribute ClientRequestHandle of type xs:string.
@std::string* ClientRequestHandle 0; ///< Optional attribute. @std::string* ClientRequestHandle 0; ///< Optional attribute.
/// A handle to the soap struct that manages this instance (automatically set) /// A handle to the soap struct that manages this instance (automatically set)
...@@ -502,6 +504,8 @@ class _s0__RtMonStart ...@@ -502,6 +504,8 @@ class _s0__RtMonStart
std::string* Language 0; ///< Optional element. std::string* Language 0; ///< Optional element.
/// Element Display of type xs:string. /// Element Display of type xs:string.
std::string* Display 0; ///< Optional element. std::string* Display 0; ///< Optional element.
/// Element GUI of type xs:string.
std::string* GUI 0; ///< Optional element.
/// Attribute ClientRequestHandle of type xs:string. /// Attribute ClientRequestHandle of type xs:string.
@std::string* ClientRequestHandle 0; ///< Optional attribute. @std::string* ClientRequestHandle 0; ///< Optional attribute.
/// A handle to the soap struct that manages this instance (automatically set) /// A handle to the soap struct that manages this instance (automatically set)
......
...@@ -65,6 +65,8 @@ pwr_tStatus statussrv_GetStatus( char *nodename, statussrv_sGetStatus *result) ...@@ -65,6 +65,8 @@ pwr_tStatus statussrv_GetStatus( char *nodename, statussrv_sGetStatus *result)
result->SystemStatus = sts; result->SystemStatus = sts;
strcpy( result->SystemStatusStr, "Connection down to server"); strcpy( result->SystemStatusStr, "Connection down to server");
} }
delete get_status.ClientRequestHandle;
soap_destroy( &soap); soap_destroy( &soap);
soap_end( &soap); soap_end( &soap);
// soap_done( &soap); // soap_done( &soap);
...@@ -337,6 +339,7 @@ pwr_tStatus statussrv_GetExtStatus( char *nodename, statussrv_sGetExtStatus *res ...@@ -337,6 +339,7 @@ pwr_tStatus statussrv_GetExtStatus( char *nodename, statussrv_sGetExtStatus *res
sts = PWR__SRVCONNECTION; sts = PWR__SRVCONNECTION;
memset( result, 0, sizeof(*result)); memset( result, 0, sizeof(*result));
} }
delete get_status.ClientRequestHandle;
soap_destroy( &soap); soap_destroy( &soap);
soap_end( &soap); soap_end( &soap);
// soap_done( &soap); // soap_done( &soap);
...@@ -373,7 +376,8 @@ pwr_tStatus statussrv_Restart( char *nodename) ...@@ -373,7 +376,8 @@ pwr_tStatus statussrv_Restart( char *nodename)
return sts; return sts;
} }
pwr_tStatus statussrv_XttStart( char *nodename, char *opplace, char *lang, char *display) pwr_tStatus statussrv_XttStart( char *nodename, char *opplace, char *lang, char *display,
char *gui)
{ {
pwr_tStatus sts = PWR__SUCCESS; pwr_tStatus sts = PWR__SUCCESS;
char endpoint[80]; char endpoint[80];
...@@ -395,6 +399,8 @@ pwr_tStatus statussrv_XttStart( char *nodename, char *opplace, char *lang, char ...@@ -395,6 +399,8 @@ pwr_tStatus statussrv_XttStart( char *nodename, char *opplace, char *lang, char
xtt_start.Language = new std::string(lang); xtt_start.Language = new std::string(lang);
if ( display && strcmp( display, "") != 0) if ( display && strcmp( display, "") != 0)
xtt_start.Display = new std::string(display); xtt_start.Display = new std::string(display);
if ( gui && strcmp( gui, "") != 0)
xtt_start.GUI = new std::string(gui);
if ( soap_call___s0__XttStart( &soap, endpoint, NULL, &xtt_start, &xtt_start_response) == if ( soap_call___s0__XttStart( &soap, endpoint, NULL, &xtt_start, &xtt_start_response) ==
SOAP_OK) { SOAP_OK) {
...@@ -402,13 +408,23 @@ pwr_tStatus statussrv_XttStart( char *nodename, char *opplace, char *lang, char ...@@ -402,13 +408,23 @@ pwr_tStatus statussrv_XttStart( char *nodename, char *opplace, char *lang, char
else { else {
sts = PWR__SRVCONNECTION; sts = PWR__SRVCONNECTION;
} }
delete xtt_start.ClientRequestHandle;
if ( xtt_start.OpPlace)
delete xtt_start.OpPlace;
if ( xtt_start.Language)
delete xtt_start.Language;
if ( xtt_start.Display)
delete xtt_start.Display;
if ( xtt_start.GUI)
delete xtt_start.GUI;
soap_destroy( &soap); soap_destroy( &soap);
soap_end( &soap); soap_end( &soap);
return sts; return sts;
} }
pwr_tStatus statussrv_RtMonStart( char *nodename, char *lang, char *display) pwr_tStatus statussrv_RtMonStart( char *nodename, char *lang, char *display, char *gui)
{ {
pwr_tStatus sts = PWR__SUCCESS; pwr_tStatus sts = PWR__SUCCESS;
char endpoint[80]; char endpoint[80];
...@@ -426,8 +442,10 @@ pwr_tStatus statussrv_RtMonStart( char *nodename, char *lang, char *display) ...@@ -426,8 +442,10 @@ pwr_tStatus statussrv_RtMonStart( char *nodename, char *lang, char *display)
rtmon_start.ClientRequestHandle = new std::string("StatusSrv Client"); rtmon_start.ClientRequestHandle = new std::string("StatusSrv Client");
if ( lang && strcmp( lang, "") != 0) if ( lang && strcmp( lang, "") != 0)
rtmon_start.Language = new std::string(lang); rtmon_start.Language = new std::string(lang);
if ( display && strcmp( display, "") != 0) if ( display && strcmp( display, "") != 0)
rtmon_start.Display = new std::string(display); rtmon_start.Display = new std::string(display);
if ( gui && strcmp( gui, "") != 0)
rtmon_start.GUI = new std::string(gui);
if ( soap_call___s0__RtMonStart( &soap, endpoint, NULL, &rtmon_start, &rtmon_start_response) == if ( soap_call___s0__RtMonStart( &soap, endpoint, NULL, &rtmon_start, &rtmon_start_response) ==
SOAP_OK) { SOAP_OK) {
...@@ -435,6 +453,13 @@ pwr_tStatus statussrv_RtMonStart( char *nodename, char *lang, char *display) ...@@ -435,6 +453,13 @@ pwr_tStatus statussrv_RtMonStart( char *nodename, char *lang, char *display)
else { else {
sts = PWR__SRVCONNECTION; sts = PWR__SRVCONNECTION;
} }
delete rtmon_start.ClientRequestHandle;
if ( rtmon_start.Language)
delete rtmon_start.Language;
if ( rtmon_start.Display)
delete rtmon_start.Display;
if ( rtmon_start.GUI)
delete rtmon_start.GUI;
soap_destroy( &soap); soap_destroy( &soap);
soap_end( &soap); soap_end( &soap);
......
/** /**
* Proview $Id: statussrv_utl.h,v 1.3 2007-05-25 13:38:07 claes Exp $ * Proview $Id: statussrv_utl.h,v 1.4 2007-06-01 11:27:58 claes Exp $
* Copyright (C) 2005 SSAB Oxelösund AB. * Copyright (C) 2005 SSAB Oxelösund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -54,8 +54,9 @@ typedef struct { ...@@ -54,8 +54,9 @@ typedef struct {
pwr_tStatus statussrv_GetStatus( char *nodename, statussrv_sGetStatus *result); pwr_tStatus statussrv_GetStatus( char *nodename, statussrv_sGetStatus *result);
pwr_tStatus statussrv_GetExtStatus( char *nodename, statussrv_sGetExtStatus *result); pwr_tStatus statussrv_GetExtStatus( char *nodename, statussrv_sGetExtStatus *result);
pwr_tStatus statussrv_Restart( char *nodename); pwr_tStatus statussrv_Restart( char *nodename);
pwr_tStatus statussrv_XttStart( char *nodename, char *opplace, char *lang, char *display); pwr_tStatus statussrv_XttStart( char *nodename, char *opplace, char *lang, char *display,
pwr_tStatus statussrv_RtMonStart( char *nodename, char *lang, char *display); char *gui);
pwr_tStatus statussrv_RtMonStart( char *nodename, char *lang, char *display, char *gui);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
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