Code

VCS 2D Interaction (round 2)#1081

Code

Closed

chaosphere2112 wants to merge 196 commits intoCDAT:masterCDAT/cdat:masterfrom chaosphere2112:vcs2d_interactionchaosphere2112/uvcdat:vcs2d_interactionCopy head branch name to clipboard

+10,021-4,491

Commits

Commits on Feb 25, 2015

• SBF: Added vtk_ui package to VCS

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  58a2f86

  Copy full SHA for 58a2f86

• vtk_ui fixes

  Show description for c412184
  

  Sam Fries

  committed
  c412184

  Copy full SHA for c412184

• Adding configurator

  Show description for 541a346
  

  Sam Fries

  committed
  541a346

  Copy full SHA for 541a346

• Template config

  

  Sam Fries

  committed
  4bb13fa

  Copy full SHA for 4bb13fa

• Template config

  Show description for 7b1c0f8
  

  Sam Fries

  committed
  7b1c0f8

  Copy full SHA for 7b1c0f8

• Initial configurator integration with canvas

  

  Sam Fries

  committed
  36ba752

  Copy full SHA for 36ba752

• Added fillarea support to configurator

  Show description for a688a13
  

  Sam Fries

  committed
  a688a13

  Copy full SHA for a688a13

• Tweaked render hierarchy of UI

  Show description for 1d38bd3
  

  Sam Fries

  committed
  1d38bd3

  Copy full SHA for 1d38bd3

• Fixed render-layer stuff for UI

  Show description for b1a6573
  

  Sam Fries

  committed
  b1a6573

  Copy full SHA for b1a6573

• Disabled handle resize functionality

  

  Sam Fries

  committed
  a0793e7

  Copy full SHA for a0793e7

• Removed debug print statement from manager.py

  

  Sam Fries

  committed
  71bec17

  Copy full SHA for 71bec17

• Improved the detach function

  

  Sam Fries

  committed
  bb7fd62

  Copy full SHA for bb7fd62

• Added 'insert' and 'remove' vertex capabilities.

  

  Sam Fries

  committed
  ba1e24d

  Copy full SHA for ba1e24d

• Fillareas now draggable when editing

  

  Sam Fries

  committed
  08d65e6

  Copy full SHA for 08d65e6

• Fixed a merge issue; logo was moved out of vtk backend

  

  Sam Fries

  committed
  a211855

  Copy full SHA for a211855

• Added a contextual toolbar to fillarea

  Show description for 079db68
  

  Sam Fries

  committed
  079db68

  Copy full SHA for 079db68

• Refactor of click/drag logic

  Show description for be28e77
  

  Sam Fries

  committed
  be28e77

  Copy full SHA for be28e77

• Added initial support for line editor

  

  Sam Fries

  committed
  a7bcef2

  Copy full SHA for a7bcef2

• Removed print statements, made line click detection work

  

  Sam Fries

  committed
  5b62075

  Copy full SHA for 5b62075

• Added a color picker, integrated into fillarea editor

  

  Sam Fries

  committed
  6641de6

  Copy full SHA for 6641de6

• Integrated color picker with line editor, removed print

  

  Sam Fries

  committed
  567334e

  Copy full SHA for 567334e

• Added right click support to clickable

  Show description for ebd6eaf
  

  Sam Fries

  committed
  ebd6eaf

  Copy full SHA for ebd6eaf

• Made line editor draggable

  

  Sam Fries

  committed
  f217290

  Copy full SHA for f217290

• Created the dataeditor, a subclass of boxeditor

  

  Sam Fries

  committed
  7686671

  Copy full SHA for 7686671

• Whitespace

  

  Sam Fries

  committed
  3315207

  Copy full SHA for 3315207

• Deleted a print

  

  Sam Fries

  committed
  8083425

  Copy full SHA for 8083425

• Removed super annoying flickering

  

  Sam Fries

  committed
  251a1aa

  Copy full SHA for 251a1aa

• Improved drag UX

  Show description for 695ce5b
  

  Sam Fries

  committed
  695ce5b

  Copy full SHA for 695ce5b

• Made double click disable box editor

  

  Sam Fries

  committed
  b4fd2da

  Copy full SHA for b4fd2da

• Fixed a bug where dragging wouldn't stop

  

  Sam Fries

  committed
  accf0a8

  Copy full SHA for accf0a8

• Labels were not being detached on toolbar detach

  

  Sam Fries

  committed
  e267065

  Copy full SHA for e267065

• Fixed a rerender bug

  

  Sam Fries

  committed
  649cdd7

  Copy full SHA for 649cdd7

• Updating labels to be less junky

  

  Sam Fries

  committed
  8526b5e

  Copy full SHA for 8526b5e

• Updating labels to be less junky

  

  Sam Fries

  committed
  202164b

  Copy full SHA for 202164b

• Added legend editor

  

  Sam Fries

  committed
  e0eadf0

  Copy full SHA for e0eadf0

• Fixed an issue with double clicking near the edge

  Show description for 25dabd0
  

  Sam Fries

  committed
  25dabd0

  Copy full SHA for 25dabd0

• Initial marker editor commit

  Show description for 035658f
  

  Sam Fries

  committed
  035658f

  Copy full SHA for 035658f

• Fixed bug with colorpicker close, added to marker

  Show description for 8494608
  

  Sam Fries

  committed
  8494608

  Copy full SHA for 8494608

• Fixed segfault on closing picker

  

  Sam Fries

  committed
  5d1031e

  Copy full SHA for 5d1031e

• Added size adjustment

  

  Sam Fries

  committed
  7ba404b

  Copy full SHA for 7ba404b

• Fix set_state's label placement

  

  Sam Fries

  committed
  d7e5069

  Copy full SHA for d7e5069

• Add marker type change to toolbar

  

  Sam Fries

  committed
  a68ea76

  Copy full SHA for a68ea76

• Added delete function to hide empty objects

  

  Sam Fries

  committed
  cd6d346

  Copy full SHA for cd6d346

• Deletes self when no markers are present, rather than throwing errors

  

  Sam Fries

  committed
  d38eaee

  Copy full SHA for d38eaee

• Fillarea deletes self when there's nothing left

  

  Sam Fries

  committed
  1213fef

  Copy full SHA for 1213fef

• Moved deactivate call for marker to delete

  

  Sam Fries

  committed
  1d75df4

  Copy full SHA for 1d75df4

• Removed deactivate() proxy in marker to match style of other editors

  

  Sam Fries

  committed
  4fa3a09

  Copy full SHA for 4fa3a09

• Added an editable textbox widget

  

  Sam Fries

  committed
  cbcc7be

  Copy full SHA for cbcc7be

• Now detects where the text was clicked, and sets cursor there.

  

  Sam Fries

  committed
  0d20dd2

  Copy full SHA for 0d20dd2

• Moved textbox to own section, added cursor

  

  Sam Fries

  committed
  886708f

  Copy full SHA for 886708f

• Fixes broken button.detach()

  

  Sam Fries

  committed
  1942e50

  Copy full SHA for 1942e50

• Cursor disappears when editing ends

  

  Sam Fries

  committed
  c3aa6ef

  Copy full SHA for c3aa6ef

• Added Textbox to init imports

  

  Sam Fries

  committed
  d2c700c

  Copy full SHA for d2c700c

• Added textproperty option, and call place on show()

  

  Sam Fries

  committed
  0d6a7f9

  Copy full SHA for 0d6a7f9

• Added textproperty option

  

  Sam Fries

  committed
  0b50e15

  Copy full SHA for 0b50e15

• Added text editor, and added it to configurator

  

  Sam Fries

  committed
  b1ce1cd

  Copy full SHA for b1ce1cd

• Refactored inside_text function

  

  Sam Fries

  committed
  be31be0

  Copy full SHA for be31be0

• Added action handling to textbox

  

  Sam Fries

  committed
  8b90fb4

  Copy full SHA for 8b90fb4

• Made text editable and save properly

  

  Sam Fries

  committed
  5cd6479

  Copy full SHA for 5cd6479

• Removed some printing

  

  Sam Fries

  committed
  da9da6d

  Copy full SHA for da9da6d

• Fixes bug where it tried to detach None

  

  Sam Fries

  committed
  8202db8

  Copy full SHA for 8202db8

• Double clicking will add a new textbox

  

  Sam Fries

  committed
  38eda01

  Copy full SHA for 38eda01

• Widgets now pass the super.__init__ chain properly

  

  Sam Fries

  committed
  df61985

  Copy full SHA for df61985

• Labels can be dragged

  Show description for b8aadf0
  

  Sam Fries

  committed
  b8aadf0

  Copy full SHA for b8aadf0

• Height of text can be changed via toolbar

  

  Sam Fries

  committed
  567cf9f

  Copy full SHA for 567cf9f

• Renamed color_picker to colorpicker, updated references

  

  Sam Fries

  committed
  99faa5c

  Copy full SHA for 99faa5c

• Added color picker to text editor

  

  Sam Fries

  committed
  ef713e7

  Copy full SHA for ef713e7

• Fixed bug where cursor was placed when not editing

  

  Sam Fries

  committed
  fd4553d

  Copy full SHA for fd4553d

• Made label objects not allocate an extra textproperty

  

  Sam Fries

  committed
  1c57301

  Copy full SHA for 1c57301

• Added on_editing_end callback to textbox

  

  Sam Fries

  committed
  61e2da4

  Copy full SHA for 61e2da4

• Made alignments configurable, now respects alignment in bounds checks

  

  Sam Fries

  committed
  adf74ed

  Copy full SHA for adf74ed

• Added angle support to text editor

  

  Sam Fries

  committed
  cfaa3db

  Copy full SHA for cfaa3db

• Support for clicking on rotated text, because math.

  

  Sam Fries

  committed
  b6508bd

  Copy full SHA for b6508bd

• Added font changing to text editor

  

  Sam Fries

  committed
  5237b2e

  Copy full SHA for 5237b2e

• Made images be placed over background color instead of replacing it

  

  Sam Fries

  committed
  64adb2c

  Copy full SHA for 64adb2c

• Saved an allocation of vtkImageData

  

  Sam Fries

  committed
  8f63601

  Copy full SHA for 8f63601

• Added icons for creation buttons, fill creation button

  

  Sam Fries

  committed
  5e82326

  Copy full SHA for 5e82326

• Made button alignment effect location

  

  Sam Fries

  committed
  4fb795e

  Copy full SHA for 4fb795e

• Placed fill button correctly

  

  Sam Fries

  committed
  8c9600d

  Copy full SHA for 8c9600d

• Added place() functions to all editors

  

  Sam Fries

  committed
  faea531

  Copy full SHA for faea531

• Calls place() on target editor when resizing

  

  Sam Fries

  committed
  fc4b435

  Copy full SHA for fc4b435

• Made button alignment hug edges of window

  

  Sam Fries

  committed
  20c4da8

  Copy full SHA for 20c4da8

• 'fix' bug where row isn't detectable

  

  Sam Fries

  committed
  99d97e5

  Copy full SHA for 99d97e5

• Fixes text alignment issues with movement

  

  Sam Fries

  committed
  2e1d7dc

  Copy full SHA for 2e1d7dc

• Added text creator

  

  Sam Fries

  committed
  5b127e9

  Copy full SHA for 5b127e9

• Fixed button alignment placment

  

  Sam Fries

  committed
  4dd6509

  Copy full SHA for 4dd6509

• Move location of text button 5px left

  

  Sam Fries

  committed
  a9b750d

  Copy full SHA for a9b750d

• Adds line creator

  

  Sam Fries

  committed
  da0b5c9

  Copy full SHA for da0b5c9

• Saves on type change now

  

  Sam Fries

  committed
  db41b76

  Copy full SHA for db41b76

• Adds marker creator

  

  Sam Fries

  committed
  8ea77e6

  Copy full SHA for 8ea77e6

• Fixed icons to not cause libpng errors

  

  Sam Fries

  committed
  6771054

  Copy full SHA for 6771054

• Made configurator choose highest priority item in DP to click

  

  Sam Fries

  committed
  9ab9121

  Copy full SHA for 9ab9121

• Added projection changing to data editor

  

  Sam Fries

  committed
  14f6b76

  Copy full SHA for 14f6b76

• Added label editor, little buggy right now

  

  Sam Fries

  committed
  5cbbafb

  Copy full SHA for 5cbbafb

• Lag on dragging labels fixed

  

  Sam Fries

  committed
  527cb29

  Copy full SHA for 527cb29

• Fixed bug where every other update eliminated cached array strings

  

  Sam Fries

  committed
  2a4249e

  Copy full SHA for 2a4249e

• Made only displays from the current canvas be stored in configurator

  

  Sam Fries

  committed
  df1b015

  Copy full SHA for df1b015

• Made editing happen on single click instead of double

  

  Sam Fries

  committed
  ac51492

  Copy full SHA for ac51492

• Forgot text editor for is_object

  

  Sam Fries

  committed
  d8f381b

  Copy full SHA for d8f381b

• Activating a slider from the toolbar hides other sliders

  

  Sam Fries

  committed
  6e084ac

  Copy full SHA for 6e084ac

• Mouseover gives hand cursor

  

  Sam Fries

  committed
  27325d4

  Copy full SHA for 27325d4

• Increase click size, add width slider

  

  Sam Fries

  committed
  3a0567c

  Copy full SHA for 3a0567c

• Fixed issues with double click line

  

  Sam Fries

  committed
  0ba74a5

  Copy full SHA for 0ba74a5

• Fixed fillarea click detector

  

  Sam Fries

  committed
  5c2ce1e

  Copy full SHA for 5c2ce1e

• Made handles render on placement

  

  Sam Fries

  committed
  569d4cf

  Copy full SHA for 569d4cf

• Removed now-unnecessary rerenders while dragging box

  

  Sam Fries

  committed
  b6de350

  Copy full SHA for b6de350

• Fixed text dragging, added point for label dragging

  

  Sam Fries

  committed
  33c57cc

  Copy full SHA for 33c57cc

• Changed configurator to use release to determine what action to take

  

  Sam Fries

  committed
  52ac25c

  Copy full SHA for 52ac25c

• Made rotation and size adjustments more fluid

  

  Sam Fries

  committed
  8683c6d

  Copy full SHA for 8683c6d

• Made configurator responsible for deactivating on clicks outside of editors

  

  Sam Fries

  committed
  6e08d71

  Copy full SHA for 6e08d71

• Made handles batch-render, got rid of unnecessary renders

  

  Sam Fries

  committed
  c3b6cf9

  Copy full SHA for c3b6cf9

• Added text attr editing to label editor

  

  Sam Fries

  committed
  1cec478

  Copy full SHA for 1cec478

• Added keyable behavior, priority editor, implemented in all editors

  

  Sam Fries

  committed
  3b0bd9d

  Copy full SHA for 3b0bd9d

• Forgot the len

  

  Sam Fries

  committed
  0fd5a57

  Copy full SHA for 0fd5a57

• Made returned values from the update callback change slider value

  

  Sam Fries

  committed
  f4e6af4

  Copy full SHA for f4e6af4

• Made toolbar place self on show

  

  Sam Fries

  committed
  1124dcd

  Copy full SHA for 1124dcd

• Added configure toolbar, background color changing

  

  Sam Fries

  committed
  b1487d3

  Copy full SHA for b1487d3

• Added logo toggle button to config toolbar

  

  Sam Fries

  committed
  bb6867d

  Copy full SHA for bb6867d

• Made box derivatives set changed in save()

  

  Sam Fries

  committed
  6c7103a

  Copy full SHA for 6c7103a

• Fixed double update on colormap change

  

  Sam Fries

  committed
  7deff72

  Copy full SHA for 7deff72

• Fix delete bug for text

  

  Sam Fries

  committed
  f2fb35d

  Copy full SHA for f2fb35d

• Added toolbar to configurator.place

  

  Sam Fries

  committed
  c2345d3

  Copy full SHA for c2345d3

• Adds contrasting background color to textboxes while editing

  

  Sam Fries

  committed
  bf6c815

  Copy full SHA for bf6c815

• Adds font specification to buttons

  Show description for 1b1170c
  

  Sam Fries

  committed
  1b1170c

  Copy full SHA for 1b1170c

• Changes font button to font menu

  

  Sam Fries

  committed
  ce4c52c

  Copy full SHA for ce4c52c

• Makes the text editor also use font menu

  

  Sam Fries

  committed
  204aa57

  Copy full SHA for 204aa57

• Removed Fill/Line/Box editing for the interim

  

  Sam Fries

  committed
  274bfe2

  Copy full SHA for 274bfe2

• Changed marker and text to use alt + click instead of double click

  

  Sam Fries

  committed
  fbb37b4

  Copy full SHA for fbb37b4

• UI removes itself before outputting results

  

  Sam Fries

  committed
  141cb5f

  Copy full SHA for 141cb5f

• Adds group editor, shift selection/deselection

  

  Sam Fries

  committed
  b42584a

  Copy full SHA for b42584a

• GroupEditor will multiplex mouse and keyboard events

  

  Sam Fries

  committed
  e01691a

  Copy full SHA for e01691a

• Fixed annoying initial flash of rerendering

  

  Sam Fries

  committed
  b67f481

  Copy full SHA for b67f481

• Added direct actor access to label and point

  

  Sam Fries

  committed
  bd9d3a0

  Copy full SHA for bd9d3a0

• Fixed annoying flashing

  

  Sam Fries

  committed
  eb63af6

  Copy full SHA for eb63af6

• Made orientation happen in the TextProperty instead of the TextActor

  

  Sam Fries

  committed
  e21dd4d

  Copy full SHA for e21dd4d

• Made all label attributes map directly to the actor

  

  Sam Fries

  committed
  8b1c7ae

  Copy full SHA for 8b1c7ae

• Refactored some handle internals

  

  Sam Fries

  committed
  a900aec

  Copy full SHA for a900aec

• All labels store their actors now

  

  Sam Fries

  committed
  c040170

  Copy full SHA for c040170

• Made label editor support all labels

  

  Sam Fries

  committed
  7910e4d

  Copy full SHA for 7910e4d

• Added support for id/dataname

  

  Sam Fries

  committed
  beeaabd

  Copy full SHA for beeaabd

• Removed some unused code

  

  Sam Fries

  committed
  ad12579

  Copy full SHA for ad12579

• Switched secondaries over to using secondary plotting methods

  

  Sam Fries

  committed
  e71d3fa

  Copy full SHA for e71d3fa

• Switched text editor over to using actors

  

  Sam Fries

  committed
  584daec

  Copy full SHA for 584daec

• Template is swapped out

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  2d55ffd

  Copy full SHA for 2d55ffd

• Save and reset template implemented

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  86ddbb0

  Copy full SHA for 86ddbb0

• Converted markers to using actors

  

  Sam Fries

  committed
  85e53eb

  Copy full SHA for 85e53eb

• Made all marker attributes work off actors

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  010c34d

  Copy full SHA for 010c34d

• Made text actor get updated text when editing is over

  

  Sam Fries

  committed
  82d3c2d

  Copy full SHA for 82d3c2d

• Made slider autoconvert min max and val to floats

  

  Sam Fries

  committed
  76016f1

  Copy full SHA for 76016f1

• Added on_open to toolbar widget

  

  Sam Fries

  committed
  40446e5

  Copy full SHA for 40446e5

• Added animation slider

  

  Sam Fries

  committed
  127a096

  Copy full SHA for 127a096

• Added get_text all the way down the toolbar stack

  

  Sam Fries

  committed
  1e7a513

  Copy full SHA for 1e7a513

• Group editor now has toolbar support for text and labels

  

  Sam Fries

  committed
  efcdf9f

  Copy full SHA for efcdf9f

• Added marker toolbar to group editor

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  08b549f

  Copy full SHA for 08b549f

• Added on_drag for live dragging updates to Label widget

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  ee41658

  Copy full SHA for ee41658

• Made it so we don't create a new vtkPoints for markers

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  4de8b61

  Copy full SHA for 4de8b61

• Group toolbar switches buttons based on what's selected

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  4e1c70d

  Copy full SHA for 4e1c70d

• Migrated handle.dragged to use dx/dy

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  5faf44f

  Copy full SHA for 5faf44f

• Fixed up group dragging

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  7257712

  Copy full SHA for 7257712

• Removed the handle from point editors

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  39a5ef4

  Copy full SHA for 39a5ef4

• Changed over to using drag methods for text

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  2ffefae

  Copy full SHA for 2ffefae

• Labels should properly update while dragged

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  509fcdd

  Copy full SHA for 509fcdd

• Removed unnecessary rerender

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  fc1e797

  Copy full SHA for fc1e797

• Text actors show up where they're supposed to

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  7df8543

  Copy full SHA for 7df8543

• Fixed text layout issues

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  71f99c2

  Copy full SHA for 71f99c2

• Fixed issue where animation slider was added repeatedly

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  6840ffb

  Copy full SHA for 6840ffb

• Text editor angle is cleaned up

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  4701fe7

  Copy full SHA for 4701fe7

• Fixed delete for all editors

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  317cfae

  Copy full SHA for 317cfae

• Text gets set properly, stubbed in priority logic

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  e795e72

  Copy full SHA for e795e72

• Whoops, copy paste error

  

  chaosphere2112

  authored and

  Sam Fries

  committed
  95a8cd5

  Copy full SHA for 95a8cd5

• Fix for non-darwin platforms; forgot to OS gate some mac specific logic

  

  Sam Fries

  committed
  487276b

  Copy full SHA for 487276b

• Toolbar label mentions which member is selected for labeleditor

  

  Sam Fries

  committed
  5be3786

  Copy full SHA for 5be3786

• UI will only show up once x.interact() is called

  

  Sam Fries

  committed
  2ceb483

  Copy full SHA for 2ceb483

• Toolbars in text and label editors will automatically show as is appropriate

  

  Sam Fries

  committed
  64ca206

  Copy full SHA for 64ca206

• fixes hover cursor change, added in_bounds method to buttons

  

  Sam Fries

  committed
  e397085

  Copy full SHA for e397085

• Fix for colorpicker segfault

  

  Sam Fries

  committed
  c0cc77b

  Copy full SHA for c0cc77b

• Colorpicker should finally close on ubuntu

  

  Sam Fries

  committed
  6111a38

  Copy full SHA for 6111a38

• Removed unnecessary import of 'inspect'

  

  Sam Fries

  committed
  89145de

  Copy full SHA for 89145de

• Toolbar shows up now

  

  Sam Fries

  committed
  bdcf6ec

  Copy full SHA for bdcf6ec

• Fixed cursor changing, use control to drop new text/marker, has new cursor

  

  Sam Fries

  committed
  ad04542

  Copy full SHA for ad04542

• Added tooltips to buttons and marker/text editor

  

  Sam Fries

  committed
  e2c456b

  Copy full SHA for e2c456b

• Fix poorly done rebase merge

  

  Sam Fries

  committed
  abe6021

  Copy full SHA for abe6021

Commits on Feb 26, 2015

• Adds sanity check for window size fetching in behavior

  

  Sam Fries

  committed
  9dfd28d

  Copy full SHA for 9dfd28d

• Added class docstrings for the editors

  

  Sam Fries

  committed
  260a645

  Copy full SHA for 260a645

• Removed commented orientation code from genTextActor

  

  Sam Fries

  committed
  5dd19c0

  Copy full SHA for 5dd19c0

• Made manager get stuck on absolute top layer of render stack

  

  Sam Fries

  committed
  55b8f20

  Copy full SHA for 55b8f20

• Extracted out hideGUI and showGUI

  

  Sam Fries

  committed
  8b5bb90

  Copy full SHA for 8b5bb90

• Fixed bug where configurator would crash bg=1 plots

  

  Sam Fries

  committed
  5878b59

  Copy full SHA for 5878b59

Commits on Feb 27, 2015

• Merge branch 'master' into vcs2d_interaction

  Show description for e94d5af
  

  Sam Fries

  committed
  e94d5af

  Copy full SHA for e94d5af

• Passes test_vcs_interact_no_open.py

  

  Sam Fries

  committed
  da1ee83

  Copy full SHA for da1ee83

• Forgot to halve the marker scale when I refactored the vcs2vtk marker code

  

  Sam Fries

  committed
  eb49dd9

  Copy full SHA for eb49dd9

• Properly initialize UI in UVCDAT GUI

  

  Sam Fries

  committed
  4520ac5

  Copy full SHA for 4520ac5

• Changed everything to batch rendering, save a bunch of render cycles

  

  Sam Fries

  committed
  5a86b86

  Copy full SHA for 5a86b86

Commits on Mar 1, 2015

• Tooltips will only show if button is visible

  chaosphere2112

  committed
  353480a

  Copy full SHA for 353480a

• Weird double indent fix

  chaosphere2112

  committed
  bc0d27a

  Copy full SHA for bc0d27a

• Improved animation controls

  chaosphere2112

  committed
  03e5977

  Copy full SHA for 03e5977