Skip to content

Commit 21782d0

Browse files
committed
fixed orientation of pages
1 parent a64853e commit 21782d0

2 files changed

Lines changed: 32 additions & 31 deletions

File tree

app_magicscan/main.py

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,9 @@ def __init__(self, idx_files):
208208

209209
# Add radio button group for state loading options
210210
self.state_option = pn.widgets.RadioButtonGroup(
211-
name='Load Option',
212-
options=['Load New State', 'Load Last State'],
213-
value='Load New State',
211+
name='',
212+
options=['Load New View', 'Load Last View'],
213+
value='Load New View',
214214
button_type='default',
215215
orientation='horizontal'
216216
)
@@ -261,15 +261,15 @@ def __init__(self, idx_files):
261261

262262
# Left column: Checkboxes selection
263263
left_column = pn.Column(
264-
pn.Row(self.selection_title,self.state_option,self.load_button),
264+
265+
pn.Row(self.selection_title,"###### Load Options",self.state_option,self.load_button),
265266
pn.Row(self.checkboxes_container),
266-
width=950,
267+
width=1050,
267268
sizing_mode='stretch_height',
268269
)
269270

270271
# Right column: Load options and button
271272
right_column = pn.Column(
272-
"## Load Options",
273273
self._create_dashboard_notices_panel(),
274274
pn.Spacer(height=20),
275275
self.notes_panel_container,
@@ -914,7 +914,7 @@ def delayed_restore():
914914
else:
915915
logger.info(f"ℹ No saved state found for {Path(path).parent.name}")
916916
else:
917-
logger.info(f">>> Skipping state restoration (Load New State selected)")
917+
logger.info(f">>> Skipping state restoration (Load New View selected)")
918918

919919
# Setup periodic state saving by hooking into canvas events
920920
self._setup_auto_save(slc, tracker)
@@ -1033,7 +1033,7 @@ def on_ink_area_toggle(event):
10331033
visible=False,
10341034
styles={
10351035
"position": "absolute",
1036-
"left": "16px",
1036+
"right": "16px",
10371037
"top": "16px",
10381038
"zIndex": "50",
10391039
"background": "white",
@@ -1272,30 +1272,24 @@ def on_redo_click(event):
12721272
sizing_mode="stretch_width"
12731273
),
12741274
pn.Row(
1275-
overview_btn,
1276-
pn.Spacer(width=30),
1277-
# Live Tracking controls
1278-
pn.pane.Markdown("**Live:**", sizing_mode="fixed", width=50),
1279-
undo_btn,
1280-
pn.Spacer(width=5),
1281-
redo_btn,
1282-
pn.Spacer(width=30),
1283-
# Saved States controls
1284-
pn.pane.Markdown("**Saved:**", sizing_mode="fixed", width=50),
1285-
load_prev_btn,
1286-
pn.Spacer(width=5),
1287-
save_state_btn,
1288-
pn.Spacer(width=5),
1289-
load_next_btn,
1290-
pn.Spacer(width=30),
12911275
# Line drawing controls
12921276
pn.pane.Markdown("**Draw:**", sizing_mode="fixed", width=45),
12931277
line_thickness_slider if line_thickness_slider else pn.Spacer(width=0),
12941278
pn.Spacer(width=10),
12951279
line_color_selector if line_color_selector else pn.Spacer(width=0),
12961280
pn.Spacer(width=10),
12971281
clear_drawings_btn if clear_drawings_btn else pn.Spacer(width=0),
1298-
pn.Spacer(),
1282+
pn.Spacer(width=30),
1283+
# Live Tracking controls
1284+
pn.pane.Markdown("**Live:**", sizing_mode="fixed", width=50),
1285+
undo_btn,
1286+
pn.Spacer(width=5),
1287+
redo_btn,
1288+
pn.Spacer(width=30),
1289+
# Saved States controls
1290+
pn.layout.HSpacer(),
1291+
1292+
overview_btn,
12991293
sizing_mode="stretch_width"
13001294
),
13011295
pn.Row(
@@ -1305,9 +1299,17 @@ def on_redo_click(event):
13051299
sizing_mode="stretch_both"
13061300
),
13071301
pn.Row(
1308-
pn.layout.HSpacer(),
1302+
1303+
pn.pane.Markdown("**Saved:**", sizing_mode="fixed", width=50),
1304+
load_prev_btn,
1305+
pn.Spacer(width=5),
1306+
save_state_btn,
1307+
pn.Spacer(width=5),
1308+
load_next_btn,
1309+
pn.Spacer(width=30),
1310+
#pn.layout.HSpacer(),
13091311
captions[0],
1310-
pn.layout.HSpacer(),
1312+
#pn.layout.HSpacer(),
13111313
align="center",
13121314
sizing_mode="stretch_width"
13131315
),
@@ -2236,6 +2238,8 @@ def back_to_selection(self, event):
22362238
"""
22372239
pn.extension(raw_css=[custom_css])
22382240

2241+
2242+
22392243
# Resolve dataset paths: prefer API if provided, else CLI args
22402244
api_url = os.environ.get("MAGICSCAN_API_URL")
22412245
paths = []

src/openvisuspy/slice.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,11 @@ def createFigure(self):
171171
#self.fig=bokeh.plotting.figure(tools=[self.pan_tool,self.reset_fig,self.wheel_zoom_tool,self.box_zoom_tool,self.save_tool])
172172

173173
self.fig=bokeh.plotting.figure(tools=[self.pan_tool,self.wheel_zoom_tool,self.save_tool])
174-
self.fig.toolbar_location= "right" # "above", "below", "right", "left"
174+
self.fig.toolbar_location= "left" # "above", "below", "right", "left"
175175
self.fig.axis.visible = False
176176
self.fig.grid.visible = False
177177
else:
178178
self.fig=bokeh.plotting.figure(tools=[self.pan_tool,self.reset_fig,self.wheel_zoom_tool,self.box_select_tool,self.box_zoom_tool])
179-
180-
181-
182179

183180
self.fig.toolbar.active_scroll = self.wheel_zoom_tool
184181
self.fig.toolbar.active_drag = self.pan_tool

0 commit comments

Comments
 (0)