Preparations for v0.4.

Author: Genuster

Examples/CFS/TnK/TnK_generate_trials.m

@@ -12,22 +12,28 @@
     checker_length=30, ...
     checker_width=15);
 
-% import CFSVM.MondrianGenerator
-% % Will generate Mondrians inside dirpath/Masks
-% generator = MondrianGenerator( ...
-%     '../Stimuli/', ...
-%     type='rectangle', ...
-%     x_pixels=512, ...
-%     y_pixels=512, ...
-%     min_fraction=1/20, ...
-%     max_fraction=1/8, ...
-%     n_figures=1000);
-% 
-% generator.set_physical_properties(60, 1920, 33.5, 1080, 45);
-% 
+import CFSVM.MondrianGenerator
+% Will generate Mondrians inside dirpath/Masks
+generator = MondrianGenerator( ...
+    '../Stimuli/', ...
+    type='rectangle', ...
+    x_pixels=512, ...
+    y_pixels=512, ...
+    min_fraction=1/20, ...
+    max_fraction=1/8, ...
+    n_figures=1000);
+
+generator.set_physical_properties(60, 1920, 33.5, 1080, 45);
+
+generator.set_cmap('grayscale', n_tones=5)
 % generator.set_shades([0,0,0], 5);
-% 
-% generator.generate(51);
+% generator.cmap = [0 0 0
+%             0.25 0.25 0.25 
+%             0.5 0.5 0.5 
+%             0.75 0.75 0.75 
+%             1 1 1]
+
+generator.generate(51);
 
 experiment.masks = Mondrians( ...
     dirpath='../Stimuli/Masks', ...
@@ -72,15 +78,15 @@
 n_images = 2;
 for block = 1:n_blocks
     for trial = 1:n_trials(block)
-        exp = copy(experiment);
-        exp.stimulus_1.index = randi(n_images);
-        exp.stimulus_1.rotation = orientations(randi(length(orientations), 1));
-        exp.stimulus_2.index = randi(n_images);
-        exp.stimulus_2.rotation = orientations(randi(length(orientations), 1));
+        exp_copy = copy(experiment);
+        exp_copy.stimulus_1.index = randi(n_images);
+        exp_copy.stimulus_1.rotation = orientations(randi(length(orientations), 1));
+        exp_copy.stimulus_2.index = randi(n_images);
+        exp_copy.stimulus_2.rotation = orientations(randi(length(orientations), 1));
         if trial >= 20
-            exp.stimulus_2.contrast = 0;
+            exp_copy.stimulus_2.contrast = 0;
         end
-        trial_matrix{block}{trial} = exp;
+        trial_matrix{block}{trial} = exp_copy;
     end
     trial_matrix{1} = trial_matrix{1}(randperm(numel(trial_matrix{1})));
 end

Examples/Masking/VSM/VSM_generate_trials.m

@@ -8,9 +8,9 @@
 # -- Project information -----------------------------------------------------
 
 project = 'CFSVM'
-copyright = '2023'
+copyright = '2023, Liad Mudrik lab'
 author = 'Gennadiy Belonosov'
-release = 'v0.3.0'
+release = 'v0.4.0'
 
 # -- General configuration ---------------------------------------------------
 
@@ -52,20 +52,6 @@
       "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/brands.min.css",
 ]
 html_theme_options = {
-    # "external_links": [
-    #     {
-    #         "url": "https://people.socsci.tau.ac.il/mu/mudriklab/",
-    #         "name": "Liad Mudrik lab",
-    #     },
-
-    #     {
-    #         "url": "http://psychtoolbox.org/",
-    #         "name": "PTB-3",
-    #     },
-
-    # ],
-
-    # "header_links_before_dropdown": 4,
     "icon_links": [
         {
             "name": "GitHub",
@@ -85,16 +71,7 @@
         "image": "_static/logo_round.bmp",
         "alt_text": "Continuous flash suppression & Visual masking",
     },
+    "footer_start": ['copyright'],
+    "footer_end": [],
 }
 
-# html_context = {
-#     "github_user": "Mudrik-Lab",
-#     "github_repo": "CFS",
-#     "github_version": "main",
-#     "doc_path": "docs",
-# }
-# html_theme_options = {
-#   "footer_items": []
-# }
-
-

Examples/Masking/VSM/VSM_main.m

@@ -1,11 +1,5 @@
-.. CFS documentation master file, created by
-   sphinx-quickstart on Thu Feb 23 17:11:55 2023.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-
-Welcome to CFS's documentation!
-===============================
+Welcome to CFSVM's documentation!
+=================================
 
 .. toctree::
     :maxdepth: 1