Commit 5ef48b84 authored by CD's avatar CD

Cleanup

parent 4e4cdd19
......@@ -3,7 +3,7 @@
*.ds_store
*.DS_Store
modules/Display_Scholar_sdsd/
modules/SolverOut1032531681
modules/SolverOut*
modules/Structure_Stochastic_asdsdsds/
*.lx32fsl
*.lx64fsl
......@@ -14,7 +14,10 @@ HumModExtras
modules/SolverIn*
CogSci18
CogSci18 - Copy
CECArous*
CORT-Raw*
EPI-Raw
CRH-Raw
phys-test-models/CEC*
phys-test-models/CORT*
phys-test-models/EPI*
phys-test-models/CRH*
phys-test-models/arous-ans*
modules/HumMod.*
......@@ -793,7 +793,7 @@
;; build the temp visicon
(setf feature-list (flatten (build-vis-locs-for (device devin) vis-mod)))
(time (setf feature-list (flatten (build-vis-locs-for (device devin) vis-mod))))
(when (with-cursor-p devin)
......
No preview for this file type
# this file generated when environment is closed
# refresh . to make sure sizes are right
wm deiconify .
update
wm withdraw .
if {[winfo screenwidth .] != 1280 || [winfo screenheight .] != 800 || [lindex [wm maxsize .] 0] != 1276 || [lindex [wm maxsize .] 1] != 774} {
set size_mismatch 1
} else {
set size_mismatch 0
}
if $size_mismatch {
set reset_window_sizes [tk_messageBox -icon warning -title "Screen resolution changed" -type yesno \
-message "The screen resolution is not the same as it was the last time the Environment was used. Should the window positions reset to the defaults?"]
} else { set reset_window_sizes 0}
if {$reset_window_sizes != "yes"} {
set window_config(.control_panel) 201x722+1024+0
set changed_window_list(.control_panel) 1
set window_config(.reload_response) 500x230+262+269
set changed_window_list(.reload_response) 1
}
# this file generated when environment is closed
# refresh . to make sure sizes are right
wm deiconify .
update
wm withdraw .
if {[winfo screenwidth .] != 1280 || [winfo screenheight .] != 800 || [lindex [wm maxsize .] 0] != 1276 || [lindex [wm maxsize .] 1] != 774} {
set size_mismatch 1
} else {
set size_mismatch 0
}
if $size_mismatch {
set reset_window_sizes [tk_messageBox -icon warning -title "Screen resolution changed" -type yesno \
-message "The screen resolution is not the same as it was the last time the Environment was used. Should the window positions reset to the defaults?"]
} else { set reset_window_sizes 0}
if {$reset_window_sizes != "yes"} {
set window_config(.control_panel) 170x722+1094+0
set changed_window_list(.control_panel) 1
set window_config(.reload_response) 500x230+710+425
set changed_window_list(.reload_response) 1
}
# this file generated when environment is closed
# refresh . to make sure sizes are right
wm deiconify .
update
wm withdraw .
if {[winfo screenwidth .] != 1920 || [winfo screenheight .] != 1080 || [lindex [wm maxsize .] 0] != 1916 || [lindex [wm maxsize .] 1] != 1054} {
set size_mismatch 1
} else {
set size_mismatch 0
}
if $size_mismatch {
set reset_window_sizes [tk_messageBox -icon warning -title "Screen resolution changed" -type yesno \
-message "The screen resolution is not the same as it was the last time the Environment was used. Should the window positions reset to the defaults?"]
} else { set reset_window_sizes 0}
if {$reset_window_sizes != "yes"} {
set window_config(.bufferstatus) 491x200+1238+179
set changed_window_list(.bufferstatus) 1
set window_config(.stepper) 500x550+364+204
set changed_window_list(.stepper) 1
set window_config(.visicon) 850x150+473+272
set changed_window_list(.visicon) 1
set window_config(.retrieval_history) 200x200+860+440
set changed_window_list(.retrieval_history) 1
set window_config(.control_panel) 167x722+1646+0
set changed_window_list(.control_panel) 1
set window_config(.declarative) 420x300+1152+589
set changed_window_list(.declarative) 1
set window_config(.reload_response) 500x228+710+425
set changed_window_list(.reload_response) 1
set window_config(.procedural) 484x400+1231+343
set changed_window_list(.procedural) 1
set window_config(.whynot) 200x300+860+390
set changed_window_list(.whynot) 1
set window_config(.buffers) 350x240+1002+482
set changed_window_list(.buffers) 1
}
# this file generated when environment is closed
# refresh . to make sure sizes are right
wm deiconify .
update
wm withdraw .
if {[winfo screenwidth .] != 1920 || [winfo screenheight .] != 1080 || [lindex [wm maxsize .] 0] != 1920 || [lindex [wm maxsize .] 1] != 1058} {
set size_mismatch 1
} else {
set size_mismatch 0
}
if $size_mismatch {
set reset_window_sizes [tk_messageBox -icon warning -title "Screen resolution changed" -type yesno \
-message "The screen resolution is not the same as it was the last time the Environment was used. Should the window positions reset to the defaults?"]
} else { set reset_window_sizes 0}
if {$reset_window_sizes != "yes"} {
set window_config(.control_panel) 170x700+1730+190
set changed_window_list(.control_panel) 1
set window_config(.reload_response) 500x230+710+425
set changed_window_list(.reload_response) 1
}
# this file generated when environment is closed
# refresh . to make sure sizes are right
wm deiconify .
update
wm withdraw .
if {[winfo screenwidth .] != 1920 || [winfo screenheight .] != 1080 || [lindex [wm maxsize .] 0] != 1920 || [lindex [wm maxsize .] 1] != 1058} {
set size_mismatch 1
} else {
set size_mismatch 0
}
if $size_mismatch {
set reset_window_sizes [tk_messageBox -icon warning -title "Screen resolution changed" -type yesno \
-message "The screen resolution is not the same as it was the last time the Environment was used. Should the window positions reset to the defaults?"]
} else { set reset_window_sizes 0}
if {$reset_window_sizes != "yes"} {
set window_config(.control_panel) 170x700+1730+190
set changed_window_list(.control_panel) 1
set window_config(.reload_response) 500x230+710+425
set changed_window_list(.reload_response) 1
}
# this file generated when environment is closed
# refresh . to make sure sizes are right
wm deiconify .
update
wm withdraw .
if {[winfo screenwidth .] != 1600 || [winfo screenheight .] != 900 || [lindex [wm maxsize .] 0] != 1596 || [lindex [wm maxsize .] 1] != 873} {
set size_mismatch 1
} else {
set size_mismatch 0
}
if $size_mismatch {
set reset_window_sizes [tk_messageBox -icon warning -title "Screen resolution changed" -type yesno \
-message "The screen resolution is not the same as it was the last time the Environment was used. Should the window positions reset to the defaults?"]
} else { set reset_window_sizes 0}
if {$reset_window_sizes != "yes"} {
set window_config(.visicon) 814x150+309+232
set changed_window_list(.visicon) 1
set window_config(.stepper) 500x550+567+226
set changed_window_list(.stepper) 1
set window_config(.control_panel) 170x700+1211+3
set changed_window_list(.control_panel) 1
set window_config(.declarative) 420x290+854+329
set changed_window_list(.declarative) 1
set window_config(.buffers) 350x292+465+348
set changed_window_list(.buffers) 1
set window_config(.reload_response) 500x227+550+335
set changed_window_list(.reload_response) 1
set window_config(.procedural) 500x400+550+250
set changed_window_list(.procedural) 1
}
# this file generated when environment is closed
# refresh . to make sure sizes are right
wm deiconify .
update
wm withdraw .
if {[winfo screenwidth .] != 1600 || [winfo screenheight .] != 900 || [lindex [wm maxsize .] 0] != 1600 || [lindex [wm maxsize .] 1] != 877} {
set size_mismatch 1
} else {
set size_mismatch 0
}
if $size_mismatch {
set reset_window_sizes [tk_messageBox -icon warning -title "Screen resolution changed" -type yesno \
-message "The screen resolution is not the same as it was the last time the Environment was used. Should the window positions reset to the defaults?"]
} else { set reset_window_sizes 0}
if {$reset_window_sizes != "yes"} {
set window_config(.control_panel) 170x700+1410+100
set changed_window_list(.control_panel) 1
set window_config(.reload_response) 500x230+550+335
set changed_window_list(.reload_response) 1
}
......@@ -15,8 +15,28 @@ if $size_mismatch {
-message "The screen resolution is not the same as it was the last time the Environment was used. Should the window positions reset to the defaults?"]
} else { set reset_window_sizes 0}
if {$reset_window_sizes != "yes"} {
set window_config(.control_panel) 283x700+1947+192
set window_config(.buffer_history) 530x290+553+529
set changed_window_list(.buffer_history) 1
set window_config(.visicon) 1020x361+1181+411
set changed_window_list(.visicon) 1
set window_config(.options) 450x274+1055+583
set changed_window_list(.options) 1
set window_config(.buffers) 350x240+1649+302
set changed_window_list(.buffers) 1
set window_config(.bold_brain_3d_real) 658x508+951+470
set changed_window_list(.bold_brain_3d_real) 1
set window_config(.control_panel) 297x607+1735+267
set changed_window_list(.control_panel) 1
set window_config(.bold_brain_3d) 658x586+951+460
set changed_window_list(.bold_brain_3d) 1
set window_config(.audicon) 870x150+525+440
set changed_window_list(.audicon) 1
set window_config(.bufferstatus) 350x240+1105+600
set changed_window_list(.bufferstatus) 1
set window_config(.whynot) 200x300+1180+570
set changed_window_list(.whynot) 1
set window_config(.procedural) 500x400+773+391
set changed_window_list(.procedural) 1
set window_config(.copyright) 400x466+1080+487
set changed_window_list(.copyright) 1
}
# this file generated from saving the options
set options_array(show_copyrights) 1
set options_array(use_env_window) t
set options_array(use_smart_load) nil
set options_array(multiple_models) 0
set options_array(save_backups) 1
set options_array(save_before_reload) 1
set options_array(show_copyrights) 0
set options_array(kill_model_windows) 0
set options_array(use_smart_load) t
set options_array(save_before_reload) 1
set options_array(save_backups) 1
set options_array(multiple_models) 0
;;; -*- mode: LISP; Package: CL-USER; Syntax: COMMON-LISP; Base: 10 -*-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
;;; Author : Dan Bothell
;;;
;;; Author : Dan Bothell
;;; Address : Carnegie Mellon University
;;; : Psychology Department
;;; : Pittsburgh,PA 15213-3890
;;; : db30+@andrew.cmu.edu
;;;
;;;
;;; Copyright : (c)2002-2005 Dan Bothell
;;; Availability: Covered by the GNU LGPL, see LGPL.txt
;;;
;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
;;;
;;; Filename : env-device.lisp
;;; Version : 3.0
;;;
;;;
;;; Description : No system dependent code.
;;; : This file contains the code that handles passing
;;; : the virtual windows out through Tk - the visible
;;; : virtuals, and the AGI support.
;;; Bugs : [ ] What should happen if a button goes away between when the
;;; : model initiates an action and finishes it?
;;;
;;; Todo :
;;;
;;; Todo :
;;; ----- History -----
;;;
;;; 10/01/2002 Dan
;;; : Added this header.
;;; : Added this header.
;;; 10/01/2002 Dan
;;; : Updated version to 1.1 and fixed the packaging
;;; : for building a standalone in ACL.
......@@ -45,7 +45,7 @@
;;; 2005.04.13 Dan [2.0]
;;; : * Moved over to ACT-R 6.
;;; 2005.06.07 Dan
;;; : * Replaced a call to device-interface with
;;; : * Replaced a call to device-interface with
;;; : current-device-interface.
;;; 2005.06.28 Dan
;;; : * Removed a pm-proc-display call that was still lingering
......@@ -60,7 +60,7 @@
;;; : when shifting between visible and virtual.
;;; -------------------------------------------------------------------------
;;; 2011.05.20 Dan [3.0]
;;; : * Start of a complete overhaul to eliminate most of the
;;; : * Start of a complete overhaul to eliminate most of the
;;; : global variable usage and better encapsulate things so
;;; : that multiple model support can be added.
;;; 2011.11.21 Dan
......@@ -89,7 +89,7 @@
;;; : be based on the owning model's settings instead of whichever
;;; : model (if any) happens to be current.
;;; 2012.08.10 Dan
;;; : * Support more than one fixation ring per window since
;;; : * Support more than one fixation ring per window since
;;; : multiple models may be sharing a device by using the
;;; : model name in a tag.
;;; 2012.08.31 Dan
......@@ -111,7 +111,7 @@
;;; : which is defined here instead.
;;; 2013.07.18 Dan
;;; : * Fixed a potential bug in vv-click-event-handler because
;;; : the button could be removed between the model's click
;;; : the button could be removed between the model's click
;;; : initiation and execution in which case it can't send
;;; : the update to the environment. Probably shouldn't eval
;;; : the action either, but I'm not fixing that now.
......@@ -129,7 +129,7 @@
;;; Inherits much of the functionality from the rpm-virtual-window
;;; but needs to send the commands to Tcl/Tk as well
(defun check-with-environment-for-visible-virtuals ()
(defun check-with-environment-for-visible-virtuals ()
"Return whether or not the visible-virtuals are available"
(and (environment-control-connections *environment-control*)
(environment-control-use-env-windows *environment-control*)))
......@@ -137,20 +137,20 @@
(defvar *vv-table* (make-hash-table :test 'equal))
;;; First define all the stuff necessary for it and its possible
;;; First define all the stuff necessary for it and its possible
;;; 'subviews' as it relates to the device interface
(defclass visible-virtual-window (rpm-virtual-window)
((vv-model :accessor vv-model :initform (current-model))))
(defmethod initialize-instance :after ((win visible-virtual-window) &key)
(let ((name (string-downcase (symbol-name (new-symbol-fct "VVW"))))) ;; need a unique name and is should be downcase so
(let ((name (string-downcase (symbol-name (new-symbol-fct "VVW"))))) ;; need a unique name and is should be downcase so
;; it can be used directly on the tcl side
(setf (id win) name)
;; store the window in the lookup table
(setf (gethash name *vv-table*) win)
(send-env-window-update (list 'open name (window-title win) (x-pos win)
(y-pos win) (width win) (height win)))))
......@@ -185,12 +185,12 @@
(send-env-window-update (list 'cursor (id vw) (px loc) (py loc))))
(defmethod device-update-attended-loc ((wind visible-virtual-window) xyloc)
(when (and (visual-fixation-marker) (not (eq wind (visual-fixation-marker))))
(send-env-window-update (list 'clearattention (id wind) (current-model))))
(setf (visual-fixation-marker) wind)
(if xyloc
(send-env-window-update (list 'attention (id wind) (px xyloc) (py xyloc) (current-model)))
(send-env-window-update (list 'clearattention (id wind) (current-model)))))
......@@ -198,8 +198,8 @@
;;; Redefine the vw-output command since in a multiple model situation
;;; this could be called in other than the owning model's context (particularly
;;; if a person performs the action, but also when there is more than one
;;; model using the window as its device), but always use the owner's
;;; if a person performs the action, but also when there is more than one
;;; model using the window as its device), but always use the owner's
;;; settings to determine if and where to output things.
......@@ -207,7 +207,7 @@
;; DAN
;; seems like this should be in the trace
;;(format (outstrm vw)
(multiple-value-bind (mp model) (exp-window-owner vw)
(if (and mp model)
(with-meta-process-eval mp
......@@ -231,16 +231,16 @@
(defmethod add-visual-items-to-rpm-window ((win visible-virtual-window) &rest items)
(dolist (item items)
(add-subviews win item)
(send-env-window-update
(send-env-window-update
(case (type-of item)
(env-button-vdi
(list 'button (id win) (id item) (x-pos item) (y-pos item)
(list 'button (id win) (id item) (x-pos item) (y-pos item)
(width item) (height item) (dialog-item-text item) (color-symbol->env-color (color item))))
(env-text-vdi
(list 'text (id win) (id item) (x-pos item) (y-pos item)
(list 'text (id win) (id item) (x-pos item) (y-pos item)
(color-symbol->env-color (color item)) (dialog-item-text item)))
(env-line-vdi
(list 'line (id win) (id item) (x-pos item) (y-pos item)
(list 'line (id win) (id item) (x-pos item) (y-pos item)
(color-symbol->env-color (color item)) (width item) (height item)))))))
......@@ -264,7 +264,7 @@
(defmethod remove-visual-items-from-rpm-window ((win visible-virtual-window)
(defmethod remove-visual-items-from-rpm-window ((win visible-virtual-window)
&rest items)
(dolist (item items)
(remove-subviews win item)
......@@ -277,26 +277,26 @@
(send-env-window-update (list 'clear (id win))))
(defmethod make-button-for-rpm-window ((win visible-virtual-window)
&key (x 0) (y 0) (text "Ok")
(defmethod make-button-for-rpm-window ((win visible-virtual-window)
&key (x 0) (y 0) (text "Ok")
(action nil) (height 18) (width 60) (color 'gray))
(with-model-eval (vv-model win)
(make-instance 'env-button-vdi
:x-pos x
:x-pos x
:y-pos y
:dialog-item-text text
:action action
:height height
:width width
:color color)))
(defmethod make-static-text-for-rpm-window ((win visible-virtual-window)
&key (x 0) (y 0) (text "")
(defmethod make-static-text-for-rpm-window ((win visible-virtual-window)
&key (x 0) (y 0) (text "")
(height 20) (width 80) (color 'black))
(with-model-eval (vv-model win)
(make-instance 'env-text-vdi
:x-pos x
:x-pos x
:y-pos y
:dialog-item-text text
:height height
......@@ -307,7 +307,7 @@
(defmethod rpm-window-visible-status ((win visible-virtual-window))
t)
(defmethod make-line-for-rpm-window ((wind visible-virtual-window)
(defmethod make-line-for-rpm-window ((wind visible-virtual-window)
start-pt end-pt &optional (color 'black))
(with-model-eval (vv-model wind)
(make-instance 'env-line-vdi
......@@ -318,7 +318,7 @@
:height (second end-pt))))
;;; This is a little tricky, because if it's a real window in an IDE'ed
;;; Lisp, it's still got to do the right thing to prevent hanging,
;;; Lisp, it's still got to do the right thing to prevent hanging,
;;; which is lisp specific...
(defmethod allow-event-manager ((win visible-virtual-window))
......
......@@ -2,7 +2,7 @@
<windowtop> 76 </windowtop>
<windowleft> 76 </windowleft>
<windowhigh> 200 </windowhigh>
<windowwide> 400 </windowwide>
<windowwide> 379 </windowwide>
<windowstate> 0 </windowstate>
<pipeinterval> 10 </pipeinterval>
<hidewindow> False </hidewindow>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment