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