ctdo/psychose
16
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • e9e94f87dd removed print master Stefan Kögl 2014-12-08 20:11:50 +0100
  • e4162538ea last changes before test run Stefan Kögl 2014-12-04 16:38:55 +0100
  • e091a32017 better layout for dump grabber Stefan Kögl 2014-12-04 13:46:20 +0100
  • 6486a586e0 foo and bar and tried to change dump window size Lucas Pleß 2014-12-03 19:50:56 +0100
  • 39ae53f598 added ekg and dump grabber to positioning Lucas Pleß 2014-12-03 19:43:00 +0100
  • 5b87ca1bc5 changed window title from ekgplotter Lucas Pleß 2014-12-03 17:48:31 +0100
  • e0f49c1232 changed window title Lucas Pleß 2014-12-03 17:45:49 +0100
  • 83e63c20ea dump_grabber with window Stefan Kögl 2014-12-03 16:49:43 +0100
  • 5da5f207b4 Merge branch 'master' of repos.ctdo.de:psychose Stefan Kögl 2014-12-03 16:33:07 +0100
  • 996ae549a4 ekg windowed without streaming Stefan Kögl 2014-12-03 16:32:45 +0100
  • ac890076b4 cleaned up the code changed GUI layout to respect current desktop layout for SDI capture added temperature offset controls Lucas Pleß 2014-11-21 03:50:27 +0100
  • 9c0c7a0fdc added fensterkram teil 1 Lucas Pleß 2014-11-20 15:35:46 +0100
  • 27914e6a19 and fixed the temperature typo everywhere else (hopefully) Lucas Pleß 2014-11-19 03:21:14 +0100
  • 33b8ee0ec7 changed temperature from int to float, since the arduino is sending now floats, fixed the typo Lucas Pleß 2014-11-19 03:18:26 +0100
  • e116bb2447 added EKG code, since i changed the protocol Lucas Pleß 2014-11-19 03:14:48 +0100
  • e9830ca276 removed snmp and status functions added hearts and breath display added extra control window made the main window for external display w/o borders Lucas Pleß 2014-11-19 03:12:08 +0100
  • 065006acdb changed ehealth temperature to float output Lucas Pleß 2014-10-28 19:52:32 +0100
  • 1b99af1219 Merge branch 'master' of repos.ctdo.de:psychose Lucas Pleß 2014-10-28 19:33:52 +0100
  • 1c2b262680 added Snmp client thread (untested) Lucas Pleß 2014-10-27 22:04:11 +0100
  • 28036e6205 new version Stefan Kögl 2014-06-07 11:03:20 +0200
  • f2963a938d polished Stefan Kögl 2014-05-29 10:22:04 +0200
  • 80d6aea666 much rewrite, very kane :) Stefan Kögl 2014-05-26 23:25:36 +0200
  • 05745e3c52 consolidate mjpeg streaming server using qtnetwork into a reusable class Stefan Kögl 2014-05-25 15:53:50 +0200
  • f3477757c2 intermediate commit Stefan Kögl 2014-05-25 15:52:40 +0200
  • b123160470 added icons and cleaned up code Stefan Kögl 2014-05-11 12:45:43 +0200
  • 620c7bc3c3 Merge branch 'master' of repos.ctdo.de:psychose Stefan Kögl 2014-05-10 14:52:39 +0200
  • d7f3a7daea changed from ffmpeg grabbing to internal grabbing and added a async http server Stefan Kögl 2014-05-10 14:52:21 +0200
  • 805330fa27 version bump to 1.1 to bypass problems on our current setup Lucas Pleß 2014-05-03 11:48:49 +0200
  • 0fd969766d Merge branch 'master' of repos.ctdo.de:psychose Lucas Pleß 2014-05-03 11:46:27 +0200
  • 52e6847fc2 changed snmp timing to 100ms timeout added control to fake pulse heartrate disabled snmp check on display mode Lucas Pleß 2014-05-03 11:46:11 +0200
  • 28cc9798e7 small changes to texter and ekgplotter Stefan Kögl 2014-05-02 13:53:42 +0200
  • ca1d492198 justified text and small improvements Stefan Kögl 2014-04-29 09:54:58 +0200
  • 0d2372df12 added per actor sensor scripts, improved grabber performance, started saving server configs and cleaned up the repo Stefan Kögl 2014-04-28 07:20:28 +0200
  • 12138a9f57 Merge branch 'master' of repos.ctdo.de:psychose Stefan Kögl 2014-04-27 15:48:32 +0200
  • a064715e38 removed unsued code Stefan Kögl 2014-04-27 15:45:58 +0200
  • 720b7c00a9 more stable frame rate Stefan Kögl 2014-04-27 15:45:00 +0200
  • dac236ca12 more stable frame rate Stefan Kögl 2014-04-27 15:44:38 +0200
  • ac48b496fb Merge branch 'master' of repos.ctdo.de:psychose Lucas Pleß 2014-04-24 20:22:54 +0200
  • cf756d4cf7 fixed bug where ekg does not show "no data" and fixed bug where snmp was not closed correctly Lucas Pleß 2014-04-24 20:22:41 +0200
  • eaaddd80f2 minor ekplotter update Stefan Kögl 2014-04-24 14:20:10 +0200
  • 97d9e8282e Merge branch 'master' of repos.ctdo.de:psychose Stefan Kögl 2014-04-24 10:50:16 +0200
  • 8f57a6d36a fade animation Stefan Kögl 2014-04-24 10:49:54 +0200
  • 40ffb2e43d cleaned up ekgplotter Stefan Kögl 2014-04-24 09:34:37 +0200
  • f3a8e8c4dd cleaned up dump_grabber Stefan Kögl 2014-04-24 09:33:43 +0200
  • 2837ab9389 more init scripts Stefan Kögl 2014-04-24 09:32:16 +0200
  • 3c2cb48eed changed offline lines to "no data" Lucas Pleß 2014-04-23 22:35:04 +0200
  • dcd8e49f85 better Stefan Kögl 2014-04-23 19:19:05 +0200
  • f5352f247a reduced cpu load Stefan Kögl 2014-04-23 18:35:15 +0200
  • 28e0cc3bc1 reduced cpu load from 104% with ffmpeg x11grab, ffserver and konsole to 32% with my implementation - yeah Stefan Kögl 2014-04-23 18:16:47 +0200
  • 7ac50d1e79 done with this Stefan Kögl 2014-04-23 17:58:50 +0200
  • 7e93c46547 fixed layout and colors Stefan Kögl 2014-04-23 17:46:14 +0200
  • 2effe315a7 implemented dump_grabber Stefan Kögl 2014-04-23 16:31:19 +0200
  • fce69b46ee added better chaosc init script to repo Stefan Kögl 2014-04-23 14:14:02 +0200
  • bcdd2e4013 added stats display Lucas Pleß 2014-04-23 12:53:48 +0200
  • 007ec565e1 finished animation feature, rearranged buttons and cleaned up the code Stefan Kögl 2014-04-22 11:10:08 +0200
  • 0086d0fd8f Merge branch 'master' of repos.ctdo.de:psychose Stefan Kögl 2014-04-20 11:37:45 +0200
  • 54d3526d2a sync commit for laptop Stefan Kögl 2014-04-20 11:37:22 +0200
  • a53cf435de added stats display, removed border from actor display Lucas Pleß 2014-04-18 03:06:41 +0200
  • a6a3666c15 moved code into package, added complete maven support for intellij UI Designer and JAR packaging Lucas Pleß 2014-04-17 19:03:45 +0200
  • 3086c96bac Merge branch 'master' of repos.ctdo.de:psychose Lucas Pleß 2014-04-17 17:27:25 +0200
  • f396266715 added airflow/breath Lucas Pleß 2014-04-17 17:27:19 +0200
  • 8a360d4e84 initial commit of dump_grabber Stefan Kögl 2014-04-17 16:25:43 +0200
  • 2caf563b8c Merge branch 'master' of repos.ctdo.de:psychose Stefan Kögl 2014-04-17 15:37:17 +0200
  • be8835b94e Merge branch 'small_design' Stefan Kögl 2014-04-17 15:33:48 +0200
  • 2f08c5529a improved exception handling Stefan Kögl 2014-04-17 15:33:21 +0200
  • 7e0bc24273 added java based health display to show if values are send by the actors Lucas Pleß 2014-04-17 11:25:14 +0200
  • ca3e271eab added binary foo to gitignore Lucas Pleß 2014-04-17 11:19:32 +0200
  • 21c59656a3 removed unused method in texter Stefan Kögl 2014-04-17 01:56:08 +0200
  • de19433571 searching for a segfault when visited by apple computers :) Stefan Kögl 2014-04-17 01:55:00 +0200
  • 2b78252fc3 new version Stefan Kögl 2014-04-17 01:43:34 +0200
  • e78c7f41a0 up and down feature, editor and text selection popup will not disturb the live text anymore, better layout Stefan Kögl 2014-04-16 02:23:36 +0200
  • 155b2ececd added model Stefan Kögl 2014-04-15 18:51:50 +0200
  • ae53e8e3ef implemented real model/view interface Stefan Kögl 2014-04-15 18:08:00 +0200
  • 80b31ecaf2 fixed font size issue Stefan Kögl 2014-04-15 09:18:28 +0200
  • 012c90744e new version Stefan Kögl 2014-04-14 12:50:53 +0200
  • 9be0f3566d added shiny blinky LED list Lucas Pleß 2014-04-12 21:43:39 +0200
  • ae8d0ea9f5 changed error message Lucas Pleß 2014-04-12 21:43:16 +0200
  • d4d4154f92 new layout Stefan Kögl 2014-04-12 20:51:49 +0200
  • 7bcf2b1a00 Merge branch 'small_design' of repos.ctdo.de:psychose into small_design Stefan Kögl 2014-04-12 10:13:17 +0200
  • 41a2399034 added desktop entry Stefan Kögl 2014-04-12 10:12:57 +0200
  • abede11b8f Merge branch 'small_design' of repos.ctdo.de:psychose into small_design Stefan Kögl 2014-04-12 09:52:38 +0200
  • 7ac1779ef8 config files for texter Stefan Kögl 2014-04-12 09:52:16 +0200
  • 157c95b5ca Merge branch 'small_design' of repos.ctdo.de:psychose into small_design Stefan Kögl 2014-04-12 09:49:54 +0200
  • 20319d3cda added missing setup.py Stefan Kögl 2014-04-12 09:47:45 +0200
  • 47995b960a Merge branch 'small_design' of repos.ctdo.de:psychose into small_design Stefan Kögl 2014-04-12 09:45:37 +0200
  • 27ff7f53b9 ekgplotter better plotting Stefan Kögl 2014-04-12 09:44:48 +0200
  • 2fb5177a6c new version of texter with icon and optimized ui for live texting Stefan Kögl 2014-04-12 09:42:03 +0200
  • 3a12ff7dc5 new smaller design Stefan Kögl 2014-04-11 10:11:13 +0200
  • 3e14468463 added texter demo Stefan Kögl 2014-04-10 19:00:01 +0200
  • 823b58488e updated ekgplotter Stefan Kögl 2014-04-08 09:34:17 +0200
  • 40f538223f my todos for today Stefan Kögl 2014-04-08 09:24:21 +0200
  • 0aa866d394 updated config files Stefan Kögl 2014-04-08 08:40:00 +0200
  • 8711d45ab6 added staged stuff Stefan Kögl 2014-04-03 17:44:36 +0200
  • 4621abe17c more error resistant Stefan Kögl 2014-03-30 18:34:26 +0200
  • 6c642e867c updated targets.conf and sensors2osc Stefan Kögl 2014-03-30 19:17:38 +0200
  • 2855d59572 fixed minor issues in ekgplotter Stefan Kögl 2014-03-27 14:10:26 +0100
  • e77af368b1 fixed ekgplotter Stefan Kögl 2014-03-27 14:06:54 +0100
  • d9295dd05d now the sensors reconnects after connection issues Stefan Kögl 2014-03-27 14:04:44 +0100
  • e865fe53d2 changed ekgplotter osc thread to a process python3.3 Stefan Kögl 2014-03-27 08:44:24 +0100
  • e889b3a88c ported from master branch fixed mem leak with adding external qt event processing Stefan Kögl 2014-03-26 14:25:24 +0100