Commit 45fafefb authored by claes's avatar claes

In command 'open graph /object' the qualifier /access can be used

parent 6b030534
/* /*
* Proview $Id: xtt_c_object.cpp,v 1.20 2008-09-18 14:58:00 claes Exp $ * Proview $Id: xtt_c_object.cpp,v 1.21 2008-10-09 08:56:54 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
...@@ -1896,7 +1896,7 @@ static pwr_tStatus CrrOpenTraceFilter( xmenu_sMenuCall *ip) ...@@ -1896,7 +1896,7 @@ static pwr_tStatus CrrOpenTraceFilter( xmenu_sMenuCall *ip)
// Open graph // Open graph
static pwr_tStatus CrrOpenGraph( xmenu_sMenuCall *ip) static pwr_tStatus CrrOpenGraph( xmenu_sMenuCall *ip)
{ {
((XNav *)ip->EditorContext)->exec_xttgraph( ip->Pointed.Objid, 0, 0, 0); ((XNav *)ip->EditorContext)->exec_xttgraph( ip->Pointed.Objid, 0, 0, 0, 0, 0);
return XNAV__SUCCESS; return XNAV__SUCCESS;
} }
......
/* /*
* Proview $Id: xtt_xnav.h,v 1.26 2008-09-18 14:58:26 claes Exp $ * Proview $Id: xtt_xnav.h,v 1.27 2008-10-09 08:56:54 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
...@@ -491,8 +491,9 @@ class XNav { ...@@ -491,8 +491,9 @@ class XNav {
char *focus, int inputempty, int use_default_access, char *focus, int inputempty, int use_default_access,
unsigned int access); unsigned int access);
void close_graph( char *filename, char *object_name); void close_graph( char *filename, char *object_name);
int exec_xttgraph( pwr_tObjid xttgraph, char *instance, char *focus, int exec_xttgraph( pwr_tObjid xttgraph, char *instance,
int inputemtpy); char *focus, int inputempty,
int use_default_access, unsigned int access);
int set_parameter( char *name_str, char *value_str, int bypass); int set_parameter( char *name_str, char *value_str, int bypass);
void open_rttlog( char *name, char *filename); void open_rttlog( char *name, char *filename);
int search( char *search_str, int regexp); int search( char *search_str, int regexp);
......
/* /*
* Proview $Id: xtt_xnav_command.cpp,v 1.39 2008-09-18 14:58:54 claes Exp $ * Proview $Id: xtt_xnav_command.cpp,v 1.40 2008-10-09 08:56:54 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
...@@ -2391,6 +2391,10 @@ static int xnav_open_func( void *client_data, ...@@ -2391,6 +2391,10 @@ static int xnav_open_func( void *client_data,
char focus_str[80]; char focus_str[80];
char *focus_p; char *focus_p;
int inputempty; int inputempty;
char tmp_str[80];
int use_default_access;
unsigned int access;
int nr;
IF_NOGDH_RETURN; IF_NOGDH_RETURN;
if ( strncmp( object_str, "*-", 2) == 0 || if ( strncmp( object_str, "*-", 2) == 0 ||
...@@ -2422,7 +2426,18 @@ static int xnav_open_func( void *client_data, ...@@ -2422,7 +2426,18 @@ static int xnav_open_func( void *client_data,
else else
focus_p = 0; focus_p = 0;
xnav->exec_xttgraph( objid, instance_p, focus_p, inputempty); if ( ODD( dcli_get_qualifier( "/ACCESS", tmp_str, sizeof(tmp_str)))) {
nr = sscanf( tmp_str, "%u", &access);
if ( nr != 1) {
xnav->message('E', "Syntax error in access");
return XNAV__HOLDCOMMAND;
}
use_default_access = 1;
}
else
use_default_access = 0;
xnav->exec_xttgraph( objid, instance_p, focus_p, inputempty, use_default_access, access);
} }
else { else {
pwr_tFileName file_str; pwr_tFileName file_str;
...@@ -6617,7 +6632,8 @@ void XNav::close_graph( char *filename, char *object_name) ...@@ -6617,7 +6632,8 @@ void XNav::close_graph( char *filename, char *object_name)
} }
int XNav::exec_xttgraph( pwr_tObjid xttgraph, char *instance, int XNav::exec_xttgraph( pwr_tObjid xttgraph, char *instance,
char *focus, int inputempty) char *focus, int inputempty,
int use_default_access, unsigned int access)
{ {
pwr_sClass_XttGraph xttgraph_o; pwr_sClass_XttGraph xttgraph_o;
char action[80]; char action[80];
...@@ -6650,7 +6666,7 @@ int XNav::exec_xttgraph( pwr_tObjid xttgraph, char *instance, ...@@ -6650,7 +6666,7 @@ int XNav::exec_xttgraph( pwr_tObjid xttgraph, char *instance,
open_graph( xttgraph_o.Title, action, xttgraph_o.Scrollbar, open_graph( xttgraph_o.Title, action, xttgraph_o.Scrollbar,
xttgraph_o.Menu, xttgraph_o.Navigator, xttgraph_o.Width, xttgraph_o.Menu, xttgraph_o.Navigator, xttgraph_o.Width,
xttgraph_o.Height, xttgraph_o.X, xttgraph_o.Y, instance, xttgraph_o.Height, xttgraph_o.X, xttgraph_o.Y, instance,
focus, inputempty, 0, 0); focus, inputempty, use_default_access, access);
} }
else if ( (strstr( action, ".class"))) else if ( (strstr( action, ".class")))
{ {
......
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