adapted new ita-toolbox logo in GUI and HTML Help

applications/HTMLhelp/templates/template_application_demos.html

@@ -36,7 +36,7 @@
 			</tr>			
 			<tr>
 				<td height="83" valign="top" bgcolor="#FFFFFF">
-					<img src="../pics/ita_toolbox_logo_wbg.jpg" width="400" align="top">
+					<img src="../pics/ita_toolbox_logo_wbg.png" width="400" align="top">
 				</td>
 			</tr>
 			<tr>
@@ -72,4 +72,4 @@ This might take a few minutes.
 		<!--/Content-->
   <!-- Last updated: 02.05.2012 Jonas Tumbrgel-->
 </body>
-</html>
\ No newline at end of file
+</html>

applications/HTMLhelp/templates/template_apps.html

@@ -36,7 +36,7 @@
 			</tr>			
 			<tr>
 				<td height="83" valign="top" bgcolor="#FFFFFF">
-					<img src="../pics/ita_toolbox_logo_wbg.jpg" width="400" align="top">
+					<img src="../pics/ita_toolbox_logo_wbg.png" width="400" align="top">
 				</td>
 			</tr>
 			<tr>
@@ -64,4 +64,4 @@ We recommand you to make use of the "doc 'function' " and "help 'function' " com
 
 </td></tr></table> <!-- close "border (see above-->
   <!-- Last updated: 18.05.2012 Jonas Tumbrgel-->
-</html>
\ No newline at end of file
+</html>

applications/HTMLhelp/templates/template_classes.html

@@ -36,7 +36,7 @@
 			</tr>			
 			<tr>
 				<td height="83" valign="top" bgcolor="#FFFFFF">
-					<img src="../pics/ita_toolbox_logo_wbg.jpg" width="400" align="top">
+					<img src="../pics/ita_toolbox_logo_wbg.png" width="400" align="top">
 				</td>
 			</tr>
 			<tr>
@@ -66,4 +66,4 @@ We recommand you to make use of the "doc 'function' " and "help 'function' " com
 
 </td></tr></table> <!-- close "border (see above-->
   <!-- Last updated: 02.05.2012 Jonas Tumbrägel-->
-</html>
\ No newline at end of file
+</html>

applications/HTMLhelp/templates/template_index_demos.html

@@ -36,7 +36,7 @@
 			</tr>			
 			<tr>
 				<td height="83" valign="top" bgcolor="#FFFFFF">
-					<img src="../pics/ita_toolbox_logo_wbg.jpg" width="400" align="top">
+					<img src="../pics/ita_toolbox_logo_wbg.png" width="400" align="top">
 				</td>
 			</tr>
 			<tr>
@@ -72,4 +72,4 @@ This might take a few minutes.
 		<!--/Content-->
   <!-- Last updated: 02.05.2012 Jonas Tumbrägel-->
 </body>
-</html>
\ No newline at end of file
+</html>

applications/HTMLhelp/templates/template_kernel.html

@@ -36,7 +36,7 @@
 			</tr>			
 			<tr>
 				<td height="83" valign="top" bgcolor="#FFFFFF">
-					<img src="../pics/ita_toolbox_logo_wbg.jpg" width="400" align="top">
+					<img src="../pics/ita_toolbox_logo_wbg.png" width="400" align="top">
 				</td>
 			</tr>
 			<tr>
@@ -65,4 +65,4 @@ We recommand you to make use of the "doc 'function' " and "help 'function' " com
 
 </td></tr></table> <!-- close "border (see above-->
   <!-- Last updated: 23.05.2012 Jonas Tumbr?l-->
-</html>
\ No newline at end of file
+</html>

applications/Hardware/FrontendControl/ita_aureliocontrol_gui.m

@@ -43,8 +43,8 @@ if nargin == 0
     else %we are in an ITA-Toolbox Preferences Window (pdi)
         clf(hFigure)
     end
-    %% ITA toolbox logo
-    a_im = importdata('ita_toolbox_logo.jpg');
+    %% ITA toolbox logo with grey background
+    a_im = importdata('ita_toolbox_logo.png');
     image(a_im);axis off
     set(gca,'Units','pixel', 'Position', [20 10 350 65]*0.6);
 else %reset mode
@@ -577,4 +577,4 @@ PresetMenu{ch_idx}.hButton(1) = uicontrol(...
     end
 
 
-end
\ No newline at end of file
+end

applications/Hardware/FrontendControl/ita_aureliocontrol_gui_old.m

@@ -43,8 +43,8 @@ if nargin == 0
     else %we are in an ITA-Toolbox Preferences Window (pdi)
         clf(hFigure)
     end
-    %% ITA toolbox logo
-    a_im = importdata('ita_toolbox_logo.jpg');
+    %% ITA toolbox logo with grey background
+    a_im = importdata('ita_toolbox_logo.png');
     image(a_im);axis off
     set(gca,'Units','pixel', 'Position', [20 10 350 65]*0.6);
 else %reset mode
@@ -408,4 +408,4 @@ end
         ita_aurelio_control('channel',userdata.ch,'inputrange',inputrange);
     end
 
-end
\ No newline at end of file
+end

applications/Hardware/FrontendControl/ita_modulitacontrol_gui.m

@@ -43,8 +43,8 @@ if nargin == 0
     else %we are in an ITA-Toolbox Preferences Window (pdi)
         clf(hFigure)
     end
-    %% ITA toolbox logo
-    a_im = importdata('ita_toolbox_logo.jpg');
+    %% ITA toolbox logo with grey background
+    a_im = importdata('ita_toolbox_logo.png');
     image(a_im);axis off
     set(gca,'Units','pixel', 'Position', [20 10 350 65]*0.6);
 else %reset mode
@@ -330,4 +330,4 @@ end
         ita_modulita_control('channel',userdata.ch,'inputrange',inputrange);
     end
 
-end
\ No newline at end of file
+end

applications/Hardware/FrontendControl/ita_robocontrolcenter_gui.m

@@ -539,8 +539,8 @@ hsingleton = h1;
 
 % --- Set application data first then calling the CreateFcn.
 function local_CreateFcn(hObject, eventdata, createfcn, appdata)
-%% ITA toolbox logo
-a_im = importdata(which('ita_toolbox_logo.jpg'));
+%% ITA toolbox logo with grey background
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [20 10 350 65]*0.6); %TODO: later set correctly the position
 % %

applications/Hardware/ITAMotorControl/ClassStuff/@itaXY/itaXY.m

@@ -672,8 +672,8 @@ classdef itaXY < itaMeasurementTasksMovtec
                 'Position',[(vs+2*vsKl+2*pbW),vs,pbW,pbH],...
                 'Callback',{@gobutton_Callback});
             
-            %% ita toolbox logo
-            a_im = importdata(which('ita_toolbox_logo.jpg'));
+            %% ita toolbox logo with grey bg
+            a_im = importdata(which('ita_toolbox_logo.png'));
             image(a_im);axis off
             set(gca,'Units','pixel', 'Position', [fW-vs-180+10 vs-10 180 35]);
             
@@ -779,4 +779,4 @@ classdef itaXY < itaMeasurementTasksMovtec
     end %methods
     % *********************************************************************
     % *********************************************************************
-end
\ No newline at end of file
+end

applications/Hardware/ITAMotorControl/ita_italian_gui.m

@@ -272,8 +272,8 @@ uicontrol(...
     'Callback',@UpdatePosition);
 
 
-%% ita toolbox logo
-a_im = importdata(which('ita_toolbox_logo.jpg'));
+%% ita toolbox logo with grey bg
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [(width-width_button)/2 - (hor_space_s + width_button)*3.3 (height-200)/2 300 50]); %pdi new scaling
 
@@ -364,4 +364,4 @@ set(gca,'Units','pixel', 'Position', [(width-width_button)/2 - (hor_space_s + wi
         return;
     end
 
-end % end function
\ No newline at end of file
+end % end function

applications/Hardware/ITAMotorControl/ita_movtec_xytable_measurement_setup_gui.m

@@ -102,8 +102,8 @@ startVs = uicontrol('Style','pushButton','String','Go for it!',...
     'Position',[(vs+2*vsKl+2*pbW),vs,pbW,pbH],...
     'Callback',{@gobutton_Callback});
 
-%% ita toolbox logo
-a_im = importdata(which('ita_toolbox_logo.jpg'));
+%% ita toolbox logo with grey bg
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [fW-vs-180+10 vs-10 180 42]);
 
@@ -209,4 +209,4 @@ set(yctext,'String', ['X: ' num2str(ita_movtec_xytable_steps2mm('x',...
 
 set(f,'Visible','on')
 %EOF
-end
\ No newline at end of file
+end

applications/Laboratory/V0/ita_laboratory_V0.m

 %% Measurement Tutorial
 %
-% <<../pics/ita_toolbox_logo_wbg.jpg>>
+% <<../pics/ita_toolbox_logo_wbg.png>>
 %
 % This tutorial requires understanding of ita_tutorial_measurement. 
 % Finally, we measure the ITA-V0-Box.

applications/Laboratory/V7/ita_V7_playback.m

@@ -76,8 +76,8 @@ hFigure = figure( ...       % the main GUI figure
 
 pause(0.02) % wait for gui to show up
 
-%% ITA toolbox logo
-a_im = importdata('ita_toolbox_logo.jpg');
+%% ITA toolbox logo with grey background
+a_im = importdata('ita_toolbox_logo.png');
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [20 10 350 65]*0.6);
 

applications/ListeningTests/ita_listeningtests_forcedchoice.m

@@ -42,7 +42,7 @@ set(gcf,'Name','H
 set(gcf,'NumberTitle','off')
 
 
-a_im = importdata(which('ita_toolbox_logo_wbg.jpg'));
+a_im = importdata(which('ita_toolbox_logo_wbg.png'));
 image(a_im);
 axis off;
 set(gca,'Units','pixel', 'Position', [50 20 300 60]*2); %pdi new scaling

applications/Measurement/ClassStuff/ita_measurement.m

@@ -61,9 +61,9 @@ hMainFigure = figure( ...       % the main GUI figure
 figSet.hMainFigure = hMainFigure;
 
 %% ITA toolbox logo
-a_im = importdata(which('ita_toolbox_logo.jpg'));
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
-set(gca,'Units','pixel', 'Position', [10 10 350 65]*0.6); %TODO: later set correctly the position
+set(gca,'Units','pixel', 'Position', [10 10 350 65]*0.6);
 
 %% pushbuttons - ui control elements
 for iButton = 1:nButtons

applications/Measurement/ClassStuff/ita_measurement_chain.m

@@ -141,8 +141,8 @@ set(hMainFigure,'KeyPressFcn',@ButtonCallback)
 
 figSet.hMainFigure = hMainFigure;
 
-%% ITA toolbox logo
-a_im = importdata(which('ita_toolbox_logo.jpg'));
+%% ITA toolbox logo with grey background
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [20 10 350 65]*0.6); %TODO: later set correctly the position
 
@@ -530,4 +530,4 @@ uiwait(figSet.hMainFigure);
         
         %end function
     end
-end %end function
\ No newline at end of file
+end %end function

applications/Measurement/ClassStuff/ita_measurement_chain_output.m

@@ -143,8 +143,8 @@ end
 figSet.hMainFigure = hMainFigure;
 set(hMainFigure,'KeyPressFcn',@ButtonCallback)
 
-%% ITA toolbox logo
-a_im = importdata(which('ita_toolbox_logo.jpg'));
+%% ITA toolbox logo with grey background
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [20 10 350 65]*0.6); %TODO: later set correctly the position
 

applications/Measurement/ImpedanceTube/@itaKundtTube/itaKundtTube.m

@@ -712,9 +712,8 @@ classdef itaKundtTube < itaHandle
                 'horizontalAlignment','left');
             
             
-            % ITA toolbox logo
-            
-            a_im = importdata(which('ita_toolbox_logo.jpg'));
+            % ITA toolbox logo with grey background
+            a_im = importdata(which('ita_toolbox_logo.png'));
             image(a_im);axis off
             set(gca,'Units','pixel', 'Position', [10 10 210 40]);
             
@@ -948,4 +947,4 @@ this.newMatNum = this.newMatNum+1;
 newMat = itaKundtTubeMaterial(this);
 ita_setinbase('currentMaterial', newMat)
 newMat.nameOfDUT = 'currentMaterial';
-end
\ No newline at end of file
+end

applications/Measurement/ImpedanceTube/@itaKundtTubeMaterial/itaKundtTubeMaterial.m

@@ -452,9 +452,9 @@ classdef itaKundtTubeMaterial < itaKundtTube
                     'Callback',{@newSampOrRepCallback, this},...
                     'TooltipString',toolTipStr,...
                     'Enable','off');
-                % ITA toolbox logo
+                % ITA toolbox logo with grey background
                 ax(1) = subplot(100,100,1);
-                a_im = importdata(which('ita_toolbox_logo.jpg'));
+                a_im = importdata(which('ita_toolbox_logo.png'));
                 image(a_im);axis off
                 set(gca,'Units','pixel', 'Position', [10 10 210 40]);
                 %gui anzeigen

applications/Measurement/ImpedanceTube/ita_dataselect_gui.m

@@ -42,8 +42,8 @@ hFig = figure('Name','Select Probes from your Current Directory to plot',...
     'NumberTitle','off', ...
     'Color', [0.8 0.8 0.8]);
 
-%ITA toolbox logo
-a_im = importdata(which('ita_toolbox_logo.jpg'));
+%ITA toolbox logo with grey background
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [20 20 200 35]); %TODO: later set correctly the position
 

applications/Measurement/ImpedanceTube/ita_kundt_gui_old.m

@@ -277,8 +277,8 @@ uicontrol(...
     'ForegroundColor', [0 0 .7],...
     'Callback',@MeasurementSetupButtonCallback);
 
-%% ita toolbox logo
-a_im = importdata('ita_toolbox_logo.jpg');
+%% ita toolbox logo with grey background
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [0 top_margin width round(65*width/350)]);
 
@@ -482,4 +482,4 @@ set(gca,'Units','pixel', 'Position', [0 top_margin width round(65*width/350)]);
 
 
 
-end % end function
\ No newline at end of file
+end % end function

applications/TPA-TPS/ita_TPA_TPS_playback.m

@@ -76,8 +76,8 @@ hFigure = figure( ...       % the main GUI figure
 
 pause(0.02) % wait for gui to show up
 
-%% ITA toolbox logo
-a_im = importdata('ita_toolbox_logo.jpg');
+%% ITA toolbox logo with grey bg
+a_im = importdata('ita_toolbox_logo.png');
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [20 10 350 65]*0.6);
 

kernel/DSP/Edit/ita_generate_gui.m

@@ -198,8 +198,8 @@ uicontrol(...
     'Style', 'pushbutton',...
     'Callback', @PreviewButtonCallback);
 
-%% ita toolbox logo
-a_im = importdata(which('ita_toolbox_logo.jpg'));
+%% ita toolbox logo with grey background
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [100 30 350 65]);
 

kernel/Gui/ita_parametric_GUI.m

@@ -70,7 +70,7 @@ end
 %name  = varargin{2}; %name of window
 
 sArgs = struct('pos1_pList','cell','pos2_name','char','wait','on','ita_menu','off',...
-    'ita_menu_disable',cell(1),'logo','ita_toolbox_logo.jpg','backgroundlogo','','logo2','','return_handles',false,'fgh',[],'position',[]);
+    'ita_menu_disable',cell(1),'logo','ita_toolbox_logo.png','backgroundlogo','','logo2','','return_handles',false,'fgh',[],'position',[]);
 sArgs.buttonnames = {'Cancel','Okay'};
 narginchk(2,2*numel(fields(sArgs)));
 [pList, name, sArgs] = ita_parse_arguments(sArgs,varargin);
@@ -920,4 +920,4 @@ end
     end
 
 
-end
\ No newline at end of file
+end

kernel/MetaInfo/ita_channel_settings.m

@@ -183,8 +183,8 @@ else
 end
 figSet.hMainFigure = hMainFigure;
 
-%% ITA toolbox logo
-a_im = importdata('ita_toolbox_logo.jpg');
+%% ITA toolbox logo with grey background
+a_im = importdata('ita_toolbox_logo.png');
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [10 10 350 65]*0.6); %TODO: later set correctly the position
 

kernel/PlayrecMidi/ita_channelselect_gui.m

@@ -66,8 +66,8 @@ hFig = figure('Name','PortAudio IO Channels',...
     'NumberTitle','off', ...
     'Color', [0.8 0.8 0.8]);
 
-%ITA toolbox logo
-a_im = importdata(which('ita_toolbox_logo.jpg'));
+%ITA toolbox logo with grey background
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
 set(gca,'Units','pixel', 'Position', [20 20 200 35]); %TODO: later set correctly the position
 

kernel/PlayrecMidi/ita_portaudio_gui.m

@@ -208,10 +208,10 @@ uicontrol(...
     'BackgroundColor', [0.8 0.8 0.8],...
     'Callback',@PreferencesButtonCallback);
 
-%% ita toolbox logo
-a_im = importdata('ita_toolbox_logo.jpg');
+%% ita toolbox logo with grey backgroud
+a_im = importdata(which('ita_toolbox_logo.png'));
 image(a_im);axis off
-set(gca,'Units','pixel', 'Position', [130 height-195 350 65]);
+set(gca,'Units','pixel', 'Position', [275 height-195 350 65]);
 
 %% Callback functions
     function RefreshButtonCallback(hObject,eventdata)
@@ -317,4 +317,4 @@ set(gca,'Units','pixel', 'Position', [130 height-195 350 65]);
         ita_preferences();
     end
 
-end % end function
\ No newline at end of file
+end % end function

kernel/PlotRoutines/Plottools/ita_plottools_addlogo.m

@@ -57,7 +57,7 @@ ha2 = axes('Position',logo_pos);
 %% load logo and plot
 persistent a_im;
 if isempty(a_im)
-    a_im = importdata(which('ita_toolbox_logo_wbg.jpg'));
+    a_im = importdata(which('ita_toolbox_logo_wbg.png'));
 end
 h_i = image(a_im,'alphaData',sArgs.logoalpha);
 set(h_i,'UserData','ITA-Toolbox-Logo'); % Write something to UserData so we can identify it
@@ -75,4 +75,4 @@ if nargout >= 2
     varargout{2} = h_i;
 end
 
-end
\ No newline at end of file
+end

kernel/PlotRoutines/Plottools/ita_plottools_ita_logo.m

@@ -11,8 +11,8 @@ mode = 'normal';
 if nargin == 1
     mode = varargin{1};
 end
-
-a_im = importdata(which('ita_toolbox_logo_lightgrey.jpg'));
+% with lightgrey bg
+a_im = importdata(which('ita_toolbox_logo_lightgrey.png'));
 graph_size = size(a_im);
 graph_size = [graph_size(1) graph_size(2)];
 axes();
@@ -43,4 +43,4 @@ switch lower(mode)
 end
 set(gca,'Units','pixel', 'Position', pos);
 set(gca,'Units','normalized');
-end
\ No newline at end of file
+end

kernel/PlotRoutines/ita_savethisplot_gle.m

@@ -794,7 +794,7 @@ if ita_preferences('toolboxlogo')
     logo_position = [0 0];
     fprintf(fid,'amove %d %d\n',logo_position(1),logo_position(2));
     fprintf(fid,'begin name toolbox_logo\n');
-    fprintf(fid,'\tbitmap "%s" %d %d\n',which('ita_toolbox_logo_wbg.jpg'),logo_size,0.21*3/4*logo_size);
+    fprintf(fid,'\tbitmap "%s" %d %d\n',which('ita_toolbox_logo_wbg.png'),logo_size,0.21*3/4*logo_size);
     fprintf(fid,'end name\n');
 end
 
@@ -1566,4 +1566,4 @@ end
 
 pause(.1)
 fclose(fid);
-end
\ No newline at end of file
+end

kernel/ita_preferences_gui_tabs.m

@@ -97,11 +97,11 @@ for idx=1:nTabs
 end
 warning(xx) %write back old warning settings
 
-%% ita toolbox logo
-a_im = importdata(which('ita_toolbox_logo_lightgrey.jpg'));
+%% ita toolbox logo lightgrey bg
+a_im = importdata(which('ita_toolbox_logo_lightgrey.png'));
 ax    = axes('Parent',hFigure);
 image(a_im);axis off
-set(ax,'Units','pixel', 'Position', [50 20 300 60]*0.8); %pdi new scaling
+set(ax,'Units','pixel', 'Position', [10 20 300 60]*0.8); %pdi new scaling
 
 %% port audio and COMports
 if exist('ita_portaudio_menuStr','file')

tutorials/ita_tutorial.m

 %% Getting startet with the ITA-Toolbox 
 %
-% <<../pics/ita_toolbox_logo_wbg.jpg>>
+% <<../pics/ita_toolbox_logo_wbg.png>>
 %
 % In the next few lines we (the Developers of the ITA-Toolbox from the 
 % Institute of Technical Acoustics at RWTH Aachen) will try to explain 
@@ -17,7 +17,7 @@
 % _2017 - JCK
 % toolbox-dev@akustik.rwth-aachen.de
 %
-% <<../pics/ita_toolbox_logo_wbg.jpg>>
+% <<../pics/ita_toolbox_logo_wbg.png>>
 % 
 
 % <ITA-Toolbox>

tutorials/ita_tutorial_itaCoordinates.m

 %% Visualize spatial audio data with itaCoordinates
 %
-% <<../../pics/ita_toolbox_logo_wbg.jpg>>
+% <<../../pics/ita_toolbox_logo_wbg.png>>
 % 
 % This tutorial demonstrates how to use the itaCoodinates class and how to
 % plot spatial/spherical audio data with the functions provided.
@@ -193,4 +193,4 @@ ao.freq = ao.freq + rand(size(ao.freq));
 for freqs = 1000:1000:16000
     surf(coordSmall, ao, freqs)
     pause(0.3);
-end
\ No newline at end of file
+end

tutorials/ita_tutorial_roomacoustics.m

 %% Analysis of room impulse responses (RIR)
 %
-% <<../../pics/ita_toolbox_logo_wbg.jpg>>
+% <<../../pics/ita_toolbox_logo_wbg.png>>
 %
 % This tutorial demonstrates how to use the RoomAcoustics application
 %