lilferrit commited on
Commit
d6201db
1 Parent(s): c4731f0

fixed ui bugs, ui COL updates

Browse files
Dockerfile CHANGED
@@ -13,4 +13,4 @@ COPY ./MANIFEST.in /code/MANIFEST.in
13
  RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
14
  RUN pip install -e /code
15
 
16
- CMD ["python3", "-m", "eggcount.app", "--host=\"0.0.0.0\"", "--port=\"7860\""]
 
13
  RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
14
  RUN pip install -e /code
15
 
16
+ CMD ["python3", "-m", "larvaecount.app", "--host=\"0.0.0.0\"", "--port=\"7860\""]
larvaecount/pages/home.py CHANGED
@@ -89,8 +89,11 @@ def get_new_upload_container(
89
  layout = dbc.Container(
90
  children = [
91
  dbc.Container(
92
- children = get_initial_upload_container(),
93
- id = "image-upload-container",
 
 
 
94
  class_name = "m-0 p-0 border border-dark"
95
  ),
96
  dcc.Store(
@@ -324,3 +327,8 @@ callback(
324
  Output("display-cc-filter-color-thresh", "children"),
325
  Input("select-cc-filter-color-thresh", "value")
326
  )(partial(display_slider_value, "Color Threshold"))
 
 
 
 
 
 
89
  layout = dbc.Container(
90
  children = [
91
  dbc.Container(
92
+ children = dcc.Loading(
93
+ children = get_initial_upload_container(),
94
+ id = "image-upload-container",
95
+ color = "black"
96
+ ),
97
  class_name = "m-0 p-0 border border-dark"
98
  ),
99
  dcc.Store(
 
327
  Output("display-cc-filter-color-thresh", "children"),
328
  Input("select-cc-filter-color-thresh", "value")
329
  )(partial(display_slider_value, "Color Threshold"))
330
+
331
+ callback(
332
+ Output("display-contour-color-thresh", "children"),
333
+ Input("select-contour-color-thresh", "value")
334
+ )(partial(display_slider_value, "Color Threshold"))
larvaecount/ui/ui_utils.py CHANGED
@@ -80,7 +80,7 @@ def get_cc_ui() -> dbc.Container:
80
  className = "w-50"
81
  ),
82
  html.H5(
83
- children = "Max Eggs (optional)",
84
  className = "text-start my-3 mt-3"
85
  ),
86
  dcc.Input(
@@ -127,7 +127,7 @@ def get_cc_filter_ui() -> dbc.Container:
127
  className = "w-50"
128
  ),
129
  html.H5(
130
- children = "Max Eggs (optional)",
131
  className = "text-start my-3 mt-3"
132
  ),
133
  dcc.Input(
@@ -136,7 +136,7 @@ def get_cc_filter_ui() -> dbc.Container:
136
  className = "w-50"
137
  ),
138
  html.H5(
139
- children = "Kernel Width",
140
  className = "text-start my-3"
141
  ),
142
  dcc.Input(
@@ -146,7 +146,7 @@ def get_cc_filter_ui() -> dbc.Container:
146
  className = "w-50"
147
  ),
148
  html.H5(
149
- children = "Kernel Height",
150
  className = "text-start my-3"
151
  ),
152
  dcc.Input(
@@ -194,7 +194,7 @@ def get_contour_ui() -> dbc.Container:
194
  className = "w-50"
195
  ),
196
  html.H5(
197
- children = "Max Eggs (optional)",
198
  className = "text-start my-3 mt-3"
199
  ),
200
  dcc.Input(
@@ -203,7 +203,7 @@ def get_contour_ui() -> dbc.Container:
203
  className = "w-50"
204
  ),
205
  html.H5(
206
- children = "Kernel Width",
207
  className = "text-start my-3"
208
  ),
209
  dcc.Input(
@@ -213,7 +213,7 @@ def get_contour_ui() -> dbc.Container:
213
  className = "w-50"
214
  ),
215
  html.H5(
216
- children = "Kernel Height",
217
  className = "text-start my-3"
218
  ),
219
  dcc.Input(
 
80
  className = "w-50"
81
  ),
82
  html.H5(
83
+ children = "Max Eggs Per Cluster (optional)",
84
  className = "text-start my-3 mt-3"
85
  ),
86
  dcc.Input(
 
127
  className = "w-50"
128
  ),
129
  html.H5(
130
+ children = "Max Eggs Per Cluster (optional)",
131
  className = "text-start my-3 mt-3"
132
  ),
133
  dcc.Input(
 
136
  className = "w-50"
137
  ),
138
  html.H5(
139
+ children = "Filter Kernel Width (Pixels)",
140
  className = "text-start my-3"
141
  ),
142
  dcc.Input(
 
146
  className = "w-50"
147
  ),
148
  html.H5(
149
+ children = "Filter Kernel Height (Pixels)",
150
  className = "text-start my-3"
151
  ),
152
  dcc.Input(
 
194
  className = "w-50"
195
  ),
196
  html.H5(
197
+ children = "Max Eggs Per Cluster (optional)",
198
  className = "text-start my-3 mt-3"
199
  ),
200
  dcc.Input(
 
203
  className = "w-50"
204
  ),
205
  html.H5(
206
+ children = "Filter Kernel Width (Pixels)",
207
  className = "text-start my-3"
208
  ),
209
  dcc.Input(
 
213
  className = "w-50"
214
  ),
215
  html.H5(
216
+ children = "Filter Kernel Height (Pixels)",
217
  className = "text-start my-3"
218
  ),
219
  dcc.Input(