Commits · 437b7c2170cbd3c382669655fc2a602be22278e2 · Software / ArmarX / ArmarXGui

Jun 06, 2017
- Fixed ComboboxButton + Implemented Inactive State in gui · 437b7c21
  Cedric Seehausen authored 7 years ago
  
  437b7c21
- Merge branch 'ScenarioManagerIceExecuting' of... · 77faaecb
  Cedric Seehausen authored 7 years ago
  
  Merge branch 'ScenarioManagerIceExecuting' of https://gitlab.com/ArmarX/ArmarXGui into ScenarioManagerIceExecuting
  77faaecb
- Merge branch 'master' into ScenarioManagerIceExecuting · 9b261dbd
  Cedric Seehausen authored 7 years ago
  
  9b261dbd
- Fixed ComboBoxButton states · 1431f00b
  Cedric Seehausen authored 7 years ago
  
  1431f00b
Jun 05, 2017

Merge branch 'VariantWidget' into 'master' · 5efdb545

Mirko Wächter authored 7 years ago

add a widget that can be used to display variants/ vectors of variants/ maps of …

See merge request !46

5efdb545

Jun 04, 2017
- adjusted to observer change · 662222aa
  Mirko Wächter authored 7 years ago and Mirko Wächter committed 7 years ago
  
  662222aa
- adjusted to observer change · c338a565
  Mirko Wächter authored 7 years ago
  
  c338a565
- Merge branch 'MoreIcons' into 'master' · 5f5ccec0
  Mirko Wächter authored 7 years ago
  
  add a blank icon See merge request !45
  5f5ccec0
Jun 03, 2017

add a way to describe a widget layout via ice and a widget using this... · f6cb268d

Raphael authored 7 years ago

add a way to describe a widget layout via ice and a widget using this description to create the described widget layout

f6cb268d

add a widget that can be used to display variants/ vectors of variants/ maps... · e4caabc0

Raphael authored 7 years ago

add a widget that can be used to display variants/ vectors of variants/ maps of variants in a gui and is able to update its content to display a new set of variants (vor each class of variant data a factory is required)
add factories for most variant data classes from armarx core (container are missing)

e4caabc0

add a blank icon · 4e07c86e

Raphael authored 7 years ago

add icons for black/gray triangle pointing up/down/left/right

4e07c86e

Jun 02, 2017
- Merge branch 'master' into ScenarioManagerIceExecuting · cc02b77e
  Mirko Wächter authored 7 years ago
  
  cc02b77e
May 31, 2017
- added disable property of plugin preloading · 46b92a10
  Mirko Wächter authored 7 years ago
  
  46b92a10
May 30, 2017
- refactoring · c86a8ff7
  Mirko Wächter authored 7 years ago and Mirko Wächter committed 7 years ago
  
  c86a8ff7
May 28, 2017
- Merge branch 'master' into ScenarioManagerIceExecuting · f3f54dbb
  Mirko Wächter authored 7 years ago
  
  f3f54dbb
May 25, 2017
- it is now possible to update properties of components from the system state monitor · 5a2d584a
  Mirko Wächter authored 7 years ago
  
  5a2d584a
May 24, 2017
- Fixed Local/Remote switch bug for the DetailedApplicationView · 7ae60bc9
  Cedric Seehausen authored 7 years ago
  
  7ae60bc9
May 23, 2017
- Added functionality to switch between local/remote scenario deployment · c3b6bf76
  Cedric Seehausen authored 7 years ago
  
  c3b6bf76
- Final fix for restart behaviour of Ice Applications · 74452cf0
  Cedric Seehausen authored 7 years ago
  
  74452cf0
- Fixed restart behaviour of IceApps + implemented way of changing Ice launching nodes per app · 8a8fad07
  Cedric Seehausen authored 7 years ago
  
  8a8fad07
May 17, 2017
- Merge branch 'master' of https://gitlab.com/ArmarX/ArmarXGui · edfc3765
  Mirko Wächter authored 7 years ago
  
  edfc3765
- fixed restoring of window state · 13c88b49
  Mirko Wächter authored 7 years ago
  
  13c88b49
- Fixed stopping behaviour of ice scenarios · 453d2ce4
  Cedric Seehausen authored 7 years ago
  
  453d2ce4
- Fixed Typos + Compiler warnings · d4cab181
  Cedric Seehausen authored 7 years ago
  
  d4cab181
May 16, 2017
- Merge branch 'master' into ScenarioManagerIceExecuting · 1ab61ac8
  Cedric Seehausen authored 7 years ago
  
  1ab61ac8
- Excluded ScenarioStarting behaviour out of Start method inside... · ba35e536
  Cedric Seehausen authored 7 years ago
  
  Excluded ScenarioStarting behaviour out of Start method inside ScenarioListController + removed unused variables
  ba35e536
May 09, 2017
- Established enum vor Scenario start ComboBox · ff386d9f
  Cedric Seehausen authored 7 years ago
  
  ff386d9f
Apr 28, 2017
- Removed debug output · 68998e39
  Cedric Seehausen authored 8 years ago
  
  68998e39
- Fixed startbuttons for subScenarioItems · 8dc9d1e2
  Cedric Seehausen authored 8 years ago
  
  8dc9d1e2
- Merge with Master + First implementation of Ice Deployment via gui · bc223116
  Cedric Seehausen authored 8 years ago
  
  bc223116
Apr 26, 2017
- SystemStateMonitor: Fixed object factory includes · 4e707179
  Eren Aksoy authored 8 years ago
  
  4e707179
Apr 22, 2017
- condition handler and system observer are now also in the sce always added to the proxy list · 0ecdc32c
  Mirko Wächter authored 8 years ago
  
  0ecdc32c
- fixed button order · 3471ac7e
  Mirko Wächter authored 8 years ago
  
  3471ac7e
Apr 16, 2017
- Update HowTos.dox · 52ca961f
  Mirko Wächter authored 8 years ago
  
  52ca961f
Apr 15, 2017
- removed obsolete include · c5dfd266
  Mirko Wächter authored 8 years ago
  
  c5dfd266
- initializer list fix · 1d18f9da
  Mirko Wächter authored 8 years ago
  
  1d18f9da
- added missing parenthesis · f75bc424
  Mirko Wächter authored 8 years ago
  
  f75bc424
- added howto to add a new variant type to the statechart editor · ffe8b7dc
  Mirko Wächter authored 8 years ago
  
  ffe8b7dc
- added define for initializer list · 1212116a
  Mirko Wächter authored 8 years ago
  
  1212116a
- initializer fix · b55b6452
  Mirko Wächter authored 8 years ago
  
  b55b6452