Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

New reged #14

Open
wants to merge 28 commits into from

2 participants

@Ooorah

Things that may need to be done to make transition smoother for people:
-Being able to read old region file formats and import them seamlessly.
-Re-adding transparency to the region drawing in Region Editor. There is some issue with doing this when the regions are drawn to a bitmap and the bitmap is drawn to the window.
-Test for the text to speech module, pyttsx, and avoid importing if it is not available. Also disable the “Speech” option in audio feedback.
-Check which operating system is being used and make appropriate substitution for module winsound.

Ooorah added some commits
@Ooorah Ooorah Adding all files for Vicon and modifications to regionEditor 82e37f4
@Ooorah Ooorah regionEditor modified to integrate fully with specEditor. region.py m…
…odified in RegionFileInterface and Region, adding and adjusting methods for parsing data from the new file format. Distinct colors and names added to regions produced by regionEditor.
a119daa
@Ooorah Ooorah added functionality for selecting regions. a70b8f6
@Ooorah Ooorah Added dialog box to edit region information. Made regions selectable. 703852b
@Ooorah Ooorah Backup commit before changing EditRegion to use a region object inste…
…ad of an index.
2b3c25a
@Ooorah Ooorah Fixed bug of not being able to select a different region on first cli…
…ck after editing some region. Also made editing regions done using region object rather than index.
7a06461
@Ooorah Ooorah Fixed most problems with adjacencies. Made regions selectable, editab…
…le, dragable, and deletable.
114b0a7
@Ooorah Ooorah Added file-open functionality to region editor. b3e6f19
@Ooorah Ooorah Added labels and colors to plotting of regions. Created Calibration G…
…UI but have not yet added functionality.
1f886d2
@Ooorah Ooorah Created calibration GUI. Fixed some small problems with painting in r…
…egionEditor.
50e78b8
@Ooorah Ooorah Added button for Autoboundary and functionality for that and autoboun…
…dary on menu. Fixed some label positioning issues with boundary.
73a8fa4
@Ooorah Ooorah Improved ViconMarkerBroadcaster (does not depend on DEASL) and made s…
…tandalone listener in python for it.
44cce82
@Ooorah Ooorah Merge branch 'development' into new_reged
Conflicts:
	src/lib/regions.py
	src/regionEditor.py
	src/specEditor.py
e434916
@Ooorah Ooorah Updated regions.py so that it could open files in the new region file…
… format and convert them to the old way of storing, while still being able to save and open the old file format for decomposed regions. Updated regionEditor.py so that it can handle the new file format as well (using json for region storage). Note that calibration does not automatically happen yet in regions.py.
f21acd7
@Ooorah Ooorah Fixed bug that skews connected regions when calibrated. Made option f…
…or keeping aspect ratio during calibration, or allowing skewing.
08fda99
@Ooorah Ooorah Fixed undo and redo in regionEditor. It now saves all regions and adj…
…acencies at every step.
e474082
@Ooorah Ooorah Calibration modified to hook up to new Calibration GUI. Added functio…
…nality for importing background images. Made images scalable with dimension/length button. Added grid to map. Added display of lines and other things on mouse movement. Changed redraw to draw to bitmap, then to canvas, which reduces flashing, especially for redrawing Vicon.
086da99
@Ooorah Ooorah Changed all buttons to bitmap buttons and added some properties and c…
…hanged methods so that they can act as toggles. Separated CalibrationFrame wxGlade file from regionEditor.
18d1569
@Ooorah Ooorah Fixed absolute file paths for getting images for buttons. ce644ee
@Ooorah Ooorah Forgot a couple images on last two commits. 54ff16b
@Ooorah Ooorah Fixed error with saving "none-type" background image. 9758e70
@Ooorah Ooorah Fixed issues with files being read into specEditor with negative posi…
…tions of regions.
607f914
@Ooorah Ooorah Fixed bug with list indeces out of range when dealing with boundary. 9b5fae5
@Ooorah Ooorah Added add/remove points functionality to regionEditor. Fixed a couple…
… other little bugs.
eb90df0
@Ooorah Ooorah Made calibrate work with specEditor better (still not setting matrix …
…though). Also added keyboard shortcuts for more menu and button items in regionEditor, and noted them in the menus and tooltips.
5aadc4f
@Ooorah Ooorah Several miscellaneous bug fixes. This is Demo-Day version. ea28571
@Ooorah Ooorah Final update including all touch-ups to the new RegionEditor and clea…
…nup of the folder. ViconMarkerBroadcaster added for streaming vicon markers. wxglade files added for new regionEditor and calibration GUIs.
fbb8526
@Ooorah Ooorah Merge branch 'development' into new_reged 3a72321
@cfinucane
Owner

TODO: put bounds on zooming, otherwise crashes
TODO: tool buttons do not show toggle action visually on osx/gtk

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 4, 2012
  1. @Ooorah
  2. @Ooorah

    regionEditor modified to integrate fully with specEditor. region.py m…

    Ooorah authored
    …odified in RegionFileInterface and Region, adding and adjusting methods for parsing data from the new file format. Distinct colors and names added to regions produced by regionEditor.
Commits on Apr 10, 2012
  1. @Ooorah
Commits on Apr 11, 2012
  1. @Ooorah
  2. @Ooorah
  3. @Ooorah

    Fixed bug of not being able to select a different region on first cli…

    Ooorah authored
    …ck after editing some region. Also made editing regions done using region object rather than index.
  4. @Ooorah

    Fixed most problems with adjacencies. Made regions selectable, editab…

    Ooorah authored
    …le, dragable, and deletable.
Commits on Apr 15, 2012
  1. @Ooorah
Commits on Apr 17, 2012
  1. @Ooorah

    Added labels and colors to plotting of regions. Created Calibration G…

    Ooorah authored
    …UI but have not yet added functionality.
Commits on Apr 18, 2012
  1. @Ooorah
  2. @Ooorah

    Added button for Autoboundary and functionality for that and autoboun…

    Ooorah authored
    …dary on menu. Fixed some label positioning issues with boundary.
Commits on Apr 24, 2012
  1. @Ooorah

    Improved ViconMarkerBroadcaster (does not depend on DEASL) and made s…

    Ooorah authored
    …tandalone listener in python for it.
  2. @Ooorah

    Merge branch 'development' into new_reged

    Ooorah authored
    Conflicts:
    	src/lib/regions.py
    	src/regionEditor.py
    	src/specEditor.py
Commits on Apr 25, 2012
  1. @Ooorah

    Updated regions.py so that it could open files in the new region file…

    Ooorah authored
    … format and convert them to the old way of storing, while still being able to save and open the old file format for decomposed regions. Updated regionEditor.py so that it can handle the new file format as well (using json for region storage). Note that calibration does not automatically happen yet in regions.py.
  2. @Ooorah

    Fixed bug that skews connected regions when calibrated. Made option f…

    Ooorah authored
    …or keeping aspect ratio during calibration, or allowing skewing.
  3. @Ooorah
Commits on May 5, 2012
  1. @Ooorah

    Calibration modified to hook up to new Calibration GUI. Added functio…

    Ooorah authored
    …nality for importing background images. Made images scalable with dimension/length button. Added grid to map. Added display of lines and other things on mouse movement. Changed redraw to draw to bitmap, then to canvas, which reduces flashing, especially for redrawing Vicon.
Commits on May 7, 2012
  1. @Ooorah

    Changed all buttons to bitmap buttons and added some properties and c…

    Ooorah authored
    …hanged methods so that they can act as toggles. Separated CalibrationFrame wxGlade file from regionEditor.
  2. @Ooorah
  3. @Ooorah
  4. @Ooorah
  5. @Ooorah
  6. @Ooorah
Commits on May 8, 2012
  1. @Ooorah
  2. @Ooorah

    Made calibrate work with specEditor better (still not setting matrix …

    Ooorah authored
    …though). Also added keyboard shortcuts for more menu and button items in regionEditor, and noted them in the menus and tooltips.
  3. @Ooorah
Commits on May 21, 2012
  1. @Ooorah

    Final update including all touch-ups to the new RegionEditor and clea…

    Ooorah authored
    …nup of the folder. ViconMarkerBroadcaster added for streaming vicon markers. wxglade files added for new regionEditor and calibration GUIs.
  2. @Ooorah
Something went wrong with that request. Please try again.