Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions conda/environment.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: mtg_dev
channels:
- openalea3/label/dev
- openalea3/label/rc
- openalea3
- conda-forge

Expand Down
1 change: 0 additions & 1 deletion conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ build:
noarch: python
number: 0
preserve_egg_dir: True
string: py{{ PY_VER }}
script:
- {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv

Expand Down
14 changes: 7 additions & 7 deletions src/openalea/mtg/gui/mtg_editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,15 @@ def notify_edge_removals(self, edges):
##############################################
# -- The graphical part of the MTG editor -- #
##############################################
from PyQt4 import QtGui, QtCore
from qtpy import QtGui, QtCore, QtWidgets

class Vertex( qt.DefaultGraphicalVertex ):
max_scale = 6

def __init__(self, *args, **kwargs):
qt.DefaultGraphicalVertex.__init__(self, *args, **kwargs)
self.setFlag(QtGui.QGraphicsItem.ItemIsFocusable, True)
self._label = QtGui.QGraphicsSimpleTextItem(self)
self.setFlag(QtWidgets.QGraphicsItem.ItemIsFocusable, True)
self._label = QtWidgets.QGraphicsSimpleTextItem(self)

def _mtg(self):
return self.graph().graph
Expand Down Expand Up @@ -401,10 +401,10 @@ def initialise_graph_view_from_model(graphView, graphModel):
from random import randint as rint

#THE APPLICATION'S MAIN WINDOW
class MainWindow(QtGui.QMainWindow):
class MainWindow(QtWidgets.QMainWindow):
def __init__(self, parent=None):
""" """
QtGui.QMainWindow.__init__(self, parent)
QtWidgets.QMainWindow.__init__(self, parent)

self.setMinimumSize(800,600)
self.__graph = ObservableMTG()
Expand All @@ -413,8 +413,8 @@ def __init__(self, parent=None):
self.setCentralWidget(self.__graphView)


app = QtGui.QApplication(["GraphEditor and Mtg test"])
QtGui.QApplication.processEvents()
app = QtWidgets.QApplication(["GraphEditor and Mtg test"])
QtWidgets.QApplication.processEvents()
w = MainWindow()
w.show()
app.exec_()
Expand Down
2 changes: 1 addition & 1 deletion src/openalea/mtg_wralea/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from openalea.visualea.node_widget import NodeWidget
from openalea.mtg.gui.mtg_editor import GraphicalMtgFactory, ObservableMTG

from PyQt4 import QtGui
from qtpy import QtGui

class MTGEditor(QtGui.QWidget, NodeWidget):
def __init__(self, node, parent):
Expand Down
Loading