diff --git a/002 After Image GUI Project/.gitignore b/002 After Image GUI Project/.gitignore new file mode 100644 index 0000000..0ebd99a --- /dev/null +++ b/002 After Image GUI Project/.gitignore @@ -0,0 +1 @@ +/Program\ Compiled/ diff --git a/002 After Image GUI Project/AfIm_Exp_Rivalry.m b/002 After Image GUI Project/AfIm_Exp_Rivalry.m index 11049ac..b8cc589 100755 --- a/002 After Image GUI Project/AfIm_Exp_Rivalry.m +++ b/002 After Image GUI Project/AfIm_Exp_Rivalry.m @@ -7,14 +7,15 @@ try % across operating systems, and switch color range to normalized 0 - 1 range: PsychDefaultSetup(2); - [curDir,~,~] = fileparts(matlab.desktop.editor.getActiveFilename); - saveFile = sprintf('%s/../A Outputs/%s_afterimage', curDir, subName); + %[curDir,~,~] = fileparts(matlab.desktop.editor.getActiveFilename); + locOutDir = ['/Users/mike/Documents/AfterimageOutputs/']; + saveFile = sprintf('%s%s_afterimage', locOutDir, subName); fp = fopen(saveFile, 'at'); %% Color information, load hfp data and color calibration - hfpFile = sprintf('%s/../A Outputs/%sHFP', curDir, subName); - load(hfpFile, '-mat'); + hfpFile = sprintf('%s%sHFP', locOutDir, subName); + load([hfpFile,'.mat']); hfpRG = rg_avg; hfpBG = bg_avg; @@ -23,8 +24,8 @@ try pix = pix/1001; % maxLum = 20; %cd/m^2 - contFile = sprintf('%s/../A Outputs/%s_ContMatch', curDir, subName); - load(contFile, '-mat'); + contFile = sprintf('%s%s_ContMatch.mat', locOutDir, subName); + load(contFile); % % % % lCont = fliplr(Final_lCont_avg);% sort the matrix in descendent order % % % % lumMod = fliplr(Final_lumMod_avg); @@ -66,7 +67,7 @@ try theDate = datestr(now(),'mm/dd/yyyy HH:MM:SS'); % a = '/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/4 ColBackg AI' ;% folder where the program is. - infoFile = sprintf('%s/../A Outputs/%s_SessionsInfo', curDir, subName); + infoFile = sprintf('%s%s_SessionsInfo', locOutDir, subName); %aa = cd('/Users/clemente/Desktop/AfterImage Programs/A Outputs'); % folder where the program is. @@ -134,7 +135,7 @@ try clockPt = 0.1; % code assumes 1 pixel = 1 arc min - pixPerDeg = 35; %at a distance of 57 cm + pixPerDeg = 37.65; %at a distance of 58 cm circlePix = circleDeg*pixPerDeg; clockPix = clockPt*pixPerDeg; @@ -408,7 +409,7 @@ try else keyIsDown=0; kbName=[]; - Digit = []; + Digit = 0; Nums = {'0','1','2','3','4','5','6','7','8','9'}; Screen('TextSize', window, 30); @@ -526,9 +527,9 @@ try %used in data analysis % % % % piVSsecs(:,1) = [0:1/(nFrames-1):1]; % % % % piVSsecs(:,2) = [0:numSecs/(nFrames-1):numSecs]; -catch +catch ME warndlg('The program failed to run. Try again.') - return + rethrow(ME); end diff --git a/002 After Image GUI Project/Disp_Color.m b/002 After Image GUI Project/Disp_Color.m index 156cf8d..48f46d7 100644 --- a/002 After Image GUI Project/Disp_Color.m +++ b/002 After Image GUI Project/Disp_Color.m @@ -14,7 +14,7 @@ PsychDefaultSetup(2); %% Start Experiment -a = cd; +%a = cd; theDate = fix(clock); % subName = 'DC'%input(sprintf('\nEnter Subject Initials: ')) @@ -31,8 +31,8 @@ duration= 5; % sec % hfpBG = .97 ; %% -cd(a); % return to folder where the program is -Calib_Dire = cd('/Users/clemente/Desktop/AfterImage Programs/A Outputs'); +%cd(a); % return to folder where the program is +Calib_Dire = cd('/Users/mike/Documents/AfterimageOutputs'); load colorCalFile1.mat fprintf('\nLast calibrationS was %s\n', describe.date); pix = pix/1001; diff --git a/002 After Image GUI Project/Disp_Color_Rivalry.m b/002 After Image GUI Project/Disp_Color_Rivalry.m new file mode 100644 index 0000000..b4ff0b9 --- /dev/null +++ b/002 After Image GUI Project/Disp_Color_Rivalry.m @@ -0,0 +1,167 @@ +function Disp_Color_Rivalry(l_value,s_value,hfpRG,hfpBG) + +commandwindow; % open this, and the cursor will appear in the command window + + +% %% Choose program +% EEW_StdObsANDSubj = 0; +% EEW_Subj = 1; + +%% + +% Check that Psychtoolbox is properly installed, and switch color range to normalized 0 - 1 range: +PsychDefaultSetup(2); + +%% Start Experiment + +%a = cd; +theDate = fix(clock); +% subName = 'DC'%input(sprintf('\nEnter Subject Initials: ')) + +duration= 5; % sec +% %% Color information, load hfp data and color calibration +% +% aa = cd('/Users/clemente/Dropbox/Luminotecnia/2017/Chicago Lab files/2 Experiments/Color AfterImage_Exp_Room_150/2nd/1 Programs/A Outputs'); +% hfpFile = sprintf('%sHFP', subName); +% load(hfpFile, '-mat') +% hfpRG = rg_avg; +% hfpBG = bg_avg; + +% hfpRG = .89; +% hfpBG = .97 ; + +%% +%cd(a); % return to folder where the program is +Calib_Dire = cd('/Users/mike/Documents/AfterimageOutputs'); +load colorCalFile1.mat +fprintf('\nLast calibrationS was %s\n', describe.date); +pix = pix/1001; +maxLum = 20; %cd/m^2 + +l_s_pair = [l_value s_value]; +blackLut = [0 0 0]; +redLut = [.8 0 0]; + + + + +%% set up psych toolbox +%set up 10 bit color +PsychImaging('PrepareConfiguration'); +%PsychImaging('AddTask', 'General', 'EnableNative10BitFrameBuffer',1); %the 0 is turn off dithering? +expScreen = 1; +%create white LUT +wLMS(1,1) = .665*maxLum;%l_s_pair(1,1)*maxLum; +wLMS(1,2) = (1-.665)*maxLum;%(1-l_s_pair(1,1))*maxLum; +wLMS(1,3) = 1*maxLum;%l_s_pair(1,2)*maxLum; +wXYZ(1,:) = LMS_to_XYZ(wLMS(1,:)); +wRGB(1,:) = XYZ_to_RGB(wXYZ(1,:), maxPhosXYZ); +wRGB(1,1) = pix(dsearchn(redProp(:), wRGB(1,1)));%*hfpRG; +wRGB(1,2) = pix(dsearchn(grnProp(:), wRGB(1,2))); +wRGB(1,3) = pix(dsearchn(blueProp(:), wRGB(1,3)));%*hfpBG; + +[window, windowRect] = PsychImaging('OpenWindow', expScreen, [0 0 0]); %EEW for standard observer + +[xWinSize,~] = Screen('WindowSize',window); + +[xcent,ycent] = RectCenter(windowRect); + center = [xcent ycent]; + +%% Stimulus Size Parameters +circleDeg = 3.6; +clockPt = 0.1; + +% code assumes 1 pixel = 1 arc min +pixPerDeg = 37.65; %at a distance of 58 cm +circlePix = circleDeg*pixPerDeg; +clockPix = clockPt*pixPerDeg; + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% %%%%%%%%%%%%%%%%%%%%%%%%%%% CIRCLE HALf LOCATIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%tstcircle = [xcent - circlePix/2 ycent - circlePix/2 xcent + circlePix/2 ycent + circlePix/2]; +rhtXCircleCenter = xWinSize/4; +lftXCircleCenter = xWinSize-xWinSize/4; +tstCircleLeft = [lftXCircleCenter - circlePix/2 ycent - circlePix/2 lftXCircleCenter + circlePix/2 ycent + circlePix/2]; +tstCircleRight = [rhtXCircleCenter - circlePix/2 ycent - circlePix/2 rhtXCircleCenter + circlePix/2 ycent + circlePix/2]; + +%create circular grid for clock face and the numbers +% % % circleDegGrid = 2 ; +% % % rad = circleDegGrid/2*pixPerDeg; %circlePix/2-pixPerDeg/2; +rad = circleDeg/2*pixPerDeg; %circlePix/2-pixPerDeg/2; +radNum = (circleDeg/2) * pixPerDeg; +degreeNumbers = linspace(0,360,25); +clockDegs = degreeNumbers(1:end-1); %[1:15:360]; +clockDegsLft = [90:15:269]; +clockDegsRht = [270:15:359,0:15:89]; +for iC = 1:length(clockDegs) + [xcFace(iC), ycFace(iC)] = pol2cart(clockDegs(iC)*pi/180, rad); + [xcNumber(iC), ycNumber(iC)] = pol2cart(clockDegs(iC)*pi/180, 1*radNum); +end +for iC = 1:length(clockDegsLft) + [xcRhtFace(iC), ycRhtFace(iC)] = pol2cart(clockDegsLft(iC)*pi/180, rad); + [xcRhtNumber(iC), ycRhtNumber(iC)] = pol2cart(clockDegsLft(iC)*pi/180, 1*radNum); +end +for iC = 1:length(clockDegsRht) + [xcLftFace(iC), ycLftFace(iC)] = pol2cart(clockDegsRht(iC)*pi/180, rad); + [xcLftNumber(iC), ycLftNumber(iC)] = pol2cart(clockDegsRht(iC)*pi/180, 1*radNum); +end + +%create matrix of dot locations +clockPosMat = [reshape(xcFace,1, length(clockDegs)); reshape(ycFace,1, length(clockDegs))]; +%clockNumMat = [reshape(xcNumber,1, length(clockDegs)); reshape(ycNumber,1, length(clockDegs))]; +%clockRhtPosMat = [reshape(xcRhtFace,1, length(clockDegsRht)); reshape(ycRhtFace,1, length(clockDegsRht))]; +clockRhtNumMat = [reshape(xcRhtNumber,1, length(clockDegsRht)); reshape(ycRhtNumber,1, length(clockDegsRht))]; +%clockLftPosMat = [reshape(xcLftFace,1, length(clockDegsLft)); reshape(ycLftFace,1, length(clockDegsLft))]; +clockLftNumMat = [reshape(xcLftNumber,1, length(clockDegsLft)); reshape(ycLftNumber,1, length(clockDegsLft))]; + +%% + +Screen('FillRect', window, [0 0 0], windowRect);% dark screen +Screen('Flip', window); +WaitSecs(1); + +Screen('FillRect', window, wRGB.*2); + +%Screen('Flip',window); + +% % if EEW_StdObsANDSubj +% Screen('FillOval', window, wRGB, centeredRect, maxDiameter); % Draw the rect to the screen +% Screen('Flip', window); +% WaitSecs(duration) +% +% % end + +% if EEW_Subj +wRGB(1,1) = wRGB(1,1)*hfpRG; +wRGB(1,2) = wRGB(1,2); +wRGB(1,3) = wRGB(1,3)*hfpBG; +% +%Screen('FillOval', window, wRGB, centeredRect, maxDiameter); % Draw the rect to the screen +% Screen('FillOval', window, wRGB, centeredRect1, maxDiameter); % Draw the rect to the screen +% Screen('FillOval', window, wRGB, centeredRect2, maxDiameter); % Draw the rect to the screen +Screen('FillArc', window, wRGB, tstCircleLeft, 0, 180); +Screen('FillArc', window, wRGB.*1.5 , tstCircleRight, 180, 180); +Screen('DrawDots', window, clockPosMat,clockPix, blackLut, [lftXCircleCenter,center(2)], 2); +Screen('DrawDots', window, clockPosMat,clockPix, blackLut, [rhtXCircleCenter,center(2)], 2); +Screen('DrawDots', window, [0 0],clockPix, 0, [lftXCircleCenter,center(2)], 2); % black dot for fixation +Screen('DrawDots', window, [0 0],clockPix, 0, [rhtXCircleCenter,center(2)], 2); % black dot for fixation + +textOne = [12:24,1:11]; +scl = 1.35; +for itxt = 1:12 + textNum = num2str(textOne(itxt)); + Screen('DrawText', window, textNum, scl*clockRhtNumMat(1,itxt)+rhtXCircleCenter-7, scl*clockRhtNumMat(2,itxt)+center(1,2)-14, blackLut, wRGB); + textNum = num2str(textOne(itxt+12)); + Screen('DrawText', window, textNum, .9*scl*clockLftNumMat(1,itxt)+lftXCircleCenter-7, .9*scl*clockLftNumMat(2,itxt)+center(1,2)-14, blackLut, wRGB); +end +Screen('Flip', window); +% WaitSecs(duration) +KbWait(); +% +% end + +% KbStrokeWait; +Screen('CloseAll'); + +end \ No newline at end of file diff --git a/002 After Image GUI Project/Disp_Color_Rivalry.m~ b/002 After Image GUI Project/Disp_Color_Rivalry.m~ new file mode 100644 index 0000000..0541cd2 --- /dev/null +++ b/002 After Image GUI Project/Disp_Color_Rivalry.m~ @@ -0,0 +1,167 @@ +function Disp_Color_Rivalry(l_value,s_value,hfpRG,hfpBG) + +commandwindow; % open this, and the cursor will appear in the command window + + +% %% Choose program +% EEW_StdObsANDSubj = 0; +% EEW_Subj = 1; + +%% + +% Check that Psychtoolbox is properly installed, and switch color range to normalized 0 - 1 range: +PsychDefaultSetup(2); + +%% Start Experiment + +%a = cd; +theDate = fix(clock); +% subName = 'DC'%input(sprintf('\nEnter Subject Initials: ')) + +duration= 5; % sec +% %% Color information, load hfp data and color calibration +% +% aa = cd('/Users/clemente/Dropbox/Luminotecnia/2017/Chicago Lab files/2 Experiments/Color AfterImage_Exp_Room_150/2nd/1 Programs/A Outputs'); +% hfpFile = sprintf('%sHFP', subName); +% load(hfpFile, '-mat') +% hfpRG = rg_avg; +% hfpBG = bg_avg; + +% hfpRG = .89; +% hfpBG = .97 ; + +%% +%cd(a); % return to folder where the program is +Calib_Dire = cd('/Users/mike/Documents/AfterimageOutputs'); +load colorCalFile1.mat +fprintf('\nLast calibrationS was %s\n', describe.date); +pix = pix/1001; +maxLum = 20; %cd/m^2 + +l_s_pair = [l_value s_value]; +blackLut = [0 0 0]; +redLut = [.8 0 0]; + + + + +%% set up psych toolbox +%set up 10 bit color +PsychImaging('PrepareConfiguration'); +%PsychImaging('AddTask', 'General', 'EnableNative10BitFrameBuffer',1); %the 0 is turn off dithering? +expScreen = 1; +%create white LUT +wLMS(1,1) = .665*maxLum;%l_s_pair(1,1)*maxLum; +wLMS(1,2) = (1-.665)*maxLum;%(1-l_s_pair(1,1))*maxLum; +wLMS(1,3) = 1*maxLum;%l_s_pair(1,2)*maxLum; +wXYZ(1,:) = LMS_to_XYZ(wLMS(1,:)); +wRGB(1,:) = XYZ_to_RGB(wXYZ(1,:), maxPhosXYZ); +wRGB(1,1) = pix(dsearchn(redProp(:), wRGB(1,1)))%*hfpRG; +wRGB(1,2) = pix(dsearchn(grnProp(:), wRGB(1,2))); +wRGB(1,3) = pix(dsearchn(blueProp(:), wRGB(1,3)))%*hfpBG; + +[window, windowRect] = PsychImaging('OpenWindow', expScreen, [0 0 0]); %EEW for standard observer + +[xWinSize,~] = Screen('WindowSize',window); + +[xcent,ycent] = RectCenter(windowRect); + center = [xcent ycent]; + +%% Stimulus Size Parameters +circleDeg = 3.6; +clockPt = 0.1; + +% code assumes 1 pixel = 1 arc min +pixPerDeg = 36; %at a distance of 57 cm +circlePix = circleDeg*pixPerDeg +clockPix = clockPt*pixPerDeg; + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% %%%%%%%%%%%%%%%%%%%%%%%%%%% CIRCLE HALf LOCATIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%tstcircle = [xcent - circlePix/2 ycent - circlePix/2 xcent + circlePix/2 ycent + circlePix/2]; +rhtXCircleCenter = xWinSize/4; +lftXCircleCenter = xWinSize-xWinSize/4; +tstCircleLeft = [lftXCircleCenter - circlePix/2 ycent - circlePix/2 lftXCircleCenter + circlePix/2 ycent + circlePix/2]; +tstCircleRight = [rhtXCircleCenter - circlePix/2 ycent - circlePix/2 rhtXCircleCenter + circlePix/2 ycent + circlePix/2]; + +%create circular grid for clock face and the numbers +% % % circleDegGrid = 2 ; +% % % rad = circleDegGrid/2*pixPerDeg; %circlePix/2-pixPerDeg/2; +rad = circleDeg/2*pixPerDeg; %circlePix/2-pixPerDeg/2; +radNum = (circleDeg/2) * pixPerDeg; +degreeNumbers = linspace(0,360,25); +clockDegs = degreeNumbers(1:end-1); %[1:15:360]; +clockDegsLft = [90:15:269]; +clockDegsRht = [270:15:359,0:15:89]; +for iC = 1:length(clockDegs) + [xcFace(iC), ycFace(iC)] = pol2cart(clockDegs(iC)*pi/180, rad); + [xcNumber(iC), ycNumber(iC)] = pol2cart(clockDegs(iC)*pi/180, 1*radNum); +end +for iC = 1:length(clockDegsLft) + [xcRhtFace(iC), ycRhtFace(iC)] = pol2cart(clockDegsLft(iC)*pi/180, rad); + [xcRhtNumber(iC), ycRhtNumber(iC)] = pol2cart(clockDegsLft(iC)*pi/180, 1*radNum); +end +for iC = 1:length(clockDegsRht) + [xcLftFace(iC), ycLftFace(iC)] = pol2cart(clockDegsRht(iC)*pi/180, rad); + [xcLftNumber(iC), ycLftNumber(iC)] = pol2cart(clockDegsRht(iC)*pi/180, 1*radNum); +end + +%create matrix of dot locations +clockPosMat = [reshape(xcFace,1, length(clockDegs)); reshape(ycFace,1, length(clockDegs))]; +%clockNumMat = [reshape(xcNumber,1, length(clockDegs)); reshape(ycNumber,1, length(clockDegs))]; +%clockRhtPosMat = [reshape(xcRhtFace,1, length(clockDegsRht)); reshape(ycRhtFace,1, length(clockDegsRht))]; +clockRhtNumMat = [reshape(xcRhtNumber,1, length(clockDegsRht)); reshape(ycRhtNumber,1, length(clockDegsRht))]; +%clockLftPosMat = [reshape(xcLftFace,1, length(clockDegsLft)); reshape(ycLftFace,1, length(clockDegsLft))]; +clockLftNumMat = [reshape(xcLftNumber,1, length(clockDegsLft)); reshape(ycLftNumber,1, length(clockDegsLft))]; + +%% + +Screen('FillRect', window, [0 0 0], windowRect);% dark screen +Screen('Flip', window); +WaitSecs(1) + +Screen('FillRect', window, wRGB.*2); + +Screen('Flip',window) + +% % if EEW_StdObsANDSubj +% Screen('FillOval', window, wRGB, centeredRect, maxDiameter); % Draw the rect to the screen +% Screen('Flip', window); +% WaitSecs(duration) +% +% % end + +% if EEW_Subj +wRGB(1,1) = wRGB(1,1)*hfpRG; +wRGB(1,2) = wRGB(1,2); +wRGB(1,3) = wRGB(1,3)*hfpBG; +% +%Screen('FillOval', window, wRGB, centeredRect, maxDiameter); % Draw the rect to the screen +% Screen('FillOval', window, wRGB, centeredRect1, maxDiameter); % Draw the rect to the screen +% Screen('FillOval', window, wRGB, centeredRect2, maxDiameter); % Draw the rect to the screen +Screen('FillArc', window, wRGB, tstCircleLeft, 0, 180); +Screen('FillArc', window, wRGB.*1.5 , tstCircleRight, 180, 180); +Screen('DrawDots', window, clockPosMat,clockPix, blackLut, [lftXCircleCenter,center(2)], 2); +Screen('DrawDots', window, clockPosMat,clockPix, blackLut, [rhtXCircleCenter,center(2)], 2); +Screen('DrawDots', window, [0 0],clockPix, 0, [lftXCircleCenter,center(2)], 2); % black dot for fixation +Screen('DrawDots', window, [0 0],clockPix, 0, [rhtXCircleCenter,center(2)], 2); % black dot for fixation + +textOne = [12:24,1:11]; +scl = 1.35; +for itxt = 1:12 + textNum = num2str(textOne(itxt)); + Screen('DrawText', window, textNum, scl*clockRhtNumMat(1,itxt)+rhtXCircleCenter-7, scl*clockRhtNumMat(2,itxt)+center(1,2)-14, blackLut, wRGB); + textNum = num2str(textOne(itxt+12)); + Screen('DrawText', window, textNum, .9*scl*clockLftNumMat(1,itxt)+lftXCircleCenter-7, .9*scl*clockLftNumMat(2,itxt)+center(1,2)-14, blackLut, wRGB); +end +Screen('Flip', window); +% WaitSecs(duration) +KbWait(); +% +% end + +% KbStrokeWait; +Screen('CloseAll') + +end \ No newline at end of file diff --git a/002 After Image GUI Project/HFP_session.m b/002 After Image GUI Project/HFP_session.m index eb060ac..244a66a 100644 --- a/002 After Image GUI Project/HFP_session.m +++ b/002 After Image GUI Project/HFP_session.m @@ -1,5 +1,5 @@ -function HFP_session(subName,curr_cond) +function HFP_session(subName,curr_cond, calibDir) % HFP Code for Elliott Lab % Written by SLE 3/24/17 @@ -12,9 +12,9 @@ hfpDate = date; saveFile = sprintf('%sHFP',subName); numRep = 3; %number of repetitions -Calib_Dire = cd('/Users/clemente/Desktop/AfterImage Programs/002 After Image GUI Project'); +%Calib_Dire = cd('/Users/clemente/Desktop/AfterImage Programs/002 After Image GUI Project'); %load in monitor calibration information & color set parameters -load colorCalFile1.mat +load([calibDir,'colorCalFile1.mat']); fprintf('\nLast calibration was %s\n', describe.date); pixDec = pix/length(pix); %converts 1001 numbers to decimals lum = 5; %in cd/m^2 @@ -36,7 +36,7 @@ initial_BLUE = settings(3) stepSize = 4; %% Load previous HFP values -aa = cd('/Users/clemente/Desktop/AfterImage Programs/A Outputs'); +%aa = cd('/Users/clemente/Desktop/AfterImage Programs/A Outputs'); name = sprintf('%sHFP.mat', subName); if exist(name, 'file') == 2 @@ -81,7 +81,7 @@ pixPerDeg =35;% was 60 in Sarah Program circlePix = circleDeg*pixPerDeg; tstcircle = [xcent - circlePix/2 ycent - circlePix/2 xcent + circlePix/2 ycent + circlePix/2]; -cd(a); % return to folder where the program is +%cd(a); % return to folder where the program is %run experiment Priority(topPriorityLevel); % for iRepeat = 1:numRep @@ -296,7 +296,7 @@ rb_avg = []; end % Save to mat file -aa = cd('/Users/clemente/Desktop/AfterImage Programs/A Outputs'); +%aa = cd('/Users/clemente/Desktop/AfterImage Programs/A Outputs'); saveCmd = ['save ' saveFile ' hfpDate rg_avg bg_avg rb_avg Prev_rg Prev_bg Prev_br Prev_brcheck']; eval(saveCmd) diff --git a/002 After Image GUI Project/Program Compiled/.DS_Store b/002 After Image GUI Project/Program Compiled/.DS_Store deleted file mode 100644 index 27d6176..0000000 Binary files a/002 After Image GUI Project/Program Compiled/.DS_Store and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/PackagingLog.html b/002 After Image GUI Project/Program Compiled/PackagingLog.html deleted file mode 100644 index 5d278b4..0000000 --- a/002 After Image GUI Project/Program Compiled/PackagingLog.html +++ /dev/null @@ -1,39 +0,0 @@ -
-mcc -o tvp_GENERATOR -W main:tvp_GENERATOR -T link:exe -d '/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_testing' -v '/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/AppTEST.mlapp' 
-Compiler version: 6.2 (R2016a)
-
-Dependency analysis by REQUIREMENTS.
-
-Name is nonexistent or not a directory: /Users/clemente/Dropbox/Luminotecnia/2017/Chicago Lab files/2 Experiments/Color AfterImage_Exp_Room_150/2nd/1 Programs/002 After Image GUI Project
-[Warning: Directory permission denied: /Users/inaki/Documents/Color Afterimages] 
-[Warning: Adding path
-"/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background
-Afterimage/1 Programs/002 After Image GUI Project" to Compiler path instance.] 
-Parsing file "/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/AppTEST.mlapp"
-	(Referenced from: "Compiler Command Line").
-Deleting 11 temporary MEX authorization files.
-Removing: '/tmp/020341yliQ7_8244.auth'.
-Removing: '/tmp/02034TqWg50_8244.auth'.
-Removing: '/tmp/02034ZEw9Wc_8244.auth'.
-Removing: '/tmp/02034lnprP3_8244.auth'.
-Removing: '/tmp/02034Lw9dR6_8244.auth'.
-Removing: '/tmp/02034rmBu8Q_8244.auth'.
-Removing: '/tmp/020344qOOri_8244.auth'.
-Removing: '/tmp/02034aVx57k_8244.auth'.
-Removing: '/tmp/02034hgoEMd_8244.auth'.
-Removing: '/tmp/020340Cm2kq_8244.auth'.
-Removing: '/tmp/02034Nyhm5R_8244.auth'.
-Generating file "/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_testing/readme.txt".
-Generating file "/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_testing/run_tvp_GENERATOR.sh".
-Packaging...
-Adding custom icon /Applications/MATLAB_R2016a.app/toolbox/compiler/Resources/default_icon.icns to /Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app.
-Creating the bundle...
-Copying /Applications/MATLAB_R2016a.app/toolbox/compiler/maci64/setup.app to /Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app.
-Copying /Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_redistribution/bundle.zip to /Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/bundle.zip.
-Copying /Applications/MATLAB_R2016a.app/toolbox/compiler/Resources/default_splash.png to /Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/splash.png.
-Copying /Applications/MATLAB_R2016a.app/toolbox/compiler/Resources/default_icon.icns to /Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/installer.icns.
-Copying /Users/clemente/.installAgent9.0.1/maci64/InstallAgent_35000_35010.zip to /Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/InstallAgent_35000_35010.zip.
-Self contained installer created at /Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app.
-Packaging complete.
-Elapsed packaging time was: 3 minutes and 29 seconds.
-
diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Info.plist b/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Info.plist deleted file mode 100644 index 9f548b6..0000000 --- a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - setup - CFBundleIconFile - installer.icns - CFBundleIdentifier - com.mathworks.toolbox.compiler.setup - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.4 - NSHumanReadableCopyright - Copyright © 2013 __MyCompanyName__. All rights reserved. - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/MacOS/setup b/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/MacOS/setup deleted file mode 100755 index ed65350..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/MacOS/setup and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/MacOS/setup.dSYM/Contents/Info.plist b/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/MacOS/setup.dSYM/Contents/Info.plist deleted file mode 100644 index 29859ca..0000000 --- a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/MacOS/setup.dSYM/Contents/Info.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleIdentifier - com.apple.xcode.dsym.com.mathworks.toolbox.compiler.setup - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - dSYM - CFBundleSignature - ???? - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/MacOS/setup.dSYM/Contents/Resources/DWARF/setup b/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/MacOS/setup.dSYM/Contents/Resources/DWARF/setup deleted file mode 100644 index 33a6987..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/MacOS/setup.dSYM/Contents/Resources/DWARF/setup and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/InstallAgent_35000_35010.zip b/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/InstallAgent_35000_35010.zip deleted file mode 100644 index 28b9e3e..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/InstallAgent_35000_35010.zip and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/bundle.zip b/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/bundle.zip deleted file mode 100644 index 69f4ffe..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/bundle.zip and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/en.lproj/MainMenu.nib b/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/en.lproj/MainMenu.nib deleted file mode 100644 index dc842dd..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/en.lproj/MainMenu.nib and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/installer.icns b/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/installer.icns deleted file mode 100755 index 8f10702..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/installer.icns and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/splash.png b/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/splash.png deleted file mode 100644 index d60c6fa..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution/MyAppInstaller_mcr.app/Contents/Resources/splash.png and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/default_icon.icns b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/default_icon.icns deleted file mode 100755 index 8f10702..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/default_icon.icns and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/readme.txt b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/readme.txt deleted file mode 100644 index 182559f..0000000 --- a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/readme.txt +++ /dev/null @@ -1,120 +0,0 @@ -MATLAB Compiler - -1. Prerequisites for Deployment - -. Verify the MATLAB Runtime is installed and ensure you - have installed version 9.0.1 (R2016a). - -. If the MATLAB Runtime is not installed, do the following: - (1) enter - - >>mcrinstaller - - at MATLAB prompt. The MCRINSTALLER command displays the - location of the MATLAB Runtime installer. - - (2) run the MATLAB Runtime installer. - -Or download the Macintosh version of the MATLAB Runtime for R2016a -from the MathWorks Web site by navigating to - - http://www.mathworks.com/products/compiler/mcr/index.html - - -For more information about the MATLAB Runtime and the MATLAB Runtime installer, see -Package and Distribute in the MATLAB Compiler documentation -in the MathWorks Documentation Center. - - -NOTE: You will need administrator rights to run MCRInstaller. - - -2. Files to Deploy and Package - -Files to package for Standalone -================================ --run_tvp_GENERATOR.sh (shell script for temporarily setting environment variables and - executing the application) - -to run the shell script, type - - ./run_tvp_GENERATOR.sh - - at Linux or Mac command prompt. is the directory - where version 9.0.1 of the MATLAB Runtime is installed or the directory where - MATLAB is installed on the machine. is all the - arguments you want to pass to your application. For example, - - If you have version 9.0.1 of the MATLAB Runtime installed in - /mathworks/home/application/v901, run the shell script as: - - ./run_tvp_GENERATOR.sh /mathworks/home/application/v901 - - If you have MATLAB installed in /mathworks/devel/application/matlab, - run the shell script as: - - ./run_tvp_GENERATOR.sh /mathworks/devel/application/matlab --MCRInstaller.zip - -if end users are unable to download the MATLAB Runtime using the above - link, include it when building your component by clicking - the "Runtime downloaded from web" link in the Deployment Tool --The Macintosh bundle directory structure tvp_GENERATOR.app - -this can be gathered up using the zip command - zip -r tvp_GENERATOR.zip tvp_GENERATOR.app - or the tar command - tar -cvf tvp_GENERATOR.tar tvp_GENERATOR.app --This readme file - -3. Definitions - -For information on deployment terminology, go to -http://www.mathworks.com/help. Select MATLAB Compiler > -Getting Started > About Application Deployment > -Deployment Product Terms in the MathWorks Documentation -Center. - - -4. Appendix - -A. Mac systems: -In the following directions, replace MCR_ROOT by the directory where the MATLAB Runtime - is installed on the target machine. - -If the environment variable DYLD_LIBRARY_PATH is undefined, set it to the concatenation - of the following strings: - - MCR_ROOT/v901/runtime/maci64: - MCR_ROOT/v901/sys/os/maci64: - MCR_ROOT/v901/bin/maci64 - -If it is defined, set it to the concatenation of these strings: - - ${LD_LIBRARY_PATH}: - MCR_ROOT/v901/runtime/maci64: - MCR_ROOT/v901/sys/os/maci64: - MCR_ROOT/v901/bin/maci64 - - For more detail information about setting the MATLAB Runtime paths, see Package and - Distribute in the MATLAB Compiler documentation in the MathWorks Documentation Center. - - - - NOTE: To make these changes persistent after logout on Linux - or Mac machines, modify the .cshrc file to include this - setenv command. - NOTE: The environment variable syntax utilizes forward - slashes (/), delimited by colons (:). - NOTE: When deploying standalone applications, it is possible - to run the shell script file run_tvp_GENERATOR.sh - instead of setting environment variables. See - section 2 "Files to Deploy and Package". - - - -5. Launching of application using Macintosh finder. - -If the application is purely graphical, that is, it doesn't read from standard in or -write to standard out or standard error, it may be launched in the finder just like any -other Macintosh application. - - - diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/run_tvp_GENERATOR.sh b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/run_tvp_GENERATOR.sh deleted file mode 100755 index 8f2b8e8..0000000 --- a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/run_tvp_GENERATOR.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# script for execution of deployed applications -# -# Sets up the MATLAB Runtime environment for the current $ARCH and executes -# the specified command. -# -exe_name=$0 -exe_dir=`dirname "$0"` -echo "------------------------------------------" -if [ "x$1" = "x" ]; then - echo Usage: - echo $0 \ args -else - echo Setting up environment variables - MCRROOT="$1" - echo --- - DYLD_LIBRARY_PATH=.:${MCRROOT}/runtime/maci64 ; - DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${MCRROOT}/bin/maci64 ; - DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${MCRROOT}/sys/os/maci64; - export DYLD_LIBRARY_PATH; - echo DYLD_LIBRARY_PATH is ${DYLD_LIBRARY_PATH}; - shift 1 - args= - while [ $# -gt 0 ]; do - token=$1 - args="${args} \"${token}\"" - shift - done - eval "\"${exe_dir}/tvp_GENERATOR.app/Contents/MacOS/tvp_GENERATOR\"" $args -fi -exit - diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/splash.png b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/splash.png deleted file mode 100644 index d60c6fa..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/splash.png and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Info.plist b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Info.plist deleted file mode 100644 index e7d5da7..0000000 --- a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - prelaunch - CFBundleIconFile - membrane.icns - CFBundleIdentifier - tvp_GENERATOR - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - tvp_GENERATOR - CFBundlePackageType - APPL - CFBundleSignature - tvp_GENERATOR - CFBundleVersion - 1 - CFBundleVersionString - 1.0 - CFResourcesFileMapped - - LSMinimumSystemVersion - 10.9.0 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/MacOS/applauncher b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/MacOS/applauncher deleted file mode 100755 index 9be1e80..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/MacOS/applauncher and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/MacOS/prelaunch b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/MacOS/prelaunch deleted file mode 100755 index 820c27a..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/MacOS/prelaunch and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/MacOS/tvp_GENERATOR b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/MacOS/tvp_GENERATOR deleted file mode 100755 index df01a61..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/MacOS/tvp_GENERATOR and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/About.nib b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/About.nib deleted file mode 100644 index 6903da1..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/About.nib and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWOpenAccessoryView.nib b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWOpenAccessoryView.nib deleted file mode 100644 index 4dd35d3..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWOpenAccessoryView.nib and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWSaveAccessoryView.nib b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWSaveAccessoryView.nib deleted file mode 100644 index 305519f..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWSaveAccessoryView.nib and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MainMenu.nib b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MainMenu.nib deleted file mode 100644 index e67f49b..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MainMenu.nib and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/membrane.icns b/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/membrane.icns deleted file mode 100755 index 8f10702..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_redistribution_files_only/tvp_GENERATOR.app/Contents/Resources/membrane.icns and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_testing/.DS_Store b/002 After Image GUI Project/Program Compiled/for_testing/.DS_Store deleted file mode 100644 index 84f8365..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_testing/.DS_Store and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_testing/mccExcludedFiles.log b/002 After Image GUI Project/Program Compiled/for_testing/mccExcludedFiles.log deleted file mode 100644 index 50ed07c..0000000 --- a/002 After Image GUI Project/Program Compiled/for_testing/mccExcludedFiles.log +++ /dev/null @@ -1,7 +0,0 @@ -The List of Excluded Files -Excluded files Exclusion Message ID Reason For Exclusion Exclusion Rule -/Applications/MATLAB_R2016a.app/toolbox/local/+matlab/+internal/+toolboxes/addInstalledToolboxesToPath.m MATLAB:Completion:ExcludedBy Cannot be packaged for use in the target environment MCR. Removed from the parts list by license Compiler. /Applications/MATLAB_R2016a\.app/toolbox/local/[+]matlab/[+]internal/[+]toolboxes/addInstalledToolboxesToPath[.]m -/Applications/MATLAB_R2016a.app/toolbox/local/+matlab/+internal/+zipAddOns/addInstalledZipAddOnsToPath.m MATLAB:Completion:ExcludedBy Cannot be packaged for use in the target environment MCR. Removed from the parts list by license Compiler. /Applications/MATLAB_R2016a\.app/toolbox/local/[+]matlab/[+]internal/[+]zipAddOns/addInstalledZipAddOnsToPath[.]m -/Applications/MATLAB_R2016a.app/toolbox/local/pathdef.m MATLAB:Completion:ExcludedBy Cannot be packaged for use in the target environment MCR. Removed from the parts list by license Compiler. /Applications/MATLAB_R2016a\.app/toolbox/local/pathdef[.]m -/Applications/MATLAB_R2016a.app/toolbox/matlab/codetools/commandwindow.m MATLAB:Completion:ExcludedBy Cannot be packaged for use in the target environment MCR. Removed from the parts list by license Compiler. /Applications/MATLAB_R2016a\.app/toolbox/matlab/codetools -/Applications/MATLAB_R2016a.app/toolbox/matlab/codetools/initdesktoputils.m MATLAB:Completion:ExcludedBy Cannot be packaged for use in the target environment MCR. Removed from the parts list by license Compiler. /Applications/MATLAB_R2016a\.app/toolbox/matlab/codetools diff --git a/002 After Image GUI Project/Program Compiled/for_testing/readme.txt b/002 After Image GUI Project/Program Compiled/for_testing/readme.txt deleted file mode 100644 index 182559f..0000000 --- a/002 After Image GUI Project/Program Compiled/for_testing/readme.txt +++ /dev/null @@ -1,120 +0,0 @@ -MATLAB Compiler - -1. Prerequisites for Deployment - -. Verify the MATLAB Runtime is installed and ensure you - have installed version 9.0.1 (R2016a). - -. If the MATLAB Runtime is not installed, do the following: - (1) enter - - >>mcrinstaller - - at MATLAB prompt. The MCRINSTALLER command displays the - location of the MATLAB Runtime installer. - - (2) run the MATLAB Runtime installer. - -Or download the Macintosh version of the MATLAB Runtime for R2016a -from the MathWorks Web site by navigating to - - http://www.mathworks.com/products/compiler/mcr/index.html - - -For more information about the MATLAB Runtime and the MATLAB Runtime installer, see -Package and Distribute in the MATLAB Compiler documentation -in the MathWorks Documentation Center. - - -NOTE: You will need administrator rights to run MCRInstaller. - - -2. Files to Deploy and Package - -Files to package for Standalone -================================ --run_tvp_GENERATOR.sh (shell script for temporarily setting environment variables and - executing the application) - -to run the shell script, type - - ./run_tvp_GENERATOR.sh - - at Linux or Mac command prompt. is the directory - where version 9.0.1 of the MATLAB Runtime is installed or the directory where - MATLAB is installed on the machine. is all the - arguments you want to pass to your application. For example, - - If you have version 9.0.1 of the MATLAB Runtime installed in - /mathworks/home/application/v901, run the shell script as: - - ./run_tvp_GENERATOR.sh /mathworks/home/application/v901 - - If you have MATLAB installed in /mathworks/devel/application/matlab, - run the shell script as: - - ./run_tvp_GENERATOR.sh /mathworks/devel/application/matlab --MCRInstaller.zip - -if end users are unable to download the MATLAB Runtime using the above - link, include it when building your component by clicking - the "Runtime downloaded from web" link in the Deployment Tool --The Macintosh bundle directory structure tvp_GENERATOR.app - -this can be gathered up using the zip command - zip -r tvp_GENERATOR.zip tvp_GENERATOR.app - or the tar command - tar -cvf tvp_GENERATOR.tar tvp_GENERATOR.app --This readme file - -3. Definitions - -For information on deployment terminology, go to -http://www.mathworks.com/help. Select MATLAB Compiler > -Getting Started > About Application Deployment > -Deployment Product Terms in the MathWorks Documentation -Center. - - -4. Appendix - -A. Mac systems: -In the following directions, replace MCR_ROOT by the directory where the MATLAB Runtime - is installed on the target machine. - -If the environment variable DYLD_LIBRARY_PATH is undefined, set it to the concatenation - of the following strings: - - MCR_ROOT/v901/runtime/maci64: - MCR_ROOT/v901/sys/os/maci64: - MCR_ROOT/v901/bin/maci64 - -If it is defined, set it to the concatenation of these strings: - - ${LD_LIBRARY_PATH}: - MCR_ROOT/v901/runtime/maci64: - MCR_ROOT/v901/sys/os/maci64: - MCR_ROOT/v901/bin/maci64 - - For more detail information about setting the MATLAB Runtime paths, see Package and - Distribute in the MATLAB Compiler documentation in the MathWorks Documentation Center. - - - - NOTE: To make these changes persistent after logout on Linux - or Mac machines, modify the .cshrc file to include this - setenv command. - NOTE: The environment variable syntax utilizes forward - slashes (/), delimited by colons (:). - NOTE: When deploying standalone applications, it is possible - to run the shell script file run_tvp_GENERATOR.sh - instead of setting environment variables. See - section 2 "Files to Deploy and Package". - - - -5. Launching of application using Macintosh finder. - -If the application is purely graphical, that is, it doesn't read from standard in or -write to standard out or standard error, it may be launched in the finder just like any -other Macintosh application. - - - diff --git a/002 After Image GUI Project/Program Compiled/for_testing/requiredMCRProducts.txt b/002 After Image GUI Project/Program Compiled/for_testing/requiredMCRProducts.txt deleted file mode 100644 index 3ed6af0..0000000 --- a/002 After Image GUI Project/Program Compiled/for_testing/requiredMCRProducts.txt +++ /dev/null @@ -1 +0,0 @@ -35000 35010 \ No newline at end of file diff --git a/002 After Image GUI Project/Program Compiled/for_testing/run_tvp_GENERATOR.sh b/002 After Image GUI Project/Program Compiled/for_testing/run_tvp_GENERATOR.sh deleted file mode 100755 index 8f2b8e8..0000000 --- a/002 After Image GUI Project/Program Compiled/for_testing/run_tvp_GENERATOR.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# script for execution of deployed applications -# -# Sets up the MATLAB Runtime environment for the current $ARCH and executes -# the specified command. -# -exe_name=$0 -exe_dir=`dirname "$0"` -echo "------------------------------------------" -if [ "x$1" = "x" ]; then - echo Usage: - echo $0 \ args -else - echo Setting up environment variables - MCRROOT="$1" - echo --- - DYLD_LIBRARY_PATH=.:${MCRROOT}/runtime/maci64 ; - DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${MCRROOT}/bin/maci64 ; - DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${MCRROOT}/sys/os/maci64; - export DYLD_LIBRARY_PATH; - echo DYLD_LIBRARY_PATH is ${DYLD_LIBRARY_PATH}; - shift 1 - args= - while [ $# -gt 0 ]; do - token=$1 - args="${args} \"${token}\"" - shift - done - eval "\"${exe_dir}/tvp_GENERATOR.app/Contents/MacOS/tvp_GENERATOR\"" $args -fi -exit - diff --git a/002 After Image GUI Project/Program Compiled/for_testing/splash.png b/002 After Image GUI Project/Program Compiled/for_testing/splash.png deleted file mode 100644 index d60c6fa..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_testing/splash.png and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Info.plist b/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Info.plist deleted file mode 100644 index e7d5da7..0000000 --- a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - prelaunch - CFBundleIconFile - membrane.icns - CFBundleIdentifier - tvp_GENERATOR - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - tvp_GENERATOR - CFBundlePackageType - APPL - CFBundleSignature - tvp_GENERATOR - CFBundleVersion - 1 - CFBundleVersionString - 1.0 - CFResourcesFileMapped - - LSMinimumSystemVersion - 10.9.0 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/MacOS/applauncher b/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/MacOS/applauncher deleted file mode 100755 index 9be1e80..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/MacOS/applauncher and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/MacOS/prelaunch b/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/MacOS/prelaunch deleted file mode 100755 index 820c27a..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/MacOS/prelaunch and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/MacOS/tvp_GENERATOR b/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/MacOS/tvp_GENERATOR deleted file mode 100755 index df01a61..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/MacOS/tvp_GENERATOR and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/About.nib b/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/About.nib deleted file mode 100644 index 6903da1..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/About.nib and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWOpenAccessoryView.nib b/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWOpenAccessoryView.nib deleted file mode 100644 index 4dd35d3..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWOpenAccessoryView.nib and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWSaveAccessoryView.nib b/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWSaveAccessoryView.nib deleted file mode 100644 index 305519f..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MWSaveAccessoryView.nib and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MainMenu.nib b/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MainMenu.nib deleted file mode 100644 index e67f49b..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/Base.lproj/MainMenu.nib and /dev/null differ diff --git a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/membrane.icns b/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/membrane.icns deleted file mode 100755 index 8f10702..0000000 Binary files a/002 After Image GUI Project/Program Compiled/for_testing/tvp_GENERATOR.app/Contents/Resources/membrane.icns and /dev/null differ diff --git a/002 After Image GUI Project/TVP_GENERATOR.mlapp b/002 After Image GUI Project/TVP_GENERATOR.mlapp index 5ae28ad..595a857 100644 Binary files a/002 After Image GUI Project/TVP_GENERATOR.mlapp and b/002 After Image GUI Project/TVP_GENERATOR.mlapp differ