Skip to content

Python 3 and some Glyphs 3 API #2

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

Open
schriftgestalt wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Python 3 and some Glyphs 3 API #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
feb4f9a
update plugin structure
schriftgestalt Jun 5, 2020
5eba65d
Python 3 and some Glyphs 3 API
schriftgestalt Jun 5, 2020
81cabee
update plugin structure
schriftgestalt Dec 20, 2020
aa07f45
update plugin binary
schriftgestalt Feb 12, 2021
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
22 changes: 4 additions & 18 deletions Plugins/HOI Viewer.glyphsReporter/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDisplayName</key>
<string>HOI Viewer</string>
<string>en</string>
<key>CFBundleExecutable</key>
<string>plugin</string>
<key>CFBundleIdentifier</key>
Expand All @@ -14,25 +12,13 @@
<string>6.0</string>
<key>CFBundleName</key>
<string>HOI Viewer</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>UpdateFeedURL</key>
<string>____OnlineUrlToThisPlist____</string>
<key>productPageURL</key>
<string>____ProductPageURL____</string>
<key>productReleaseNotes</key>
<string>____LatestReleaseNotes____</string>
<string>1.0.1</string>
<key>CFBundleVersion</key>
<string>3</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright, Michael LaGattuta, 2018</string>
<key>NSPrincipalClass</key>
<string>viewHOI</string>
<key>PyMainFileNames</key>
<array>
<string>../MacOS/main.py</string>
</array>
</dict>
</plist>
16 changes: 0 additions & 16 deletions Plugins/HOI Viewer.glyphsReporter/Contents/MacOS/main.py
View file
Open in desktop

This file was deleted.

Binary file modified Plugins/HOI Viewer.glyphsReporter/Contents/MacOS/plugin
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion Plugins/HOI Viewer.glyphsReporter/Contents/PkgInfo
View file
Open in desktop

This file was deleted.

143 changes: 61 additions & 82 deletions Plugins/HOI Viewer.glyphsReporter/Contents/Resources/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#
###########################################################################################################

from __future__ import print_function
import objc
import GlyphsApp
from GlyphsApp import *
Expand All @@ -19,6 +20,12 @@
import time
import re

glyphsVersion = Glyphs.buildNumber
def getAxisName(axis):
if glyphsVersion > 3000:
return axis.name
return axis["Name"]

class viewHOI(ReporterPlugin):
# The dialog view (e.g., panel or window)
# TODO: currently this is a right click context menu but may make more sense as a persistent window
Expand Down Expand Up @@ -78,45 +85,23 @@ class viewHOI(ReporterPlugin):

# Set up variables for the name of each axis "axis" + "#" starting from 1
# Also makes variables for Min and Max values
@objc.python_method
def makeAxisVariables(self, font, iterAxes):
for i in iterAxes:
globals()['axis%s' % (i + 1)] = font.axes[i]["Name"]
globals()['axis%s' % (i + 1)] = getAxisName(font.axes[i])
globals()['axis%sMin' % (i + 1)] = 100000.0
globals()['axis%sMax' % (i + 1)] = -100000.0

@objc.python_method
def checkMasters(self, font, axis, index):
for master in font.masters:
if index == 0:
if master.weightValue < globals()['axis%sMin' % (index + 1)]:
globals()['axis%sMin' % (index + 1)] = master.weightValue
if master.weightValue > globals()['axis%sMax' % (index + 1)]:
globals()['axis%sMax' % (index + 1)] = master.weightValue
elif index == 1:
if master.widthValue < globals()['axis%sMin' % (index + 1)]:
globals()['axis%sMin' % (index + 1)] = master.widthValue
if master.widthValue > globals()['axis%sMax' % (index + 1)]:
globals()['axis%sMax' % (index + 1)] = master.widthValue
elif index == 2:
if master.customValue < globals()['axis%sMin' % (index + 1)]:
globals()['axis%sMin' % (index + 1)] = master.customValue
if master.customValue > globals()['axis%sMax' % (index + 1)]:
globals()['axis%sMax' % (index + 1)] = master.customValue
elif index == 3:
if master.customValue1 < globals()['axis%sMin' % (index + 1)]:
globals()['axis%sMin' % (index + 1)] = master.customValue1
if master.customValue1 > globals()['axis%sMax' % (index + 1)]:
globals()['axis%sMax' % (index + 1)] = master.customValue1
elif index == 4:
if master.customValue2 < globals()['axis%sMin' % (index + 1)]:
globals()['axis%sMin' % (index + 1)] = master.customValue2
if master.customValue2 > globals()['axis%sMax' % (index + 1)]:
globals()['axis%sMax' % (index + 1)] = master.customValue2
elif index == 5:
if master.customValue3 < globals()['axis%sMin' % (index + 1)]:
globals()['axis%sMin' % (index + 1)] = master.customValue3
if master.customValue3 > globals()['axis%sMax' % (index + 1)]:
globals()['axis%sMax' % (index + 1)] = master.customValue3

axisValue = master.axes[index]
if axisValue < globals()['axis%sMin' % (index + 1)]:
globals()['axis%sMin' % (index + 1)] = axisValue
if axisValue > globals()['axis%sMax' % (index + 1)]:
globals()['axis%sMax' % (index + 1)] = axisValue

@objc.python_method
def checkVirtualMasters(self, font, axis, index):
for parameter in font.customParameters:
if parameter.name == "Virtual Master":
Expand All @@ -128,60 +113,50 @@ def checkVirtualMasters(self, font, axis, index):
globals()['axis%sMax' % (index + 1)] = float(item["Location"])

# Can maybe truncate this
@objc.python_method
def setAxisExtremes(self, font, iterAxes):
for i in iterAxes:
# Set axis values
self.checkMasters(font, globals()['axis%s' % (i + 1)], i)
self.checkVirtualMasters(font, globals()['axis%s' % (i + 1)], i)


minValue = globals()['axis%sMin' % (i + 1)]
maxValue = globals()['axis%sMax' % (i + 1)]
# Set slider values
if i == 0:
self.slider1.setMinValue_(globals()['axis%sMin' % (i + 1)])
self.slider1.setMaxValue_(globals()['axis%sMax' % (i + 1)])
print font.axes[i]["Name"]
print globals()['axis%sMin' % (i + 1)]
print globals()['axis%sMax' % (i + 1)]
self.slider1.setMinValue_(minValue)
self.slider1.setMaxValue_(maxValue)
elif i == 1:
self.slider2.setMinValue_(globals()['axis%sMin' % (i + 1)])
self.slider2.setMaxValue_(globals()['axis%sMax' % (i + 1)])
print font.axes[i]["Name"]
print globals()['axis%sMin' % (i + 1)]
print globals()['axis%sMax' % (i + 1)]
self.slider2.setMinValue_(minValue)
self.slider2.setMaxValue_(maxValue)
elif i == 2:
self.slider3.setMinValue_(globals()['axis%sMin' % (i + 1)])
self.slider3.setMaxValue_(globals()['axis%sMax' % (i + 1)])
print font.axes[i]["Name"]
print globals()['axis%sMin' % (i + 1)]
print globals()['axis%sMax' % (i + 1)]
self.slider3.setMinValue_(minValue)
self.slider3.setMaxValue_(maxValue)
elif i == 3:
self.slider4.setMinValue_(globals()['axis%sMin' % (i + 1)])
self.slider4.setMaxValue_(globals()['axis%sMax' % (i + 1)])
print font.axes[i]["Name"]
print globals()['axis%sMin' % (i + 1)]
print globals()['axis%sMax' % (i + 1)]
self.slider4.setMinValue_(minValue)
self.slider4.setMaxValue_(maxValue)
elif i == 4:
self.slider5.setMinValue_(globals()['axis%sMin' % (i + 1)])
self.slider5.setMaxValue_(globals()['axis%sMax' % (i + 1)])
print font.axes[i]["Name"]
print globals()['axis%sMin' % (i + 1)]
print globals()['axis%sMax' % (i + 1)]
self.slider5.setMinValue_(minValue)
self.slider5.setMaxValue_(maxValue)
elif i == 5:
self.slider6.setMinValue_(globals()['axis%sMin' % (i + 1)])
self.slider6.setMaxValue_(globals()['axis%sMax' % (i + 1)])
print font.axes[i]["Name"]
print globals()['axis%sMin' % (i + 1)]
print globals()['axis%sMax' % (i + 1)]
self.slider6.setMinValue_(minValue)
self.slider6.setMaxValue_(maxValue)
print(getAxisName(font.axes[i]))
print(minValue)
print(maxValue)

@objc.python_method
def settings(self):
# Load .nib file next to plugin.py
self.loadNib("sliderView", __file__)
self.menuName = Glyphs.localize({'en': u'HOI Viewer', 'de': u'Mein Plugin'})
self.menuName = Glyphs.localize({'en': u'HOI Viewer'})
# Load slider view as a right-click context menu
self.generalContextMenus = [{'name': 'HOI Viewer', 'view': self.sliderView}]

# Updates the temp instance and the drawings based on the sliders
# DONE: Figure out how to pull the state of the check boxes and then set values equal based on it
# TODO: use a dictionary to link axes rather than iterating through them
@objc.python_method
def sliderUpdate(self):
sliderList = [self.slider1, self.slider2, self.slider3, self.slider4, self.slider5, self.slider6]
keySlider = None
Expand Down Expand Up @@ -298,6 +273,7 @@ def sync6_(self, sender):
globals()['check6'] = True

# generate nodes on canvas
@objc.python_method
def roundDotForPoint( self, thisPoint, markerWidth ):
"""
from Show Angled Handles by MekkaBlue
Expand All @@ -307,6 +283,7 @@ def roundDotForPoint( self, thisPoint, markerWidth ):
return NSBezierPath.bezierPathWithOvalInRect_(myRect)

# If nodes are stacked calculate using the next node
@objc.python_method
def getDelta(self, node, node2, previous):
if previous == True:
previous = True
Expand All @@ -325,6 +302,7 @@ def getDelta(self, node, node2, previous):
return [dx, dy]

# Node color changes based on angle (change the 'angleTolerance' variable)
@objc.python_method
def nodeColor(self, nodePrev, node, nodeNext):
deltaPrev = self.getDelta(node, nodePrev, True)
deltaNext = self.getDelta(node, nodeNext, False)
Expand Down Expand Up @@ -361,6 +339,7 @@ def nodeColor(self, nodePrev, node, nodeNext):
# These functions are currently not being used...too slow
# TODO: make currentGlyph a class variable rather than a local one
# TODO: find a way to keep HOI layers in sync
@objc.python_method
def getFullName(self, layerName):
currentGlyph = Glyphs.font.selectedLayers[0].parent

Expand All @@ -370,7 +349,8 @@ def getFullName(self, layerName):

# Sync everything to the primary control masters V2
# needs to work with more paths*****
def syncToControl(self, aName, cName, dName, bName, hoiName):
@objc.python_method
def syncToControl(self, aName, cName, dName, bName, hoiName):
currentGlyph = Glyphs.font.selectedLayers[0].parent

c2Name = self.getFullName(re.sub("\d", "2", cName))
Expand All @@ -397,6 +377,7 @@ def syncToControl(self, aName, cName, dName, bName, hoiName):

# Sync everything to the respective HOI layer V2
# needs to work with more paths*****
@objc.python_method
def syncToHOI(self, aName, cName, dName, bName, hoiName):
currentGlyph = Glyphs.font.selectedLayers[0].parent

Expand Down Expand Up @@ -426,6 +407,7 @@ def syncToHOI(self, aName, cName, dName, bName, hoiName):

# TODO: Preview axis should have separate checkboxes than syncing axes
# TODO: Preview should be based on the min and max value of each axis
@objc.python_method
def showAll(self, layer, currentGlyphName, pathIndex, interpolatedIndex, nodeScale, futureFontLayer):
x2 = futureFontLayer.paths[pathIndex].nodes[interpolatedIndex].x
y2 = futureFontLayer.paths[pathIndex].nodes[interpolatedIndex].y
Expand Down Expand Up @@ -454,8 +436,9 @@ def showAll(self, layer, currentGlyphName, pathIndex, interpolatedIndex, nodeSca
pNode.fill()

# MAYBE change this to background instead
@objc.python_method
def background(self, layer):
print "Start BG Draw"
print("Start BG Draw")
start = time.time()
currentGlyphName = layer.parent.name
masterLayer = layer.parent.layers[layer.associatedMasterId]
Expand All @@ -473,19 +456,14 @@ def background(self, layer):

# MAYBE move this to a method and store in a variable with all the relevant axes values
startInstance = time.time()
tempInstance = self.font.instances[0].copy()
tempInstance = GSInstance()
tempInstance.setFont_(self.font)
tempInstance.name = "tempInstance"
tempInstance.weightValue = axis1Value
tempInstance.widthValue = axis2Value
tempInstance.customValue = axis3Value
tempInstance.setInterpolationCustom1_(axis4Value)
tempInstance.setInterpolationCustom3_(axis6Value)
tempInstance.setInterpolationCustom2_(axis5Value + 1)
tempInstance.setInterpolationCustom2_(axis5Value)
tempInstance.axes = [axis1Value, axis2Value, axis3Value, axis4Value, axis6Value, axis5Value + 1, axis5Value]

tempFontLayer = tempInstance.interpolatedFontProxy.glyphs[currentGlyphName].layers[0]
endInstance = time.time() - startInstance
print "Copy + Update Instance Time:", endInstance
print("Copy + Update Instance Time:", endInstance)

if self.showFuture == True:
previewProxies = []
Expand All @@ -510,14 +488,14 @@ def background(self, layer):
increment = (globals()['axis%sMax' % (i + 1)] - globals()['axis%sMin' % (i + 1)]) / resolution

# If this can be faster, then the range can be more to show smaller increments, or show more points at once
print "Making Preview Proxies"
print("Making Preview Proxies")
startProxies = time.time()
for i in range(resolution):
try:
plotPoint = previewMin + (i * increment)
preview.update({"preview": plotPoint})
except:
print "No axis set to preview"
print("No axis set to preview")

futureTempInstance.weightValue = preview[preview["axis1"]]
futureTempInstance.widthValue = preview[preview["axis2"]]
Expand All @@ -530,7 +508,7 @@ def background(self, layer):
futureFontLayer = futureTempInstance.interpolatedFontProxy.glyphs[currentGlyphName].layers[0]

previewProxies.append(futureFontLayer)
print "Finished Making Proxies", time.time() - startProxies
print("Finished Making Proxies", time.time() - startProxies)

# TODO: find a way to implement this in the foreground draw nodes loop. Should make it slightly faster
# def glyphPreview(self, masterLayer, pathIndex, node, tempFontLayer, tSub):
Expand Down Expand Up @@ -604,7 +582,7 @@ def background(self, layer):

t.fill()
endVarPrev = time.time()
print "Draw Var Preview Time:", time.time() - startVarPrev
print("Draw Var Preview Time:", time.time() - startVarPrev)

# currentState = layer.paths[0]
# Adding a state variable and an if statement makes this not as responsive as I'd like
Expand Down Expand Up @@ -669,7 +647,7 @@ def background(self, layer):
drawFuture = time.time()
for proxy in previewProxies:
self.showAll(layer, currentGlyphName, pathIndex, interpolatedIndex, nodeScale, proxy)
print "Drew Future %s" % (time.time() - drawFuture)
print("Drew Future %s" % (time.time() - drawFuture))

# FUTURE block ————————————————————————————————————————————————————————————

Expand Down Expand Up @@ -722,7 +700,7 @@ def background(self, layer):
drawFuture = time.time()
for proxy in previewProxies:
self.showAll(layer, currentGlyphName, pathIndex, interpolatedIndex, nodeScale, proxy)
print "Drew Future %s" % (time.time() - drawFuture)
print("Drew Future %s" % (time.time() - drawFuture))

# FUTURE block ————————————————————————————————————————————————————————————

Expand Down Expand Up @@ -752,8 +730,9 @@ def background(self, layer):
p.stroke()

end = time.time()
print end - start
print(end - start)

@objc.python_method
def __file__(self):
"""Please leave this method unchanged"""
return __file__
Loading