More non shell friendly

Author: Ingemar

getaxes.m

@@ -1,6 +1,6 @@
 function ax=getaxes(fig,s1,s2,name,head)
 global figs local selax
-if ~ishandle(fig)
+if ~isgraphics(fig)
  figg=figure(fig);
  if local.x
   d=get(0,'defaultfigureposition');
@@ -13,7 +13,7 @@
  fig=findobj(0,'Number',fig);
 end
 if ~isempty(selax) && isfield(selax,'wtg')
- if isstring(selax.wtg)
+ if ischar(selax.wtg)
   [selax.fig,selax.sp,fun]=strread(selax.wtg,'%d,%d,%s');
   selax.fun=fun{1};
  else

int_rt.m

@@ -155,10 +155,7 @@
  end
  d_parbl(7)=acc_parbl(1);
  d_parbl(8)=acc_parbl(2)/i;
- if ~isempty(butts) && ishandle(butts(1))
-  setbval
-  if bval(1)==0, return, end
- end
+ setbval, if bval(1)==0, return, end
  if isempty(rtdir)
   if i<bval(2)
    fprintf('\r %d/%d PIs done ',i,bval(2))

remtg.m

@@ -9,20 +9,20 @@
  sitecode.short={'Old','Disk','32m','42m','VHF','UHF','Kir','Sod','Hot','32p','Quj'};
  sitecode.mini='L2VTKSHPQ';
  sitecode.low='llvurr pq';
- site=findstr(sitecode.mini,getenv('EISCATSITE'));
+ site=strfind(sitecode.mini,getenv('EISCATSITE'));
  xwn=getenv('XTERM_WM_NAME');
  if isempty(site), site=5; err=1;
- elseif site==4 && ~isempty(findstr(xwn,'VHF')), site=3;
+ elseif site==4 && ~isempty(strfind(xwn,'VHF')), site=3;
  end
  bval=[1 1 1 isempty(rtdir)*site 0 1 0 1 0 0 0];
- if findstr('rtg',xwn)
+ if strfind('rtg',xwn)
   bval(5)=1;
  elseif ~isempty(webtg)
   bval([2 3 5 10])=[webtg([1 1 2]) 1]; err=0;
   if strcmp(local.name,'Octave') && strcmp(graphics_toolkit,'gnuplot'), bval(10)=0; end
  end
 end
-if bval(5)<2 && (isempty(butts) || ~ishandle(butts(1)))
+if bval(5)<2 && (isempty(butts) || ~isgraphics(butts(1)))
  rtgbuttons(10)
  if exist('err','var'), return, end
 end
@@ -48,7 +48,7 @@
 sms=[d_ExpInfo head]; figs=[]; sitet=[' ' char(sitecode.long(site))];
 t1=raw(10,['Raw data' sitet],sms);
 if bval(4)>0
- if findstr(filename,'RT')
+ if strfind(filename,'RT')
   set(t1,'string','Not recording')
  else
   [s,df]=unix(['df -k ' filename]);
@@ -244,9 +244,8 @@
   timedev(30,ntim,thead,head)
  end
 end
-if ~isempty(selax) && exist(selax.fun,'file')
- clear(selax.fun)
- run(selax.fun)
+if ~isempty(selax) && isfield(selax,'fun')
+ clear(selax.fun), run(selax.fun)
 end
 catch
  disp(lasterr)

rtg.m

@@ -1,29 +1,30 @@
-global bval rtdir butts
+global bval rtdir
 rtg_startup
 if isempty(rtdir)
 %rtdir='../elin/decelin';
  bval=[];
 end
-if strcmp(local.name,'Octave') && (local.ver<=3 || strcmp(graphics_toolkit,'gnuplot'))
+if strcmp(local.name,'Octave') && (local.ver<=3 || ~strcmp(graphics_toolkit,'qt'))
 % Jupyter?
  global webtg selax
- webtg=[1 4 0]; selax=[];
  rtdir=input(sprintf('First data directory: '),'s');
- remtg
+ n=input(sprintf('integration dumps/secs: '));
+ webtg=[n 4 0]; bval=[];
+ remtg;
 else
  while 1
   while ~remtg
    while ~bval(1)
     pause(1)
-    if ~ishandle(butts(1))
+    if ~isgraphics(10)
      quit
     end
    end
   end
   setbval(0,1)
   while ~bval(1)
    pause(1)
-   if ~ishandle(butts(1))
+   if ~isgraphics(10)
     quit
    end
   end

rtg_startup.m

@@ -26,6 +26,7 @@
  else
   local.tempdir=fullfile(getenv('HOME'),'tmp');
  end
+ clear TMP
 end
 if ~exist(local.tempdir,'dir'), mkdir(local.tempdir); end
 if strcmp(local.name,'Octave') || local.ver<8.4
@@ -37,6 +38,7 @@
 end
 if local.ver>3.4
  set(groot,'defaultAxesFontSize',12)
+ set(groot,'defaultFigureVisible','on')
  set(groot,'defaultFigureMenuBar','none')
  set(groot,'defaultFigureNumberTitle','off')
  set(groot,'defaultFigurePaperType','A4')
@@ -69,4 +71,4 @@
  matver=get(groot,'defaultFigurePosition');
  set(groot,'defaultFigurePosition',[d(3)/2 matver(2:4)])
 end
-clear matver d
+clear matver matvers d TMP

setbval.m

@@ -1,13 +1,13 @@
 function setbval(val,butt)
 global butts bval
-if bval(5)<2
+if ~isempty(butts) && isgraphics(butts(1)) && bval(5)<2
  if nargin>0
   set(butts(butt),'value',val)
  end
  for i=1:length(bval)
   bval(i)=get(butts(i),'value');
  end
  bval(4)=bval(4)-2;
-else
+elseif nargin>0
  bval(butt)=val;
 end

wtg.m

@@ -5,16 +5,17 @@ function wtg(d,n,D,x)
 %         n integration dumps/secs
 %         D definition file
 %         x Plot selection text string fig,subplot,routine
-global rtdir webtg def_file selax pldirs
+global rtdir webtg def_file selax pldirs bval
 if nargin<4, x=[]; end
 if nargin<3, D=[]; end
 if nargin<2, n=[]; end
 if nargin<1, d=[]; end
 if isempty(d), d=pwd; end
 if isempty(n), n=60; end
-set(0,'defaultfigurevisible','off')
+set(groot,'defaultfigurevisible','off')
+if isgraphics(10), close(10), end
 pldirs={};
-rtdir=d;
+rtdir=d; bval=[];
 def_file=D;
 webtg=n;
 if length(getenv('EISCATSITE'))==1
@@ -39,3 +40,4 @@ function wtg(d,n,D,x)
  end
 end
 mkmov(pldirs,webtg(1))
+end