Skip to content

Commit 531aa8a

Browse files
committed
remove mice schema and weight from start Gui
1 parent 8be8bb4 commit 531aa8a

File tree

6 files changed

+1
-53
lines changed

6 files changed

+1
-53
lines changed

docs/getting_started.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ This command adds your user to the docker group, so you can run Docker commands
8787
"stimulus": "lab_stimuli",
8888
"behavior": "lab_behavior",
8989
"recording": "lab_recordings",
90-
"mice": "lab_mice"
9190
}
9291
}
9392
```
@@ -159,7 +158,6 @@ Create a local configuration file to specify your database connection and hardwa
159158
"stimulus": "lab_stimuli",
160159
"behavior": "lab_behavior",
161160
"recording": "lab_recordings",
162-
"mice": "lab_mice"
163161
}
164162
}
165163
```

docs/local_conf.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ Maps internal schema names to database schemas:
134134
"stimulus": "lab_stimuli",
135135
"behavior": "lab_behavior",
136136
"recording": "lab_recordings",
137-
"mice": "lab_mice"
138137
}
139138
}
140139
```

src/ethopy/config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ def _set_defaults(self) -> None:
5959
"behavior": "lab_behavior",
6060
"interface": "lab_interface",
6161
"recording": "lab_recordings",
62-
"mice": "lab_mice",
6362
},
6463
"logging": {
6564
"level": "INFO",

src/ethopy/core/experiment.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,11 +1037,3 @@ class Task(dj.Lookup): # noqa: D101
10371037
"""
10381038

10391039

1040-
@mice.schema
1041-
class MouseWeight(dj.Manual): # noqa: D101
1042-
definition = """
1043-
animal_id : int unsigned # id number
1044-
timestamp=CURRENT_TIMESTAMP : timestamp # timestamp of weight
1045-
---
1046-
weight : double(5,2) # weight in grams
1047-
"""

src/ethopy/core/logger.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,18 @@ def _set_connection() -> None:
6060
behavior: The virtual module for behavior.
6161
interface: The virtual module for interface.
6262
recording: The virtual module for recording.
63-
mice: The virtual module for mice.
6463
public_conn: The connection object for public access.
6564
6665
Returns:
6766
None
6867
6968
"""
70-
global experiment, stimulus, behavior, interface, recording, mice, public_conn
69+
global experiment, stimulus, behavior, interface, recording, public_conn
7170
virtual_modules, public_conn = create_virtual_modules(SCHEMATA)
7271
experiment = virtual_modules["experiment"]
7372
stimulus = virtual_modules["stimulus"]
7473
behavior = virtual_modules["behavior"]
7574
recording = virtual_modules["recording"]
76-
mice = virtual_modules["mice"]
7775
interface = virtual_modules["interface"]
7876

7977

src/ethopy/utils/start.py

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ def __init__(self, logger) -> None:
4747
def setup_menus(self) -> None:
4848
self.animal_menu = self.create_animal()
4949
self.task_menu = self.create_task()
50-
self.weight_menu = self.create_weight()
5150
self.main_menu = self.create_main()
5251

5352
def mainloop(self) -> None:
@@ -128,15 +127,6 @@ def create_main(self) -> "pygame_menu.Menu":
128127
background_color=(128, 128, 128),
129128
).translate(630, 290)
130129

131-
menu.add.button(
132-
"Weight",
133-
self.weight_menu,
134-
align=pygame_menu.locals.ALIGN_LEFT,
135-
float=True,
136-
padding=(10, 20, 10, 20),
137-
background_color=(128, 128, 128),
138-
).translate(10, 310)
139-
140130
menu.add.button(
141131
"Power off",
142132
self.shutdown,
@@ -177,34 +167,6 @@ def create_animal(self):
177167

178168
return menu_animal
179169

180-
def create_weight(self):
181-
menu_weight = pygame_menu.Menu(
182-
"",
183-
self.SCREEN_WIDTH,
184-
self.SCREEN_HEIGHT,
185-
center_content=False,
186-
onclose=pygame_menu.events.EXIT,
187-
theme=self.theme,
188-
)
189-
menu_weight.add.label(
190-
"Enter animal weight: ",
191-
font_size=20,
192-
)
193-
self.curr_weight = ""
194-
menu_weight.add.vertical_margin(5)
195-
self.weight_screen = menu_weight.add.label(
196-
"",
197-
background_color=None,
198-
margin=(10, 0),
199-
selectable=True,
200-
selection_effect=None,
201-
)
202-
menu_weight = self.add_num_pad(
203-
menu_weight, self.log_animal_weight, self.weight_screen
204-
)
205-
206-
return menu_weight
207-
208170
def create_task(self):
209171
menu_task = pygame_menu.Menu(
210172
"",

0 commit comments

Comments
 (0)