Code

Qtasks#18

Code

Merged

sustielz merged 109 commits intomasterdavidgrier/pyfab:masterfrom qtasksdavidgrier/pyfab:qtasksCopy head branch name to clipboardAug 18, 2020

+1,816-2,094

Commits

Commits on Jun 19, 2020

• notes for refactoring

  davidgrier

  committed
  99e91b5

  Copy full SHA for 99e91b5

• simplify source setter

  davidgrier

  committed
  d98da52

  Copy full SHA for d98da52

• further simplify source setter

  davidgrier

  committed
  d566436

  Copy full SHA for d566436

Commits on Jun 20, 2020

• convert Tasks to QTasks

  davidgrier

  committed
  21440f7

  Copy full SHA for 21440f7

• update requirements.txt with pipreqs

  davidgrier

  committed
  7cf11da

  Copy full SHA for 7cf11da

• organize tasks in lib

  davidgrier

  committed
  4ea0435

  Copy full SHA for 4ea0435

• update for QTask

  davidgrier

  committed
  e82a40b

  Copy full SHA for e82a40b

• upgrade to QTrapmanager

  davidgrier

  committed
  369b75f

  Copy full SHA for 369b75f

• demo task

  davidgrier

  committed
  e19e5c6

  Copy full SHA for e19e5c6

• first working QTask implementation

  davidgrier

  committed
  6a22dc0

  Copy full SHA for 6a22dc0

Commits on Jun 21, 2020

• Correctly handle long-running tasks

  davidgrier

  committed
  56e9069

  Copy full SHA for 56e9069

• update documentation for QTask

  davidgrier

  committed
  a007f6f

  Copy full SHA for a007f6f

• tasks organized in lib

  davidgrier

  committed
  6c679d2

  Copy full SHA for 6c679d2

• render arbitrary text

  davidgrier

  committed
  18d7755

  Copy full SHA for 18d7755

• incorporating automation tasks

  davidgrier

  committed
  013389c

  Copy full SHA for 013389c

• create optical vortex

  davidgrier

  committed
  59b0be7

  Copy full SHA for 59b0be7

• move to add-trap menu

  davidgrier

  committed
  b1033a1

  Copy full SHA for b1033a1

• create ring traps

  davidgrier

  committed
  0816e4a

  Copy full SHA for 0816e4a

• upgrade for QTask

  davidgrier

  committed
  6208ff0

  Copy full SHA for 6208ff0

• add trap on optical axis

  davidgrier

  committed
  46a0066

  Copy full SHA for 46a0066

• create Bessel beam

  davidgrier

  committed
  291adf5

  Copy full SHA for 291adf5

• more descriptive labels

  davidgrier

  committed
  68e28f0

  Copy full SHA for 68e28f0

• create trap at optical axis

  davidgrier

  committed
  a9a7cf1

  Copy full SHA for a9a7cf1

• create line trap

  davidgrier

  committed
  34c64da

  Copy full SHA for 34c64da

• CGH configuration in QCGH

  davidgrier

  committed
  e31405b

  Copy full SHA for e31405b

• sort out implementation issues in each subsystem

  davidgrier

  committed
  3a89853

  Copy full SHA for 3a89853

• configure subdirectories as modules

  davidgrier

  committed
  edb129c

  Copy full SHA for edb129c

Commits on Jun 22, 2020

• eliminate local variable

  davidgrier

  committed
  723ee6c

  Copy full SHA for 723ee6c

• small simplification

  davidgrier

  committed
  05ffe99

  Copy full SHA for 05ffe99

• hooks for non-blocking tasks

  davidgrier

  committed
  1605032

  Copy full SHA for 1605032

Commits on Jun 23, 2020

• incorporate Jackie's recommendations for nonblocking tasks

  davidgrier

  committed
  3483ccf

  Copy full SHA for 3483ccf

Commits on Jun 24, 2020

• More descriptive name

  davidgrier

  committed
  9f4ae5f

  Copy full SHA for 9f4ae5f

• upgrade for QTask

  davidgrier

  committed
  a108e2f

  Copy full SHA for a108e2f

• typo caused crashes

  davidgrier

  committed
  e9d41ba

  Copy full SHA for e9d41ba

• organize menu

  davidgrier

  committed
  14a17af

  Copy full SHA for 14a17af

Commits on Jun 26, 2020

• update for QTask

  davidgrier

  committed
  b9e6ad9

  Copy full SHA for b9e6ad9

• remove extraneous condition

  davidgrier

  committed
  e593822

  Copy full SHA for e593822

• Rename for clarity

  davidgrier

  committed
  1b11ac0

  Copy full SHA for 1b11ac0

• start and stop recording as a task

  davidgrier

  committed
  8948235

  Copy full SHA for 8948235

• framework for moving traps with a task

  davidgrier

  committed
  e36c2e9

  Copy full SHA for e36c2e9

Commits on Jul 4, 2020

• simplify dequeuing tasks

  davidgrier

  committed
  b0fc359

  Copy full SHA for b0fc359

• pass task explicitly

  davidgrier

  committed
  130d993

  Copy full SHA for 130d993

• QTrapGroup is a PyQt5 object

  davidgrier

  committed
  19352a3

  Copy full SHA for 19352a3

• use pyqtProperty

  davidgrier

  committed
  f69fca6

  Copy full SHA for f69fca6

• use pyqtProperty

  davidgrier

  committed
  2cbf6b8

  Copy full SHA for 2cbf6b8

• center text on screen

  davidgrier

  committed
  55fbd6f

  Copy full SHA for 55fbd6f

Commits on Jul 5, 2020

• Additional state

  davidgrier

  committed
  f4a4c09

  Copy full SHA for f4a4c09

• correct pause logic

  davidgrier

  committed
  92c391e

  Copy full SHA for 92c391e

• updates for PyQt5

  davidgrier

  committed
  262f718

  Copy full SHA for 262f718

Commits on Jul 11, 2020

• rename pattern to traps

  davidgrier

  committed
  5eee18e

  Copy full SHA for 5eee18e

• assign parents to widgets

  davidgrier

  committed
  81d1246

  Copy full SHA for 81d1246

Commits on Jul 12, 2020

• remove extraneous signals

  davidgrier

  committed
  2833c76

  Copy full SHA for 2833c76

• moving hologram computation into QTrap

  davidgrier

  committed
  8c20778

  Copy full SHA for 8c20778

• each trap computes its own hologram

  davidgrier

  committed
  6280571

  Copy full SHA for 6280571

Commits on Jul 13, 2020

• signal-based trap operation

  davidgrier

  committed
  fc9b296

  Copy full SHA for fc9b296

• flip flag when done

  davidgrier

  committed
  40ac9c7

  Copy full SHA for 40ac9c7

Commits on Jul 14, 2020

• simplify Process

  Show description for 855b2e1
  sustielz

  authored
  855b2e1

  Copy full SHA for 855b2e1

• streamline selection logic

  davidgrier

  committed
  617e3a8

  Copy full SHA for 617e3a8

• Merge branch 'qtasks' of https://github.com/davidgrier/pyfab into qtasks

  davidgrier

  committed
  48cb0aa

  Copy full SHA for 48cb0aa

• correcting structure logic

  davidgrier

  committed
  1ff6378

  Copy full SHA for 1ff6378

• structure logic and property updates

  davidgrier

  committed
  ec1082e

  Copy full SHA for ec1082e

Commits on Jul 15, 2020

• simplify hologram computation logic

  davidgrier

  committed
  3a2dba0

  Copy full SHA for 3a2dba0

• update for PyQt5

  davidgrier

  committed
  5583ee9

  Copy full SHA for 5583ee9

Commits on Jul 21, 2020

• Initial mechanism for passing data between consecutive tasks

  davidgrier

  committed
  f407b44

  Copy full SHA for f407b44

• Demonstration of passing data between tasks

  davidgrier

  committed
  5e6d2ee

  Copy full SHA for 5e6d2ee

• remove extraneous signals

  davidgrier

  committed
  3ee9f2e

  Copy full SHA for 3ee9f2e

• jit seems to crash hologram calculations

  davidgrier

  committed
  452b6ea

  Copy full SHA for 452b6ea

• Update MoveTraps

  sustielz

  authored
  7136ca8

  Copy full SHA for 7136ca8

• Update MoveTraps

  Show description for ee90139
  sustielz

  authored
  ee90139

  Copy full SHA for ee90139

• typos

  Show description for 60da1c3
  sustielz

  authored
  60da1c3

  Copy full SHA for 60da1c3

Commits on Jul 22, 2020

• Move TrapAssemble into qtasks

  sustielz

  committed
  4fb573d

  Copy full SHA for 4fb573d

• Update and rename TrapAssemble.py to AssembleTraps.py

  Show description for 6c063a2
  sustielz

  authored
  6c063a2

  Copy full SHA for 6c063a2

• Reimplement some TrapMove elements. I can't spell 'parameterize'

  Show description for bbec0e4
  sustielz

  authored
  bbec0e4

  Copy full SHA for bbec0e4

Commits on Jul 23, 2020

• update TrapMove kwargs and list checkers

  sustielz

  authored
  bee873b

  Copy full SHA for bee873b

• Replace Trajectory objects with lists

  Show description for 88809aa
  sustielz

  authored
  88809aa

  Copy full SHA for 88809aa

• Use dict instead of list for trajectories

  Show description for eacc6d8
  sustielz

  authored
  eacc6d8

  Copy full SHA for eacc6d8

Commits on Jul 24, 2020

• Potentially working MoveTraps, AssembleTraps framework

  sustielz

  committed
  c01ef33

  Copy full SHA for c01ef33

• added Circle to test AssembleTraps

  sustielz

  committed
  da91392

  Copy full SHA for da91392

Commits on Jul 25, 2020

• Working version of MoveTraps!!

  Show description for 8766583
  sustielz

  authored
  8766583

  Copy full SHA for 8766583

• Create Encircle.py

  Show description for f122150
  sustielz

  authored
  f122150

  Copy full SHA for f122150

• Closer-to-working version of AssembleTraps

  Show description for 5474927
  sustielz

  authored
  5474927

  Copy full SHA for 5474927

• better version of Assemble, workded out some of scaling for interpolation. Include script for visualizing trajectories.

  

  Grier Group

  committed
  0ae8bd8

  Copy full SHA for 0ae8bd8

Commits on Jul 26, 2020

• Attempt at catching errors in taskmanager. Will test tomorrow

  sustielz

  committed
  4ee18c6

  Copy full SHA for 4ee18c6

• Working Assembler, Improved Mover and progress on error catching

  sustielz

  committed
  01e7450

  Copy full SHA for 01e7450

Commits on Jul 27, 2020

• Create Record.py

  Show description for e81bc5c
  sustielz

  authored
  e81bc5c

  Copy full SHA for e81bc5c

• Create RecordBackground.py

  Show description for 83d3c53
  sustielz

  authored
  83d3c53

  Copy full SHA for 83d3c53

• record.py syntax

  sustielz

  authored
  4a65b1d

  Copy full SHA for 4a65b1d

Commits on Jul 28, 2020

• Update MoveTraps.py

  Show description for 8ed6c58
  sustielz

  authored
  8ed6c58

  Copy full SHA for 8ed6c58

• Update RecordBackground.py

  Show description for cac8fb0
  sustielz

  authored
  cac8fb0

  Copy full SHA for cac8fb0

• Record.py: syntax

  sustielz

  authored
  ea4f514

  Copy full SHA for ea4f514

• Update and rename Read2.py to Repeat.py

  Show description for 55e9354
  sustielz

  authored
  55e9354

  Copy full SHA for 55e9354

Commits on Aug 1, 2020

• pyqt implementation removes dependency on PIL

  davidgrier

  committed
  9079029

  Copy full SHA for 9079029

• Merge branch 'qtasks' of https://github.com/davidgrier/pyfab into qtasks

  davidgrier

  committed
  8395fad

  Copy full SHA for 8395fad

• explain how text rendering works

  davidgrier

  committed
  bac754b

  Copy full SHA for bac754b

Commits on Aug 6, 2020

• Move and Assemble now act on the last clicked QTrapGroup

  sustielz

  committed
  e4e4534

  Copy full SHA for e4e4534

• remove a few stray lines from last commit

  sustielz

  authored
  e3cb77f

  Copy full SHA for e3cb77f

Commits on Aug 8, 2020

• Remove TrapMove and TrapAssemble. Branch is ready to pull to master.

  sustielz

  authored
  a4fc05f

  Copy full SHA for a4fc05f

• Remove TrapMove and TrapAssemble

  sustielz

  authored
  649d742

  Copy full SHA for 649d742

• delete TrapMove and TrapAssemble

  sustielz

  committed
  e74917c

  Copy full SHA for e74917c

• Rename MoveTraps to Move and AssembleTraps to Assemble

  sustielz

  committed
  180e793

  Copy full SHA for 180e793

• rename a few extra lines

  sustielz

  committed
  4be8296

  Copy full SHA for 4be8296

Commits on Aug 11, 2020

• minor bug

  sustielz

  authored
  19f448a

  Copy full SHA for 19f448a

• Improve task data

  Show description for e2308a3
  sustielz

  authored
  e2308a3

  Copy full SHA for e2308a3

• Add various tasks to demonstrate TaskData

  Show description for 586502e
  sustielz

  authored
  586502e

  Copy full SHA for 586502e

• Change encircle to allow task data inputs

  sustielz

  authored
  df5a8ea

  Copy full SHA for df5a8ea

Commits on Aug 15, 2020

• Update the UI with a Tasks tab. Load tasks in through the dropdown menu and configure them in the GUI.

  sustielz

  committed
  84b7ba1

  Copy full SHA for 84b7ba1

Commits on Aug 17, 2020

• double click a task to toggle pause

  sustielz

  committed
  a2dbb28

  Copy full SHA for a2dbb28

• add pyfab

  sustielz

  committed
  a6b63fc

  Copy full SHA for a6b63fc

Commits on Aug 18, 2020

• Merge branch 'master' into qtasks

  sustielz

  authored
  7c30d47

  Copy full SHA for 7c30d47