Commits · f9120520bcf4464e790c82dbf1472787a791b9c9 · aflab / astrogeology / ISIS3 · GitLab

Jun 22, 2018
- Resolve merge conflicts · f9120520
  Kristin Berry authored Jun 22, 2018
  
  f9120520
Jun 21, 2018
- Merge pull request #272 from jessemapel/ipce · 92ba0301
  Kristin authored Jun 21, 2018
  92ba0301
- Added history for pointIgnored and pointUnIgnored in ControlNet and ControlPoint. · 0f19ed1d
  Jesse Mapel authored Jun 21, 2018
  
  0f19ed1d
- Fixed control point ignoring and unignored in ControlNet · 565557c2
  Jesse Mapel authored Jun 21, 2018
  
  565557c2
- Merge pull request #269 from jessemapel/ipce · 670f49ff
  Kristin authored Jun 21, 2018
  670f49ff
- Cleaned up QChart includes · d2070657
  Jesse Mapel authored Jun 21, 2018
  
  d2070657
- Merge pull request #232 from AgoinsUSGS/Signals_Slots · 5669639e
  Jesse Mapel authored Jun 21, 2018
  5669639e
- Merge pull request #266 from USGS-Astrogeology/ipceCnetHealth · 58f83821
  Kristin authored Jun 21, 2018
  58f83821
- Merge pull request #268 from jessemapel/ipceCnetHealth · bbbf65bd
  Kristin authored Jun 21, 2018
  bbbf65bd
- Clean up in ControlNet · 6939e36f
  Jesse Mapel authored Jun 21, 2018
  
  6939e36f
Jun 20, 2018
- Merge pull request #267 from jessemapel/ipceCnetHealth · 5bc9b6b0
  Kristin authored Jun 20, 2018
  5bc9b6b0
- Merge branch 'ipceCnetHealth' of github.com:USGS-Astrogeology/ISIS3 into ipceCnetHealth · 0629feae
  Jesse Mapel authored Jun 20, 2018
  
  0629feae
- Removed QtCharts references · a19e69c5
  Jesse Mapel authored Jun 20, 2018
  
  a19e69c5
- Fixed merge conflicts · d8b6ebac
  Adam Goins authored Jun 20, 2018
  
  d8b6ebac
- Fixed merge conflicts · 088b404a
  Adam Goins authored Jun 20, 2018
  
  088b404a
- Fixed merge conflicts · 3b0e0c04
  Adam Goins authored Jun 20, 2018
  
  3b0e0c04
- Added dcoumentation for health widget · 2f1294ac
  Adam Goins authored Jun 20, 2018
  
  2f1294ac
- Added documentation to historyEntry · 59fcf177
  Adam Goins authored Jun 20, 2018
  
  59fcf177
Jun 19, 2018
- Added history comment · a91dfdaf
  Adam Goins authored Jun 19, 2018
  
  a91dfdaf
- Merge branch 'health_monitor_documentation' of github.com:AgoinsUSGS/ISIS3 into Gui_Updates · 9fb34a31
  Adam Goins authored Jun 19, 2018
  
  9fb34a31
- Added progresssbar visualations for point free,fixed,constrained, added... · 635d4270
  Adam Goins authored Jun 19, 2018
  635d4270
- fix typo in history comment · 55930658
  Adam Goins authored Jun 19, 2018
  
  55930658
- Fixes updating references in selectLeftMeasure and selectRightMeasure to fix a... · 7a7ccdd2
  Adam Goins authored Jun 19, 2018
  7a7ccdd2
- Gave the ControlHealthMonitorView() a reference to the directory instance... · fc3715aa
  Adam Goins authored Jun 19, 2018
  fc3715aa
Jun 18, 2018
- Added ControlHealthMonitorWorkOrder to WorkOrderFactory. · 9cccd59c
  Adam Goins authored Jun 18, 2018
  
  9cccd59c
- Merge branch 'Signals_Slots' of github.com:AgoinsUSGS/ISIS3 into health_monitor_documentation · 1cb420e0
  Adam Goins authored Jun 18, 2018
  
  1cb420e0
- Check to ensure parent exists before calling emitMeasureModified() on it. · 3892b162
  Adam Goins authored Jun 18, 2018
  
  3892b162
- added spacing · 5b52faf6
  Adam Goins authored Jun 18, 2018
  
  5b52faf6
- Added spacing between methods. · b6887431
  Adam Goins authored Jun 18, 2018
  
  b6887431
- updated history comment in ControlNetVitals · fbb3cceb
  Adam Goins authored Jun 18, 2018
  
  fbb3cceb
- Added history comments with respect to the signal / slot changes that Jesse and I made. · 998579f7
  Adam Goins authored Jun 18, 2018
  
  998579f7
- Created unit test and truthdata · 1b61a812
  Adam Goins authored Jun 18, 2018
  
  1b61a812
- A · ba86fdff
  Adam Goins authored Jun 18, 2018
  
  ba86fdff
- commented out a todo. Fixed typo · 015b79eb
  Adam Goins authored Jun 18, 2018
  
  015b79eb
- Made call to emitPointModified · a6d2bdee
  Adam Goins authored Jun 18, 2018
  
  a6d2bdee
- Removed debug statements · e8f32ece
  Adam Goins authored Jun 18, 2018
  
  e8f32ece
- Replaced call to deleted method. · c910f7e1
  Adam Goins authored Jun 18, 2018
  
  c910f7e1
- Merge pull request #253 from jessemapel/ipceCnetHealth · f024deed
  Kristin authored Jun 18, 2018
  f024deed
Jun 15, 2018
- Merge branch 'ipceCnetHealth' of github.com:USGS-Astrogeology/ISIS3 into ipceCnetHealth · 5381b894
  Jesse Mapel authored Jun 15, 2018
  
  5381b894
- Fixed a small bug that was doing too much during ControlNet loading · 20b10a47
  Jesse Mapel authored Jun 15, 2018
  
  20b10a47