diff options
Diffstat (limited to 'graphics/asymptote/GUI')
-rw-r--r-- | graphics/asymptote/GUI/Window1.py | 12 | ||||
-rw-r--r-- | graphics/asymptote/GUI/requirements.txt | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/graphics/asymptote/GUI/Window1.py b/graphics/asymptote/GUI/Window1.py index 134d3cd196..3da918ff6c 100644 --- a/graphics/asymptote/GUI/Window1.py +++ b/graphics/asymptote/GUI/Window1.py @@ -1060,9 +1060,10 @@ class MainWindow1(Qw.QMainWindow): for item in xasyObjects['objects']: key=item['transfKey'] - if(key) in obj.transfKeymap.keys(): - continue - obj.maxKey=max(obj.maxKey,int(key)) + if existsAsy: + if(key) in obj.transfKeymap.keys(): + continue + obj.maxKey=max(obj.maxKey,int(key)) if item['type'] == 'xasyScript': print("Uh oh, there should not be any asy objects loaded") @@ -1083,7 +1084,8 @@ class MainWindow1(Qw.QMainWindow): print("ERROR") self.asy2psmap = x2a.asyTransform(xasyObjects['asy2psmap']) - self.globalObjectCounter = obj.maxKey+1 + if existsAsy: + self.globalObjectCounter = obj.maxKey+1 self.asyfyCanvas() @@ -2046,7 +2048,7 @@ class MainWindow1(Qw.QMainWindow): with Qg.QPainter(self.postCanvasPixmap) as postCanvas: postCanvas.setRenderHints(self.mainCanvas.renderHints()) postCanvas.setTransform(self.getScrsTransform()) - # self.makePenCosmetic(postCanvas) + self.makePenCosmetic(postCanvas) self.drawTransformPreview(postCanvas) diff --git a/graphics/asymptote/GUI/requirements.txt b/graphics/asymptote/GUI/requirements.txt index b319223a3c..6e0a44196a 100644 --- a/graphics/asymptote/GUI/requirements.txt +++ b/graphics/asymptote/GUI/requirements.txt @@ -1,4 +1,4 @@ -numpy==1.21.0 +numpy==1.22.0 cson==0.7 PyQt5==5.11 rsvg-convert==2.42.3 |