repo
string
commit
string
message
string
diff
string
heracek/x36osy-producenti-konzumenti-processes
fd8db2a5f441b71e7784d305573508f6769e02d1
Pridano osetreni vyjimek v main().
diff --git a/main.cpp b/main.cpp index 967e33e..61d8c23 100644 --- a/main.cpp +++ b/main.cpp @@ -1,437 +1,452 @@ /** * X36OSY - Producenti a konzumenti * * vypracoval: Tomas Horacek <horact1@fel.cvut.cz> * */ #include <pthread.h> #include <stdio.h> #include <stdlib.h> #include <iostream> #include <q...
heracek/x36osy-producenti-konzumenti-processes
f1f714f5f0401e5235e2e7cdd3fcf5eb33ed67ae
Funkcni alokace a inicializace sdilenych (nefunkcnich) front.
diff --git a/main.cpp b/main.cpp index c71efe2..967e33e 100644 --- a/main.cpp +++ b/main.cpp @@ -1,285 +1,437 @@ /** * X36OSY - Producenti a konzumenti * * vypracoval: Tomas Horacek <horact1@fel.cvut.cz> * */ #include <pthread.h> #include <stdio.h> +#include <stdlib.h> #include <iostream> #include <q...
heracek/x36osy-producenti-konzumenti-processes
0afbe7f8f5f00561bdfa0ac80aca1147d9f93a0a
Pridano cekani na ukonceni vsech podprocesu.
diff --git a/main.cpp b/main.cpp index bcbbb05..c71efe2 100644 --- a/main.cpp +++ b/main.cpp @@ -1,275 +1,285 @@ /** * X36OSY - Producenti a konzumenti * * vypracoval: Tomas Horacek <horact1@fel.cvut.cz> * */ #include <pthread.h> #include <stdio.h> #include <iostream> #include <queue> #include <sys/...
heracek/x36osy-producenti-konzumenti-processes
92b9669bb907fdacaa535fed6117918319483a28
Prvni verze s procesy - vytvoreni nefunkcnich producentu a konzumentu.
diff --git a/.gitignore b/.gitignore index 496ee2c..ddc98a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.DS_Store \ No newline at end of file +.DS_Store +main \ No newline at end of file diff --git a/Makefile b/Makefile index f189cc1..512e1cd 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,19 @@ # all aft...
heracek/x36osy-producenti-konzumenti-processes
0108242def6e08883f8369730f8f47a64635213c
Pridana vychozi verze pouzivajici vlakna.
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..496ee2c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f189cc1 --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +# all after symbol '#' is comme...
jeromer/modmemcachedinclude
764cdfb47ef1d6f563487a451f193ca397198156
- Added .hgignore
diff --git a/.hgignore b/.hgignore new file mode 100644 index 0000000..888cef8 --- /dev/null +++ b/.hgignore @@ -0,0 +1,19 @@ +syntax: glob + +autom4te.cache/* +src/.deps/* +src/.libs/* +config.* +config/* +Makefile +Makefile.in +aclocal.m4 +configure +libtool +src/ssi_include_memcached.la +src/ssi_include_memcached_co...
jeromer/modmemcachedinclude
4f6408d0aa14198c1690fd25ea849dd6e7ac8e30
- Updated copyright
diff --git a/LICENSE b/LICENSE index 189ed97..4498e4e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,14 +1,17 @@ +Copyright [2008] [Jérôme Renard, jerome.renard@gmail.com] +Copyright [2009] [Jérôme Renard, jerome.renard@gmail.com] + Licensed to the Apache Software Foundation (ASF) under one or more contributor license ...
jeromer/modmemcachedinclude
eb8cb4e40157063ac83b9083a8f80302bff2abe9
- Updated installation documentation
diff --git a/INSTALL b/INSTALL index 73a2458..715c6f6 100644 --- a/INSTALL +++ b/INSTALL @@ -1,101 +1,126 @@ What is this extension made for ? ================================= This module may be used with any file that is pushed in Memcached and meant to be fetched from an SSI tag. How to compile this extensi...
jeromer/modmemcachedinclude
9ca3ddc3ed74e9fa706d15b532eadb7577a3f0ad
- Fixed wrong path to apr_memcache.h
diff --git a/m4/apr_memcache.m4 b/m4/apr_memcache.m4 index 512c073..921394a 100644 --- a/m4/apr_memcache.m4 +++ b/m4/apr_memcache.m4 @@ -1,59 +1,58 @@ dnl -------------------------------------------------------- -*- autoconf -*- dnl Copyright 2005 The Apache Software Foundation dnl dnl Licensed under the Apache Lic...
jeromer/modmemcachedinclude
e48d95c428b5552f6e402b2152328c0805436a8d
- Updated README
diff --git a/README b/README index 16b8d39..fb9fa90 100644 --- a/README +++ b/README @@ -1,18 +1,22 @@ History of this project. -Date : 2009/05/06, 2.00 pm +Date : 2009/05/06, 4.00 pm +-------------------------- +The contents of branches/ssi_include_memcached is now merged in trunk +Date : 2009/05/06, 2.00 pm +---...
jeromer/modmemcachedinclude
2dfcdc1bcab409172a5136bca6efc9e5dab2a59b
- Merged branches/ssi_include_memcached rev.42 in trunk
diff --git a/README b/README index e69de29..16b8d39 100644 --- a/README +++ b/README @@ -0,0 +1,18 @@ +History of this project. + +Date : 2009/05/06, 2.00 pm + +At the very beginning this module was made for a customer. +But he decided not to use this module for some reason. + +So I decided to open this project to anyo...
jeromer/modmemcachedinclude
88d88a872f7887fc9885ce7c306a9e91744acd55
- Fixed crash when used in VHost mode
diff --git a/src/mod_memcached_include.c b/src/mod_memcached_include.c index f5c5889..8c6fe81 100644 --- a/src/mod_memcached_include.c +++ b/src/mod_memcached_include.c @@ -1,662 +1,662 @@ /* Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file dis...
jeromer/modmemcachedinclude
484a090ca6401789bad69dfffca85d892afde304
- Added more practical test files
diff --git a/tests/backendgen.php b/tests/backendgen.php new file mode 100755 index 0000000..686fa87 --- /dev/null +++ b/tests/backendgen.php @@ -0,0 +1,33 @@ +<?php +define( 'MEMCACHED_HOST', '127.0.0.1' ); +define( 'MEMCACHED_PORT', '11211' ); +define( 'MEMCACHED_TIMEOUT', '10' ); + +if( !extension_loaded( 'memcache'...
jeromer/modmemcachedinclude
9eadf1a0f002938899b12563e5a1d2fee034886a
- Added a quick builder
diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..805a5b3 --- /dev/null +++ b/build.sh @@ -0,0 +1,15 @@ +#! /bin/bash + +APR_MEMCACHE=/usr/local/apache-2.2.9 +APXS_PATH=/usr/local/apache-2.2.9/bin/apxs +APACHECTL_PATH=/usr/local/apache-2.2.9/bin/apachectl + +# enable debug informations +# export CFLA...
jeromer/modmemcachedinclude
444a4abcfda4dce38c0ecfcddddf639442125227
- Added libtool for apt-get
diff --git a/INSTALL b/INSTALL index 8835b11..73a2458 100644 --- a/INSTALL +++ b/INSTALL @@ -1,101 +1,101 @@ What is this extension made for ? ================================= This module may be used with any file that is pushed in Memcached and meant to be fetched from an SSI tag. How to compile this extensi...
jeromer/modmemcachedinclude
08494cbea1de595eda166381e513d2da43236ecd
- Reduced image size
diff --git a/misc/modmemcachedinclude.png b/misc/modmemcachedinclude.png index 930aa09..e581e0d 100644 Binary files a/misc/modmemcachedinclude.png and b/misc/modmemcachedinclude.png differ
jeromer/modmemcachedinclude
c343bd2d7778d88ed759fc5cacbb737184e12ddf
- Fixed bug #5
diff --git a/tests/push.php b/tests/push.php index 99bf266..1cf8f1c 100755 --- a/tests/push.php +++ b/tests/push.php @@ -1,37 +1,37 @@ <?php -define( MEMCACHED_HOST, '127.0.0.1' ); -define( MEMCACHED_PORT, '11211' ); -define( MEMCACHED_TIMEOUT, '10' ); +define( 'MEMCACHED_HOST', '127.0.0.1' ); +define( 'MEMCACHED_PORT...
jeromer/modmemcachedinclude
1be35e2aec2e5273d31f07c8541c14fe0713470e
- added modmemcachedinclude schema
diff --git a/misc/modmemcachedinclude.png b/misc/modmemcachedinclude.png new file mode 100644 index 0000000..930aa09 Binary files /dev/null and b/misc/modmemcachedinclude.png differ
jeromer/modmemcachedinclude
bd34eb2549e5eacdd94ff474e39bfa7425f96a64
- updated FAQ file - created a patch for configure.ac
diff --git a/FAQ b/FAQ index 8a282a6..f89b1e8 100644 --- a/FAQ +++ b/FAQ @@ -1,15 +1,45 @@ When compiling apr_memcache, I get the following error message : "unable to infer tagged configuration" ------------------------------------------------------------------------------------------------------ Open configure.ac...
jeromer/modmemcachedinclude
88b666e9802b500eccc70c7239e00ac9124b8cec
- added Apache2 License terms
diff --git a/LICENSE b/LICENSE index e69de29..189ed97 100644 --- a/LICENSE +++ b/LICENSE @@ -0,0 +1,14 @@ +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The A...
jeromer/modmemcachedinclude
5a44951f21368225f78b1ac0f8ce775d7045f37b
- fixed linking issues in configure.ac - updated documentation - update svn:ignore tag in order to ignore another cache file
diff --git a/INSTALL b/INSTALL index 04e4c8f..8835b11 100644 --- a/INSTALL +++ b/INSTALL @@ -1,72 +1,101 @@ What is this extension made for ? ================================= This module may be used with any file that is pushed in Memcached and meant to be fetched from an SSI tag. How to compile this extensio...
jeromer/modmemcachedinclude
c2a2368dd64e76cb47105d50585925c71b4c7a1f
-added basic TODO
diff --git a/TODO b/TODO index e69de29..030dbc1 100644 --- a/TODO +++ b/TODO @@ -0,0 +1 @@ +- Writing compilation guide for Red Hat and non .deb based distributions
jeromer/modmemcachedinclude
b176d24955d395d2f284a513c44df50b7b557de3
-added ltmain.sh script
diff --git a/config/ltmain.sh b/config/ltmain.sh new file mode 100644 index 0000000..4598ec6 --- /dev/null +++ b/config/ltmain.sh @@ -0,0 +1,6930 @@ +# ltmain.sh - Provide generalized library-building support services. +# NOTE: Changing this file will not affect anything until you rerun configure. +# +# Copyright (C) 1...
jeromer/modmemcachedinclude
dac7f7c2b8cb3f0d9fe3214b55e824f52a8ef011
- removed --tag=CC arg in configure.ac - update FAQ to explain that adding --tag=CC applies for mod_memcached_include as well as some systems already include the correct argument
diff --git a/FAQ b/FAQ index 2a07f60..8a282a6 100644 --- a/FAQ +++ b/FAQ @@ -1,13 +1,15 @@ When compiling apr_memcache, I get the following error message : "unable to infer tagged configuration" ------------------------------------------------------------------------------------------------------ Open configure.ac...
jeromer/modmemcachedinclude
7648cd37405d08ba8e802f5173c47e902c550749
- set Apache 2.2.9 a mininal required version for Apache
diff --git a/configure.ac b/configure.ac index 7e9dcea..d3922f5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,51 +1,51 @@ AC_INIT(mod_memcached_include, 1.0) MAKE_CONFIG_NICE(config.nice) AC_PREREQ(2.53) AC_CONFIG_SRCDIR([src/mod_memcached_include.c]) AC_CONFIG_AUX_DIR(config) AC_PROG_LIBTOOL AM_MAINTAINE...
jeromer/modmemcachedinclude
c29b6c8d52732fab494e8a715e0c5d8a6407fbde
- added tag to avoir compilation errors
diff --git a/configure.ac b/configure.ac index 05f6750..7e9dcea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,51 +1,51 @@ AC_INIT(mod_memcached_include, 1.0) MAKE_CONFIG_NICE(config.nice) AC_PREREQ(2.53) AC_CONFIG_SRCDIR([src/mod_memcached_include.c]) AC_CONFIG_AUX_DIR(config) AC_PROG_LIBTOOL AM_MAINTAINE...
jeromer/modmemcachedinclude
f6532c4470d0aa2aab96aaf714664bc7921c9714
- added FAQ
diff --git a/FAQ b/FAQ new file mode 100644 index 0000000..2a07f60 --- /dev/null +++ b/FAQ @@ -0,0 +1,13 @@ +When compiling apr_memcache, I get the following error message : "unable to infer tagged configuration" +------------------------------------------------------------------------------------------------------ + +...
jeromer/modmemcachedinclude
8770265650aacb9496d4ea219150436b857f9ec8
- delete doc directory - moved INSTALL to root directory - moved source files to src - fixed issue 2 - deletes original Makefile - added empty 'config' dir
diff --git a/doc/INSTALL b/INSTALL similarity index 54% rename from doc/INSTALL rename to INSTALL index ae94e7f..04e4c8f 100644 --- a/doc/INSTALL +++ b/INSTALL @@ -1,91 +1,72 @@ What is this extension made for ? ================================= This module may be used with any file that is pushed in Memcached an...
jeromer/modmemcachedinclude
0421293080bfeec5c66c345b56856f6abd497526
- fixed bug #1
diff --git a/mod_memcached_include.c b/mod_memcached_include.c index c6ff9d0..f5c5889 100644 --- a/mod_memcached_include.c +++ b/mod_memcached_include.c @@ -1216,1069 +1216,1057 @@ static int parse_expr(include_ctx_t *ctx, const char *expr, int *was_error) default: new->parent = current;...
jeromer/modmemcachedinclude
2e935bd7b18a1383a9cb688dbb1759956ab8d8b0
- mixed memcached and local SSI
diff --git a/tests/pull-memcached.shtml b/tests/pull-memcached.shtml index 6ec5778..d0de05f 100644 --- a/tests/pull-memcached.shtml +++ b/tests/pull-memcached.shtml @@ -1,7 +1,11 @@ <html> <head></head> <body> <h1>Memcached tests</h1> - <!--#include memcached="mod_memcached_include_tests" -->...
jeromer/modmemcachedinclude
e8ca2ec76d4f2d871853c82f7fe5fd01ed55d58b
- updated push test
diff --git a/tests/push.php b/tests/push.php index d827183..99bf266 100755 --- a/tests/push.php +++ b/tests/push.php @@ -1,29 +1,37 @@ <?php define( MEMCACHED_HOST, '127.0.0.1' ); define( MEMCACHED_PORT, '11211' ); define( MEMCACHED_TIMEOUT, '10' ); if( !extension_loaded( 'memcache' ) ) { die( 'Extension n...
jeromer/modmemcachedinclude
f1ac4e21319fd7a029407929061de41ae143fe1e
- added configuration variables
diff --git a/mod_memcached_include.c b/mod_memcached_include.c index 7dcfe0a..c6ff9d0 100644 --- a/mod_memcached_include.c +++ b/mod_memcached_include.c @@ -1,642 +1,642 @@ /* Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with ...
jeromer/modmemcachedinclude
9c365ebe3f64472a2432544b83c3335898193323
- corrected documentation
diff --git a/doc/INSTALL b/doc/INSTALL index 7ebd02c..ae94e7f 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -1,95 +1,91 @@ What is this extension made for ? ================================= -This extension has been primarily created for a customer -project this module had to be coupled with an eZ Publish -extensio...
jeromer/modmemcachedinclude
37f197c8ca1dfa54558911542f4e8e69885b2298
- added first version of the documentation
diff --git a/doc/INSTALL b/doc/INSTALL new file mode 100644 index 0000000..7ebd02c --- /dev/null +++ b/doc/INSTALL @@ -0,0 +1,95 @@ +What is this extension made for ? +================================= + +This extension has been primarily created for a customer +project this module had to be coupled with an eZ Publish ...
jeromer/modmemcachedinclude
ccdce9046f528ce3e461ae277be437651f841553
- translated test file in english
diff --git a/tests/mod_memcached_include_tests b/tests/mod_memcached_include_tests index b13cc19..605ea75 100644 --- a/tests/mod_memcached_include_tests +++ b/tests/mod_memcached_include_tests @@ -1 +1 @@ -<b>contenu de mod_memcached_include_test LOCAL</b> +mod_memcached_include test : <b>LOCAL</b>
jeromer/modmemcachedinclude
fd54ad32a57c437c796d6d52d138c7043b1aceaa
-initial import
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0b0586a --- /dev/null +++ b/Makefile @@ -0,0 +1,49 @@ +## +## Makefile -- Build procedure for sample memcached_include Apache module +## Autogenerated via ``apxs -n memcached_include -g''. +## + +## apxs -c -lapr_memcache -L/opt/local/lib -I/opt/loc...
ztangent/checkergen
80656bfbd0c0ee7c74714f307fa776dd157cab68
Revert "Demonstration purposes only."
diff --git a/src/core.py b/src/core.py index f467be0..6f08c43 100755 --- a/src/core.py +++ b/src/core.py @@ -1,545 +1,544 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroups....
ztangent/checkergen
d6f0d991fc8b8ebaa3d3bb23dcae3bd7c9c6050a
Demonstration purposes only.
diff --git a/src/core.py b/src/core.py index 458b04e..253b9bf 100755 --- a/src/core.py +++ b/src/core.py @@ -1,544 +1,545 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroups....
ztangent/checkergen
3a64ed7dd63145ef2db2a95ca81151b086430956
Fixed logic for when to send 102.
diff --git a/src/core.py b/src/core.py index 0a3b961..6f08c43 100755 --- a/src/core.py +++ b/src/core.py @@ -282,1025 +282,1025 @@ class CkgProj: vars_to_load = [var for var in self.__class__.DEFAULTS.keys() if not isinstance(self.__class__.DEFAULTS[var], dict)] # Name is not ...
ztangent/checkergen
3dd8fc7a5112738123d05fed606c8e0464378cee
Fix eyetracking logic once and for all..
diff --git a/src/eyetracking.py b/src/eyetracking.py index 4407e79..ae402c5 100644 --- a/src/eyetracking.py +++ b/src/eyetracking.py @@ -1,201 +1,200 @@ """Provides support for CRS VideoEyetracker Toolbox.""" import os.path from utils import * FIX_POS = (0, 0) FIX_RANGE = (20, 20) PERIOD = 300 try: ...
ztangent/checkergen
479af8c76134102af9589120338194d6253f334c
Fixed eyetracking bug, tracking and fixation checking synchronized.
diff --git a/src/core.py b/src/core.py index 536bd22..0a3b961 100755 --- a/src/core.py +++ b/src/core.py @@ -255,1027 +255,1027 @@ class CkgProj: def is_dirty(self): return self._dirty def load(self, path): """Loads project from specified path.""" # Get project name from filen...
ztangent/checkergen
23345e5d825e3940aca56f9a34c21d4002c8c551
Improved fixation detection, poll eyetracker once per frame only.
diff --git a/src/core.py b/src/core.py index f070248..536bd22 100755 --- a/src/core.py +++ b/src/core.py @@ -253,1051 +253,1055 @@ class CkgProj: self.orders = orders self._dirty = True def is_dirty(self): return self._dirty def load(self, path): """Loads project from s...
ztangent/checkergen
b0283700ead9103db81c6d5aaa9a61c55e9c199b
Cross always shown during stimuli, eye positions logged.
diff --git a/src/core.py b/src/core.py index 8e0dced..f070248 100755 --- a/src/core.py +++ b/src/core.py @@ -104,1233 +104,1247 @@ class CkgProj: ('logdur', False), ('trigser', False), ('trigpar', ...
ztangent/checkergen
7b60fc243f4cfb28c69756aca1ccde6095b07961
CLI can edit pre_cross, post_cross values.
diff --git a/example.ckg b/example.ckg index b4ffb99..9d2162a 100644 --- a/example.ckg +++ b/example.ckg @@ -1,80 +1,84 @@ <?xml version="1.0" ?> <project xmlns="http://github.com/ZOMGxuan/checkergen"> <fps>Decimal('60')</fps> <res>(800, 600)</res> <bg>(127, 127, 127)</bg> <pre>Decimal('0')</pre> ...
ztangent/checkergen
f0af3f24a64e31715610d5a190aeee0180817eee
Cross visibility can be set during pre and post periods.
diff --git a/example.ckg b/example.ckg index 6faf27e..b4ffb99 100644 --- a/example.ckg +++ b/example.ckg @@ -1,80 +1,80 @@ <?xml version="1.0" ?> <project xmlns="http://github.com/ZOMGxuan/checkergen"> <fps>Decimal('60')</fps> <res>(800, 600)</res> <bg>(127, 127, 127)</bg> <pre>Decimal('0')</pre> ...
ztangent/checkergen
a08d4a05f924f927bfcb9260a60b1d240cb1c04a
CLI reflects changes in fix cross coloration (3 colors instead of 2)
diff --git a/src/cli.py b/src/cli.py index 8e3de68..beea467 100644 --- a/src/cli.py +++ b/src/cli.py @@ -1,756 +1,757 @@ """Defines command-line-interface for checkergen.""" import os import sys if os.name == 'posix': import readline import argparse import cmd import shlex import core import priority ...
ztangent/checkergen
10432f61f97e60ea0f3c33d3642ebaa576c87941
Fixation cross turns blue when untracked, red when not fixating.
diff --git a/src/core.py b/src/core.py index b407c1f..58a36c1 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1264 +1,1269 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
a139a86b7e9d15c12d7b514d5671051e2023376b
Restart tracking between blocks, et triggers override fpst triggers, some trigger value changes.
diff --git a/src/core.py b/src/core.py index 67f470b..b407c1f 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1281 +1,1289 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
b4bc17822617766a766a698c20c3d5257dd4677b
Ord_id now sent immediately after blk_on.
diff --git a/src/core.py b/src/core.py index 1082053..67f470b 100755 --- a/src/core.py +++ b/src/core.py @@ -310,970 +310,972 @@ class CkgProj: """Saves project to specified path as an XML document.""" self.name, ext = os.path.splitext(os.path.basename(path)) if ext != '.{0}'.format(CKG_FMT...
ztangent/checkergen
6819b49f7a7ca003c24668fcb5930797aa8b170b
Changed when order id is sent (after pressing Enter at waitscreen).
diff --git a/src/core.py b/src/core.py index 177e3cb..1082053 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1274 +1,1279 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
986f7335fbd5c0793edca7bce1ab5d18b8bb8473
Changed how fixation failure is logged, fixed some priority setting bugs.
diff --git a/src/cli.py b/src/cli.py index 0650859..8e3de68 100644 --- a/src/cli.py +++ b/src/cli.py @@ -467,702 +467,701 @@ class CkgCmd(cmd.Cmd): "is the current display group" elif args.gid >= len(self.cur_proj.groups) or args.gid < 0: print "group", args.gid, "does not exist" ...
ztangent/checkergen
22b2888c0c052f9ebdab6d830a52ee3f55308d3c
Send triggers on code change, not just when code is more than 0.
diff --git a/src/core.py b/src/core.py index 174cfdb..458b04e 100755 --- a/src/core.py +++ b/src/core.py @@ -101,1165 +101,1167 @@ class CkgProj: ('trigser', False), ('trigpar', False), ('fpst', 0)...
ztangent/checkergen
c4ed8ea5128d2cb60d9c03c60cb84a43aaa25b5f
Reimplemented export in the new style.
diff --git a/example.ckg b/example.ckg index d1a89a7..6faf27e 100644 --- a/example.ckg +++ b/example.ckg @@ -1,76 +1,80 @@ <?xml version="1.0" ?> <project xmlns="http://github.com/ZOMGxuan/checkergen"> <fps>Decimal('60')</fps> <res>(800, 600)</res> <bg>(127, 127, 127)</bg> <pre>Decimal('0')</pre> ...
ztangent/checkergen
6ffd61fb799c941318676cec3d4059621958ff77
Stop freqcheck before added groups.
diff --git a/src/core.py b/src/core.py index 12a11fb..a34cfe1 100755 --- a/src/core.py +++ b/src/core.py @@ -1,968 +1,971 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroups....
ztangent/checkergen
bb5a503cb90a7de4df23d7dce000a049a3dc50d0
do_calibrate bugfix.
diff --git a/src/cli.py b/src/cli.py index c9cf1bd..6de43ce 100644 --- a/src/cli.py +++ b/src/cli.py @@ -582,589 +582,589 @@ class CkgCmd(cmd.Cmd): return names = public_dir(args) names.remove('idlist') noflags = True for name in names: val = getattr(args, n...
ztangent/checkergen
3de1b0e44315c682f6df9eaf364d40d22fc17068
Made is_tracked and is_fixated far less flippant.
diff --git a/src/core.py b/src/core.py index 6d96194..12a11fb 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1236 +1,1233 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
39cc97a6c749fc0bf94f9357448bfb9c9da37364
Change log file format back to .log from .csv.
diff --git a/src/core.py b/src/core.py index dcd91ce..6d96194 100755 --- a/src/core.py +++ b/src/core.py @@ -1,552 +1,552 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroups....
ztangent/checkergen
91bbb57c931abe8bc4daeec471c42f6a4db7c5a0
Group orders can now be manually set or automatically generated through CLI.
diff --git a/src/cli.py b/src/cli.py index 32e90e3..c9cf1bd 100644 --- a/src/cli.py +++ b/src/cli.py @@ -1,1141 +1,1170 @@ """Defines command-line-interface for checkergen.""" import os import sys if os.name == 'posix': import readline import argparse import cmd import shlex import core import priorit...
ztangent/checkergen
0a148e7de6d14f125980ea9be2170969379a439b
ls can now list group orders too.
diff --git a/src/cli.py b/src/cli.py index 8ba0098..32e90e3 100644 --- a/src/cli.py +++ b/src/cli.py @@ -115,1005 +115,1027 @@ class CmdParserError(Exception): class CmdParser(argparse.ArgumentParser): """Override ArgumentParser so that it doesn't exit the program.""" def error(self, msg): raise C...
ztangent/checkergen
171c258ac74113b93a4513602ccf8d1411a09c63
Display options can be listed with ls command.
diff --git a/src/cli.py b/src/cli.py index a1dae74..8ba0098 100644 --- a/src/cli.py +++ b/src/cli.py @@ -106,1003 +106,1014 @@ def process_args(args): args.proj = None args.group = None if args.display_flag or args.export_flag: msg = 'error: no project file specified for display ...
ztangent/checkergen
32d135dc7068dcd9ad9686f1cd4809e1d55951b8
Added ability to set display flags.
diff --git a/example.ckg b/example.ckg index 262799c..d1a89a7 100644 --- a/example.ckg +++ b/example.ckg @@ -1,77 +1,76 @@ <?xml version="1.0" ?> <project xmlns="http://github.com/ZOMGxuan/checkergen"> <fps>Decimal('60')</fps> <res>(800, 600)</res> <bg>(127, 127, 127)</bg> - <export_fmt>'png'</expor...
ztangent/checkergen
98ce7937788ef28c29168b3ebd6137f25e6db554
Removed defunct export_fmt property.
diff --git a/src/cli.py b/src/cli.py index 24efd31..95de2fb 100644 --- a/src/cli.py +++ b/src/cli.py @@ -1,1093 +1,1081 @@ """Defines command-line-interface for checkergen.""" import os import sys if os.name == 'posix': import readline import argparse import cmd import shlex import core import priorit...
ztangent/checkergen
33c0336474bfac648a7823f2939c853faca57d15
Eyetracking and typo fixes. Eyetracking triggers confirmed to work.
diff --git a/src/cli.py b/src/cli.py index 689dc32..24efd31 100644 --- a/src/cli.py +++ b/src/cli.py @@ -311,784 +311,783 @@ class CkgCmd(cmd.Cmd): print "display group", new_id, "added" self.cur_group = new_group print "group", new_id, "is now the current display group" edgrp_parser =...
ztangent/checkergen
cf9ee07ebde7079f6a8f3614f03cad557803a346
Allow user to specify true/false for display flags.
diff --git a/src/cli.py b/src/cli.py index d992125..689dc32 100644 --- a/src/cli.py +++ b/src/cli.py @@ -1,1069 +1,1094 @@ """Defines command-line-interface for checkergen.""" import os import sys if os.name == 'posix': import readline import argparse import cmd import shlex import core import priorit...
ztangent/checkergen
6d45be48160a89dba4ab2fa69943f69cc614986f
Type check fix when setting priority.
diff --git a/src/core.py b/src/core.py index 6427ece..6137bc5 100755 --- a/src/core.py +++ b/src/core.py @@ -180,1027 +180,1028 @@ class CkgProj: if len(value) != 2: raise ValueError value = tuple([to_decimal(x) for x in value]) # Store value self.__dict__[...
ztangent/checkergen
3058edb8c082e715dc5933db7b9e0c67348b904d
Add missing freqcheck field to example.ckg.y
diff --git a/example.ckg b/example.ckg index d366c5e..262799c 100644 --- a/example.ckg +++ b/example.ckg @@ -1,76 +1,77 @@ <?xml version="1.0" ?> <project xmlns="http://github.com/ZOMGxuan/checkergen"> <fps>Decimal('60')</fps> <res>(800, 600)</res> <bg>(127, 127, 127)</bg> <export_fmt>'png'</expor...
ztangent/checkergen
2035a3ed4af1734af5824fa92e23c94cee379cd9
Freqcheck functionality added and working.
diff --git a/src/cli.py b/src/cli.py index 9a4f5a1..d992125 100644 --- a/src/cli.py +++ b/src/cli.py @@ -274,791 +274,796 @@ class CkgCmd(cmd.Cmd): help='''time in seconds shapes will be displayed''') mkgrp_parser.add_argument('post', type=to_d...
ztangent/checkergen
932f8e447d97300f9398bd1039c4162050c0b76f
New triggering system tested and working, start using deepcopy.
diff --git a/src/core.py b/src/core.py index 50e6ec5..29870f5 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1208 +1,1209 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
dcf83f4a40b579a9b3dd19d002968fd1963a5b59
New encoding and triggering system implemented.
diff --git a/src/core.py b/src/core.py index 6d6d518..50e6ec5 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1172 +1,1208 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
ee58d7bccf229d9240423b5565cf81f889127e66
Remove prerender to texture functionality.
diff --git a/src/core.py b/src/core.py index cb32f06..6d6d518 100755 --- a/src/core.py +++ b/src/core.py @@ -1,554 +1,553 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroups....
ztangent/checkergen
e38ab9b2e8607f5e3fd784ac98f70a67fa69a4bc
waitless, nolog and name options working for do_display.
diff --git a/example.ckg b/example.ckg index afa344b..d366c5e 100644 --- a/example.ckg +++ b/example.ckg @@ -1,74 +1,76 @@ <?xml version="1.0" ?> <project xmlns="http://github.com/ZOMGxuan/checkergen"> <fps>Decimal('60')</fps> <res>(800, 600)</res> <bg>(127, 127, 127)</bg> <export_fmt>'png'</expor...
ztangent/checkergen
eea6a519553cd0dcc442377c595a84b5143ea36b
Display tested, debugged and working so far.
diff --git a/example.ckg b/example.ckg index a2bfe9d..afa344b 100644 --- a/example.ckg +++ b/example.ckg @@ -1,73 +1,74 @@ <?xml version="1.0" ?> <project xmlns="http://github.com/ZOMGxuan/checkergen"> <fps>Decimal('60')</fps> <res>(800, 600)</res> <bg>(127, 127, 127)</bg> <export_fmt>'png'</expor...
ztangent/checkergen
5c410fe5f542d714698c33895ba4f82e70f3205d
Display rewrite theoretically complete.
diff --git a/src/core.py b/src/core.py index ef0671e..aec930b 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1155 +1,1134 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
3479f85fe237ca6012552b47244cf8f058d71150
Fleshed out display a little more.
diff --git a/src/core.py b/src/core.py index aba40b3..ef0671e 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1123 +1,1155 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
0b1991ac9a65eaa6335baa3bccfb6cb3b1da16ab
write_log -> log, runwriter -> writer rename.
diff --git a/src/core.py b/src/core.py index a838da4..aba40b3 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1123 +1,1123 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
0f688618307ed9bba40f7227b638319ae57a31f5
Obliterated CkgExp and old display content, add framework for new display.
diff --git a/src/core.py b/src/core.py index b0f4b25..a838da4 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1346 +1,992 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroups...
ztangent/checkergen
77128652d104d0e5df250dffd2d83e6c4cbd59e8
Begin display re-write, using CkgRun->CkgRunState.
diff --git a/src/cli.py b/src/cli.py index b2aff28..9fb2462 100644 --- a/src/cli.py +++ b/src/cli.py @@ -246,958 +246,958 @@ class CkgCmd(cmd.Cmd): self.do_new('') try: args = self.__class__.set_parser.parse_args(shlex.split(line)) except (CmdParserError, ValueError): ...
ztangent/checkergen
be36454c2818daf5fc581645995c9ccc51b42566
Load and saving of disp_ops and other dicts implemented.
diff --git a/example.ckg b/example.ckg index ee30221..a2bfe9d 100644 --- a/example.ckg +++ b/example.ckg @@ -1,56 +1,73 @@ <?xml version="1.0" ?> <project xmlns="http://github.com/ZOMGxuan/checkergen"> <fps>Decimal('60')</fps> <res>(800, 600)</res> <bg>(127, 127, 127)</bg> <export_fmt>'png'</expor...
ztangent/checkergen
e85f82768f28d5ee441d034882c87f2a484b32d9
Use OrderedDict for ordered XML output.
diff --git a/example.ckg b/example.ckg index cc77e03..ee30221 100644 --- a/example.ckg +++ b/example.ckg @@ -1,56 +1,56 @@ <?xml version="1.0" ?> <project xmlns="http://github.com/ZOMGxuan/checkergen"> - <export_fmt>'png'</export_fmt> - <pre>Decimal('0')</pre> - <bg>(127, 127, 127)</bg> <fps>Decimal('60...
ztangent/checkergen
da7aaf79a9f7baa97f1c6a06435a74e7566e840a
renaming of terms (block->run, trial->block)
diff --git a/src/cli.py b/src/cli.py index 33749b1..b2aff28 100644 --- a/src/cli.py +++ b/src/cli.py @@ -324,880 +324,880 @@ class CkgCmd(cmd.Cmd): try: args = self.__class__.edgrp_parser.parse_args(shlex.split(line)) except (CmdParserError, ValueError): print "error:", str(s...
ztangent/checkergen
bfb9acc9d010478fc4da1b256ca22612b314e492
fpbs -> fpst small fix
diff --git a/src/cli.py b/src/cli.py index 20da64f..33749b1 100644 --- a/src/cli.py +++ b/src/cli.py @@ -267,937 +267,937 @@ class CkgCmd(cmd.Cmd): description='''Makes a new display group with the given parameters.''') mkgrp_parser.add_arg...
ztangent/checkergen
3e6ebd22e6330f29429689e1738cc9456d85eef4
Reformulating and renaming of trigger code.
diff --git a/src/cli.py b/src/cli.py index 7fc0439..20da64f 100644 --- a/src/cli.py +++ b/src/cli.py @@ -261,943 +261,943 @@ class CkgCmd(cmd.Cmd): print "no options specified, please specify at least one" self.__class__.set_parser.print_usage() mkgrp_parser = CmdParser(add_help=False, ...
ztangent/checkergen
e0d089d85da01c90fa197dcd5e5b770f1c5a1b35
Fixed order of waitscreen append, differentiate between failed groups and added groups.
diff --git a/src/core.py b/src/core.py index 0042753..4f9f8e0 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1223 +1,1230 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
396eb13aa14ed5ca6f75922c0b749a50804e1949
Fixed calibrate function never actually calibrating.
diff --git a/src/eyetracking.py b/src/eyetracking.py index 8449c8e..4d8b4a0 100644 --- a/src/eyetracking.py +++ b/src/eyetracking.py @@ -1,163 +1,164 @@ """Provides support for CRS VideoEyetracker Toolbox.""" import os.path try: import win32com.client available = True except ImportError: availabl...
ztangent/checkergen
7547fcea679d9c935bf2c47986acb30368f06b0d
Fixed priority availability checking in cli.
diff --git a/src/cli.py b/src/cli.py index 3f9e64c..7fc0439 100644 --- a/src/cli.py +++ b/src/cli.py @@ -366,838 +366,838 @@ class CkgCmd(cmd.Cmd): return elif self.cur_group == None: print 'current project has no groups to remove' return try: args =...
ztangent/checkergen
67bd4c2f3e245dcd9d44725eb83be40b379996ee
Fixed int casting in mkexp command.
diff --git a/src/cli.py b/src/cli.py index 2cd34c2..3f9e64c 100644 --- a/src/cli.py +++ b/src/cli.py @@ -541,660 +541,663 @@ class CkgCmd(cmd.Cmd): if x >= len(self.cur_group.shapes) or x < 0: args.idlist.remove(x) print "checkerboard", x, "does not exist" if args...
ztangent/checkergen
726d60298526f5c74f45b9d76874e5ca7777598f
Consolidated logging through CkgBlk objects.
diff --git a/src/cli.py b/src/cli.py index e700557..2cd34c2 100644 --- a/src/cli.py +++ b/src/cli.py @@ -314,885 +314,887 @@ class CkgCmd(cmd.Cmd): help='''time in seconds a blank screen will be shown after shapes are displayed''') def help_edgr...
ztangent/checkergen
1de7388595fe9db11095ed41e261c45bff092cba
Experiment functionality working, old blockwise method excised.
diff --git a/src/cli.py b/src/cli.py index d216017..e700557 100644 --- a/src/cli.py +++ b/src/cli.py @@ -235,958 +235,964 @@ class CkgCmd(cmd.Cmd): set_parser.add_argument('--cross_times', metavar='TIME1,TIME2', action=store_tuple(2, ',', to_decimal), help=''...
ztangent/checkergen
ca20ab47c0e20986eab233202be4705019fed08d
Removed mkblks command, added mkexp command.
diff --git a/src/cli.py b/src/cli.py index ecb97ed..d216017 100644 --- a/src/cli.py +++ b/src/cli.py @@ -493,672 +493,700 @@ class CkgCmd(cmd.Cmd): help='checkerboard dimensions in unit cells', metavar='WIDTH,HEIGHT') ed_parser.add_argument('--init_unit', ...
ztangent/checkergen
26df4df53105f8f3f508ca087dc20a445ed47179
Add pwd and cd commands for convenience.
diff --git a/src/cli.py b/src/cli.py index 64b2d87..ecb97ed 100644 --- a/src/cli.py +++ b/src/cli.py @@ -614,539 +614,551 @@ class CkgCmd(cmd.Cmd): help='list only project settings') ls_group.add_argument('-g', '--groups', action='store_true', help='list only...
ztangent/checkergen
49691c1a81437212b5f9d3961df205a86d2bc019
cleaned up display and export functions slightly
diff --git a/src/cli.py b/src/cli.py index 7e10629..64b2d87 100644 --- a/src/cli.py +++ b/src/cli.py @@ -332,821 +332,821 @@ class CkgCmd(cmd.Cmd): for x in args.idlist[:]: if x >= len(self.cur_proj.groups) or x < 0: args.idlist.remove(x) print "checkerboard", x, ...
ztangent/checkergen
2f94104afccbbab9788ef03d13b11db1715b8732
Introduced CkgExp class, improved loading, saving.
diff --git a/src/cli.py b/src/cli.py index 5b3070c..7e10629 100644 --- a/src/cli.py +++ b/src/cli.py @@ -1,670 +1,667 @@ """Defines command-line-interface for checkergen.""" import os import sys if os.name == 'posix': import readline import argparse import cmd import shlex import core import priority ...
ztangent/checkergen
55d390cf45a2c5d5c141d7d4c4d91c6ad2429c1b
Small fixes to previous commit.
diff --git a/src/core.py b/src/core.py index f6f524d..624edc2 100755 --- a/src/core.py +++ b/src/core.py @@ -15,1137 +15,1133 @@ CheckerBoard -- A (distorted) checkerboard pattern, can color-flip. import os import sys import re import csv import itertools from xml.dom import minidom import pyglet import gra...
ztangent/checkergen
0de91eadb7c97ac19c736de707e0f5446a0ef28a
Add photoburst flag to help with photodiode testing.
diff --git a/src/cli.py b/src/cli.py index c8c87d8..5b3070c 100644 --- a/src/cli.py +++ b/src/cli.py @@ -256,895 +256,900 @@ class CkgCmd(cmd.Cmd): names = public_dir(args) noflags = True for name in names: val = getattr(args, name) if val != None: s...
ztangent/checkergen
4b39774d1ad7e17543dac9d94169121203a6a4c1
Improve eyetracking error handling a little.
diff --git a/src/core.py b/src/core.py index 348e8da..8f800d1 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1135 +1,1135 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
df14d2623a836e87fdac963fe451bddd924d7465
Fixed to_decimal, force half-periods of checkerboards to be integer no. of frames.
diff --git a/src/core.py b/src/core.py index 7517841..348e8da 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1130 +1,1135 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
a4e4dfe5469c0f3bd816ce34c0d7bd46bc7de308
Failed groups now get logged to block files. Catch shlex errors.
diff --git a/src/cli.py b/src/cli.py index 105e3bd..c8c87d8 100644 --- a/src/cli.py +++ b/src/cli.py @@ -1,1119 +1,1150 @@ """Defines command-line-interface for checkergen.""" import os import sys if os.name == 'posix': import readline import argparse import cmd import shlex import core import priorit...
ztangent/checkergen
1d6642b1e93890bb2335f9970c4e5d1076261d05
Cleaned up waitscreen implementation, tweaked is_fixated.
diff --git a/src/cli.py b/src/cli.py index 7e9df75..105e3bd 100644 --- a/src/cli.py +++ b/src/cli.py @@ -324,795 +324,796 @@ class CkgCmd(cmd.Cmd): if self.cur_proj == None: print 'please create or open a project first' return try: args = self.__class__.edgrp_par...
ztangent/checkergen
dab29d6391200e60a1e1d6c8781c0f0794a718dc
Reimplemented is_fixated function, no longer reliant on VET.
diff --git a/src/core.py b/src/core.py index 1af042c..c427d9f 100755 --- a/src/core.py +++ b/src/core.py @@ -1,1043 +1,1044 @@ """Contains core functionality of checkergen. Errors and Exceptions: FileFormatError FrameOverflowError Classes: CkgProj -- A checkergen project, contains settings and CkgDisplayGroup...
ztangent/checkergen
16b10a719c6b65373d88eb7d653ceb57537fe97f
Added etsetup command.
diff --git a/src/cli.py b/src/cli.py index 38fceb9..7e9df75 100644 --- a/src/cli.py +++ b/src/cli.py @@ -544,539 +544,575 @@ class CkgCmd(cmd.Cmd): if x >= len(self.cur_group.shapes) or x < 0: args.idlist.remove(x) print "checkerboard", x, "does not exist" if args...