Skip to content
Snippets Groups Projects
Commit 2cd20a60 authored by Kyrre Ness Sjobaek's avatar Kyrre Ness Sjobaek
Browse files

Merge branch 'master' into doublefilter; 

update with changes in MATLAB code
parents c6cabcb0 7bc3865a
No related branches found
No related tags found
1 merge request!20Doublefilter
Hide whitespace changes
Inline Side-by-side
MatLab/Robot_GUI_exported.m
+ 91
− 44
View file @ 2cd20a60
classdef Robot_GUI_exported < matlab.apps.AppBase
classdef Robot_GUI_Oct23_2 < matlab.apps.AppBase
% Properties that correspond to app components
properties (Access = public)
......@@ -101,40 +101,40 @@ classdef Robot_GUI_exported < matlab.apps.AppBase
StepperIsMoving = NaN;
Pos_holders = [225 250 2225; ...
225 1825 2225; ...
717 250 2225; ...
717 1825 2225; ...
1198 250 2225; ...
1198 1825 2225; ...
1679 250 2225; ...
1679 1825 2225; ...
2160 250 2225; ...
2160 1825 2225; ...
2641 250 2225; ...
2641 1825 2225; ...
3122 250 2225; ...
3122 1825 2225; ...
3603 250 2225; ...
3603 1825 2225; ...
4084 250 2225; ...
4084 1825 2225; ...
4565 250 2225; ...
4565 1825 2225; ...
5046 250 2225; ...
5046 1825 2225; ...
5527 250 2225; ...
5527 1825 2225; ...
6008 250 2225; ...
6008 1825 2225; ...
6489 250 2225; ...
6489 1825 2225; ...
6970 250 2225; ...
6970 1825 2225; ...
7451 250 2225; ...
7451 1825 2225; ...
7932 250 2225; ...
8413 1825 2225];
Pos_holders = [210 200 2200; ...
210 1825 2200; ...
695 200 2200; ...
695 1825 2200; ...
1180 200 2200; ...
1180 1825 2200; ...
1660 200 2200; ...
1660 1825 2200; ...
2140 200 2200; ...
2140 1825 2200; ...
2620 200 2200; ...
2620 1825 2200; ...
3100 200 2200; ...
3100 1825 2200; ...
3575 200 2200; ...
3575 1825 2200; ...
4050 200 2200; ...
4050 1825 2200; ...
4535 200 2200; ...
4535 1825 2200; ...
4900 200 2200; ...
5010 1825 2200; ...
5495 200 2200; ...
5495 1825 2200; ...
5970 200 2200; ...
5970 1825 2200; ...
6445 200 2200; ...
6445 1825 2200; ...
6920 200 2200; ...
6920 1825 2200; ...
7451 200 2200; ...
7451 1825 2200; ...
7932 200 2200; ...
8413 1825 2200];
%List of all holder buttons,
% not possible to generate programattically in AppDesigner
......@@ -185,7 +185,7 @@ classdef Robot_GUI_exported < matlab.apps.AppBase
%Plotting the position
axes(app.UIAxes_6);
% axes(app.UIAxes_6);
scatter(app.UIAxes_6,Pos_X, Pos_Z,100,"red",'filled');
rectangle(app.UIAxes_6,'Position', [0 1400 8000 1600],'FaceColor',[1, .8, .8, 0.5],'EdgeColor','r','LineWidth',1)
......@@ -194,7 +194,7 @@ classdef Robot_GUI_exported < matlab.apps.AppBase
rectangle(app.UIAxes_6,'Position', [0 2000 8000 1000],'FaceColor',[0, 1, 1, 0.5],'EdgeColor','blue','LineWidth',1)
axes(app.UIAxes_5);
% axes(app.UIAxes_5);
scatter(app.UIAxes_5,Pos_X, Pos_Y,100,"red",'filled');
rectangle(app.UIAxes_5,'Position', [0 0 8000 2000],'FaceColor',[0, 1, 1, 0.5],'EdgeColor','blue','LineWidth',1)
......@@ -202,7 +202,7 @@ classdef Robot_GUI_exported < matlab.apps.AppBase
rectangle(app.UIAxes_5,'Position', [0 5280 8000 2720],'FaceColor',[0, 1, 1, 0.5],'EdgeColor','blue','LineWidth',1)
text(app.UIAxes_5,3000,6750,'Beam tank')
axes(app.UIAxes_4);
% axes(app.UIAxes_4);
scatter(app.UIAxes_4,Pos_Y, Pos_Z,100,"red",'filled');
rectangle(app.UIAxes_4,'Position', [0 2000 2000 1000],'FaceColor',[0, 1, 1, 0.5],'EdgeColor','blue','LineWidth',1)
......@@ -219,7 +219,7 @@ classdef Robot_GUI_exported < matlab.apps.AppBase
%
% app.UIAxes_3.View = [90 45];
% app.UIAxes_3.Projection = 'perspective';
%
% H=[0 8000 0 8000 0 8000 0 8000; 0 0 2000 2000 0 0 2000 2000; 3000 3000 3000 3000 1500 1500 1500 1500]; %Vertices of the cube
% S=[1 2 4 3; 1 2 6 5; 1 3 7 5; 3 4 8 7; 2 4 8 6; 5 6 8 7]; %Surfaces of the cube
% hold(app.UIAxes_3,"on")
......@@ -370,7 +370,9 @@ classdef Robot_GUI_exported < matlab.apps.AppBase
app.conn.stepperGo('X',Pos_h_X);
app.conn.stepperGo('Y',Pos_h_Y);
app.conn.stepperGo('Z',Pos_h_Z);
app.conn.grabberClose;
%app.conn.grabberClose;
app.conn.grabberGo(80);
app.conn.updateGrabberStatus
......@@ -466,10 +468,54 @@ classdef Robot_GUI_exported < matlab.apps.AppBase
function PutHolderInBeamPushed(app, event)
app.conn.updateGrabberStatus
% FOR Screen dosimetry (film center)
app.conn.stepperGo('Z',50);
app.conn.stepperGo('Y',7210);
app.conn.stepperGo('X',app.XpositioninbeammmEditField.Value*7803/460+95*7803/460);
app.conn.stepperGo('Z',2340);
app.conn.stepperGo('X',app.XpositioninbeammmEditField.Value*20+1611);
app.conn.stepperGo('Z',2240);
% FOR CHUV Plasmids and ZFE (low)
% app.conn.stepperGo('Z',50);
% app.conn.stepperGo('Y',7210);
% app.conn.stepperGo('X',app.XpositioninbeammmEditField.Value*20+1611);
% app.conn.stepperGo('Z',2225);
% FOR UVic Drosophilia (low)
% app.conn.stepperGo('Z',50);
% app.conn.stepperGo('Y',7210);
% app.conn.stepperGo('X',app.XpositioninbeammmEditField.Value*20+1611);
% app.conn.stepperGo('Z',2425);
%
% FOR CHUV Chemistry (center)
% app.conn.stepperGo('Z',50);
% app.conn.stepperGo('Y',7210);
% app.conn.stepperGo('X',app.XpositioninbeammmEditField.Value*20+1611);
% app.conn.stepperGo('Z',2300);
% FOR Hannah Plasmids (1.5 mL tubes)
% app.conn.stepperGo('Z',50);
% app.conn.stepperGo('Y',7210);
% app.conn.stepperGo('X',app.XpositioninbeammmEditField.Value*20+1611);
% app.conn.stepperGo('Z',2350);
% For Scatterers
% app.conn.stepperGo('Z',50);
% app.conn.stepperGo('Y',7140);
% app.conn.stepperGo('X',app.XpositioninbeammmEditField.Value*20+1611);
% app.conn.stepperGo('Z',2380);
% For Scatterers 2
% app.conn.stepperGo('Z',50);
% app.conn.stepperGo('Y',7210);
% app.conn.stepperGo('X',app.XpositioninbeammmEditField.Value*20+1611);
% app.conn.stepperGo('Z',2240);
% For Scatterers 3
% app.conn.stepperGo('Z',50);
% app.conn.stepperGo('Y',7210);
% app.conn.stepperGo('X',app.XpositioninbeammmEditField.Value*20+1611);
% app.conn.stepperGo('Z',2340);
%Disable itself, enable bringback button
app.BringbackholderButton.Enable = true;
......@@ -572,7 +618,8 @@ classdef Robot_GUI_exported < matlab.apps.AppBase
app.conn.stepperGo('Y',app.Pos_hold_Y);
app.conn.stepperGo('Z',app.Pos_hold_Z);
app.conn.grabberClose();
%app.conn.grabberClose();
app.conn.grabberGo(80);
app.conn.updateGrabberStatus();
end
......@@ -1169,7 +1216,7 @@ classdef Robot_GUI_exported < matlab.apps.AppBase
methods (Access = public)
% Construct app
function app = Robot_GUI_exported
function app = Robot_GUI_Oct23_2
% Create UIFigure and components
createComponents(app)
......
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