Skip to content

Gmoccapy 3.4.2.1 #2383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hansu merged 16 commits into from
Mar 14, 2023
Merged

Gmoccapy 3.4.2.1 #2383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
523af2c
gmoccapy: saved with Glade 3.38 (no changes)
hansu Mar 4, 2023
ab9d865
gmoccapy: replace Gtk.Table "tbl_DRO" by Gtk.Grid
hansu Mar 4, 2023
33276ef
gmoccapy: replace Gtk.Table "tbl_jog_btn_axes" by Gtk.Grid
hansu Mar 4, 2023
cc040c2
gmoccapy: replace Gtk.Table "tbl_jog_btn_joints" by Gtk.Grid
hansu Mar 4, 2023
e082dfe
gmoccapy: replace Gtk.Table "tbl_gremlin_button" by Gtk.Grid
hansu Mar 4, 2023
3971765
gmoccapy: use CSS instead of override_background()
hansu Mar 4, 2023
d62ef36
iconview: set default path to "."
hansu Mar 5, 2023
403d34c
gmoccapy: sort icon themes to get 'classic' as default (first in the …
hansu Mar 5, 2023
e07f4a1
gmoccapy: some wrong settings in lathe configs
hansu Mar 5, 2023
df4df5c
gmoccapy: fix DRO size after changing in settings (#2374)
hansu Mar 7, 2023
161a622
gmoccapy: fix paths in non-trivial sample configs
hansu Mar 10, 2023
7bb500e
gmoccapy: replace all Gtk.VBoxes by Gtk.Box
hansu Mar 12, 2023
f401270
gmoccapy: replace all Gtk.HBoxes by Gtk.Box
hansu Mar 12, 2023
757afdf
gmoccapy: replace all Gtk{V|H}ButtonBoxes by GtkButtonBox
hansu Mar 12, 2023
5160710
gmoccapy: center jog buttons
hansu Mar 12, 2023
e2d136a
gmoccapy_3_4_2_1: updated changelog + some docs images
hansu Mar 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configs/sim/gmoccapy/lathe_configs/gmoccapy_lathe.pref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ offset_axis_r = 50.0
radius offset_axis_x = 0
use_toolmeasurement = False
kbd_height = 250
icon_theme = None
icon_theme = classic
hide_tooltips = False

2 changes: 1 addition & 1 deletion configs/sim/gmoccapy/lathe_configs/lathe.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ MAX_SPINDLE_OVERRIDE = 1.2
MIN_SPINDLE_OVERRIDE = .5

# Prefix to be used
PROGRAM_PREFIX = ../../nc_files/:.
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = linuxcnc.gif
Expand Down
2 changes: 1 addition & 1 deletion configs/sim/gmoccapy/lathe_configs/lathe_macros.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ MIN_SPINDLE_OVERRIDE = .5


# Prefix to be used
PROGRAM_PREFIX = ../../nc_files/:./
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = linuxcnc.gif
Expand Down
2 changes: 1 addition & 1 deletion configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ DISPLAY = gmoccapy
CYCLE_TIME = 0.200
POSITION_OFFSET = RELATIVE
POSITION_FEEDBACK = ACTUAL
PROGRAM_PREFIX = ../../nc_files/
PROGRAM_PREFIX = ../../../nc_files/
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

Expand Down
2 changes: 1 addition & 1 deletion configs/sim/gmoccapy/non_trivial_kinematics/scara/scara.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CYCLE_TIME = 0.200
POSITION_OFFSET = RELATIVE
POSITION_FEEDBACK = ACTUAL
MAX_FEED_OVERRIDE = 2.0
PROGRAM_PREFIX = ../../nc_files/
PROGRAM_PREFIX = ../../../nc_files/
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5
MIN_SPINDLE_OVERRIDE = 0.25
Expand Down
2 changes: 1 addition & 1 deletion configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ DISPLAY = gmoccapy
POSITION_OFFSET = RELATIVE
POSITION_FEEDBACK = ACTUAL
MAX_FEED_OVERRIDE = 2
PROGRAM_PREFIX = ../../nc_files
PROGRAM_PREFIX = ../../../nc_files
INTRO_GRAPHIC = emc2.gif
INTRO_TIME = 1

Expand Down
Binary file modified docs/src/gui/images/gmoccapy_3_axis.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/src/gui/images/gmoccapy_3_axis_mid.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/src/gui/images/gmoccapy_5_axis.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/src/gui/images/gmoccapy_5_axis_mid.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions lib/python/gladevcp/iconview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class IconFileSelection(Gtk.Box):
'icon_size' : (GObject.TYPE_INT, 'Icon Size', 'Sets the size of the displayed icon',
12, 96, 48, GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT),
'start_dir' : (GObject.TYPE_STRING, 'start directory', 'Sets the directory to start in',
"/", GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT),
".", GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT),
'jump_to_dir' : (GObject.TYPE_STRING, 'jump to directory', 'Sets the directory to jump to ',
"~", GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT),
'filetypes' : (GObject.TYPE_STRING, 'file filter', 'Sets the filter for the file types to be shown',
Expand Down Expand Up @@ -298,9 +298,6 @@ def _fill_store(self):
number = 0
dirs = []
files = []
# TODO: Why is iconview looking in "/" ?
# if self.cur_dir == "/":
# LOG.info("current dir is /")

for fl in os.listdir(self.cur_dir):
# we don't want to add hidden files
Expand Down
Loading