Commits · 172e5b63bcd5858f41ef104347a5e8e191699a1f · aflab / astrogeology / ISIS3 · GitLab

Jul 02, 2018
- Fixed merge conflicts · 172e5b63
  Kristin Berry authored Jul 02, 2018
  
  172e5b63
- Merge pull request #318 from jessemapel/ipceCnetHealth · da0d3267
  AgoinsUSGS authored Jul 02, 2018
  da0d3267
- Fixed text color and valid measure counting in control net monitor. · 7e806bd8
  Jesse Mapel authored Jul 02, 2018
  
  7e806bd8
- Merge branch 'ipce' of github.com:USGS-Astrogeology/ISIS3 into ipceCnetHealth · 03a41ac5
  Jesse Mapel authored Jul 02, 2018
  
  03a41ac5
- Merge pull request #311 from AgoinsUSGS/final_changes · 7a8b0b8f
  Jesse Mapel authored Jul 02, 2018
  7a8b0b8f
- Merge branch 'dev' into ipce · fe9cdc90
  Makayla Shepherd authored Jul 02, 2018
  
  fe9cdc90
Jun 29, 2018
- Merge pull request #310 from jessemapel/ipce · 93d0ac4f
  Kristin authored Jun 29, 2018
  93d0ac4f
- Added AddEdge() and RemoveEdge() to ControlNet to clean up code. Added documentation · 189f8083
  Kristin Berry authored Jun 29, 2018
  
  189f8083
- use setters in ControlMEasure operator= · 5c92ee87
  Adam Goins authored Jun 29, 2018
  
  5c92ee87
- Store off old edit lock value before using it · 8016fdb7
  Adam Goins authored Jun 29, 2018
  
  8016fdb7
- Fixed changes in ControlPointEditWidget that caused seg faults. · bb5d7636
  Jesse Mapel authored Jun 29, 2018
  
  bb5d7636
- fixed typo · adbcac99
  Adam Goins authored Jun 29, 2018
  
  adbcac99
- Merge with upstream · c3e91e37
  Kristin Berry authored Jun 29, 2018
  
  c3e91e37
- made sure points aren't ignored before grabbing them in ControlNetVtials · 253b67c9
  Adam Goins authored Jun 29, 2018
  
  253b67c9
- Fixed ControlPoint::operator= to use setters · 2484d4e7
  Adam Goins authored Jun 29, 2018
  
  2484d4e7
- Merge pull request #308 from jessemapel/ipce · 58e7d8f4
  AgoinsUSGS authored Jun 29, 2018
  58e7d8f4
- Merge pull request #304 from AgoinsUSGS/bugginess · 3a42d984
  Kristin authored Jun 29, 2018
  3a42d984
- Merge branch 'ipceCnetHealth' into bugginess · 34da9d8b
  Kristin authored Jun 29, 2018
  
  34da9d8b
- Merge pull request #297 from AgoinsUSGS/cubeDn · 9cc64e5b
  Kristin authored Jun 29, 2018
  9cc64e5b
- Merge branch 'cubeDn' of github.com:AgoinsUSGS/ISIS3 into bugginess · 478731b8
  Adam Goins authored Jun 29, 2018
  
  478731b8
- removed erroneous QAction · b667515c
  Adam Goins authored Jun 29, 2018
  
  b667515c
- Changed boost edge bundled property to work without c++11 in ControlNet. · bd748fff
  Jesse Mapel authored Jun 29, 2018
  
  bd748fff
- Merge pull request #299 from AgoinsUSGS/cleanup · 71590799
  Kristin authored Jun 29, 2018
  71590799
Jun 28, 2018
- updated documentation for these changes. · 1e3bcf4a
  Adam Goins authored Jun 28, 2018
  
  1e3bcf4a
- Merge branch 'cleanup' of github.com:AgoinsUSGS/ISIS3 into bugginess · e3b0f33f
  Adam Goins authored Jun 28, 2018
  
  e3b0f33f
- Added m_numPoints and m_numMeasures member variables. · 1069ed9e
  Adam Goins authored Jun 28, 2018
  
  1069ed9e
Jun 27, 2018
- Documented emitMeasureModified · 64903772
  Adam Goins authored Jun 27, 2018
  
  64903772
- added more docs · 549a18fb
  Adam Goins authored Jun 27, 2018
  
  549a18fb
- Added documentation, removed commented out code. · dbb51703
  Adam Goins authored Jun 27, 2018
  
  dbb51703
- s · 99c2320b
  Adam Goins authored Jun 27, 2018
  
  99c2320b
- Remove QPoint from ControlMeasure · b5fde8ec
  Adam Goins authored Jun 27, 2018
  
  b5fde8ec
Jun 26, 2018
- Removed dummy methods in ControlHealthMonitorWidget · 7577a59a
  Adam Goins authored Jun 26, 2018
  
  7577a59a
- Modified Health Monitor to open the selected cubes from the image table. · 7edbb84a
  Adam Goins authored Jun 26, 2018
  
  7edbb84a
- Added space · 16ff03c9
  Kristin Berry authored Jun 26, 2018
  
  16ff03c9
- Added number of islands to HealthMonitorWidget · f65effdf
  Kristin Berry authored Jun 26, 2018
  
  f65effdf
- Merge pull request #294 from jessemapel/signals · b061755e
  Kristin authored Jun 26, 2018
  b061755e
- fixed variable name error in ControlNet · 02ae0cba
  Jesse Mapel authored Jun 26, 2018
  
  02ae0cba
- Fixed adding edges in ControlNet · 90e3846d
  Jesse Mapel authored Jun 26, 2018
  
  90e3846d
- Merge pull request #293 from jessemapel/signals · 0e132c14
  Kristin authored Jun 26, 2018
  0e132c14
- Merge pull request #292 from jessemapel/ipce · d527f232
  Kristin authored Jun 26, 2018
  d527f232