diff --git a/bin/.gitkeep b/bin/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/lib/jdom-2.0.4.jar b/lib/jdom-2.0.4.jar deleted file mode 100644 index 19cafb8..0000000 Binary files a/lib/jdom-2.0.4.jar and /dev/null differ diff --git a/lib/jdom2-2.0.6.1.jar b/lib/jdom2-2.0.6.1.jar new file mode 100644 index 0000000..da95839 Binary files /dev/null and b/lib/jdom2-2.0.6.1.jar differ diff --git a/lib/linux32/qtjambi-4.7.0.jar b/lib/linux32/qtjambi-4.7.0.jar deleted file mode 100644 index 26a8ea3..0000000 Binary files a/lib/linux32/qtjambi-4.7.0.jar and /dev/null differ diff --git a/lib/linux32/qtjambi-util-4.7.0.jar b/lib/linux32/qtjambi-util-4.7.0.jar deleted file mode 100644 index 186323c..0000000 Binary files a/lib/linux32/qtjambi-util-4.7.0.jar and /dev/null differ diff --git a/lib/linux64/qtjambi-4.7.0.jar b/lib/linux64/qtjambi-4.7.0.jar deleted file mode 100644 index 207ac48..0000000 Binary files a/lib/linux64/qtjambi-4.7.0.jar and /dev/null differ diff --git a/lib/linux64/qtjambi-linux64-gcc-4.7.0.jar b/lib/linux64/qtjambi-linux64-gcc-4.7.0.jar deleted file mode 100644 index 3c375e9..0000000 Binary files a/lib/linux64/qtjambi-linux64-gcc-4.7.0.jar and /dev/null differ diff --git a/lib/linux32/qtjambi-linux32-gcc-4.7.0.jar b/lib/linux64/qtjambi-native-linux-x64-6.4.2.jar similarity index 69% rename from lib/linux32/qtjambi-linux32-gcc-4.7.0.jar rename to lib/linux64/qtjambi-native-linux-x64-6.4.2.jar index 41c1cac..7368e54 100644 Binary files a/lib/linux32/qtjambi-linux32-gcc-4.7.0.jar and b/lib/linux64/qtjambi-native-linux-x64-6.4.2.jar differ diff --git a/lib/linux64/qtjambi-util-4.7.0.jar b/lib/linux64/qtjambi-util-4.7.0.jar deleted file mode 100644 index ba06f44..0000000 Binary files a/lib/linux64/qtjambi-util-4.7.0.jar and /dev/null differ diff --git a/lib/mac/qtjambi-4.7.0.jar b/lib/mac/qtjambi-4.7.0.jar deleted file mode 100644 index 06a403e..0000000 Binary files a/lib/mac/qtjambi-4.7.0.jar and /dev/null differ diff --git a/lib/mac/qtjambi-macosx-gcc-4.7.0.jar b/lib/mac/qtjambi-native-macos-6.4.2.jar similarity index 63% rename from lib/mac/qtjambi-macosx-gcc-4.7.0.jar rename to lib/mac/qtjambi-native-macos-6.4.2.jar index 0968aa6..a7e35bd 100644 Binary files a/lib/mac/qtjambi-macosx-gcc-4.7.0.jar and b/lib/mac/qtjambi-native-macos-6.4.2.jar differ diff --git a/lib/mac/qtjambi-util-4.7.0.jar b/lib/mac/qtjambi-util-4.7.0.jar deleted file mode 100644 index 4c3cdd3..0000000 Binary files a/lib/mac/qtjambi-util-4.7.0.jar and /dev/null differ diff --git a/lib/mac/version.txt b/lib/mac/version.txt deleted file mode 100644 index b3c95bf..0000000 --- a/lib/mac/version.txt +++ /dev/null @@ -1 +0,0 @@ -this is really version 4.8.5, compiled by JH, then renamed. for i386 and ppc diff --git a/lib/qtjambi-6.4.2.jar b/lib/qtjambi-6.4.2.jar new file mode 100644 index 0000000..cbdda3b Binary files /dev/null and b/lib/qtjambi-6.4.2.jar differ diff --git a/lib/vecmath-1.5.2.jar b/lib/vecmath-1.5.2.jar new file mode 100644 index 0000000..55fc163 Binary files /dev/null and b/lib/vecmath-1.5.2.jar differ diff --git a/lib/vecmath.jar b/lib/vecmath.jar deleted file mode 100644 index 6d8b3a1..0000000 Binary files a/lib/vecmath.jar and /dev/null differ diff --git a/lib/win32/qtjambi-4.7.1.jar b/lib/win32/qtjambi-4.7.1.jar deleted file mode 100644 index c2df0da..0000000 Binary files a/lib/win32/qtjambi-4.7.1.jar and /dev/null differ diff --git a/lib/win32/qtjambi-win32-msvc2008-4.7.1.jar b/lib/win32/qtjambi-win32-msvc2008-4.7.1.jar deleted file mode 100644 index 7b065d3..0000000 Binary files a/lib/win32/qtjambi-win32-msvc2008-4.7.1.jar and /dev/null differ diff --git a/lib/win64/qtjambi-native-windows-x64-6.4.2.jar b/lib/win64/qtjambi-native-windows-x64-6.4.2.jar new file mode 100644 index 0000000..90fdf4c Binary files /dev/null and b/lib/win64/qtjambi-native-windows-x64-6.4.2.jar differ diff --git a/lib/win32/zDriverAdapter.dll b/lib/win64/zDriverAdapter.dll similarity index 100% rename from lib/win32/zDriverAdapter.dll rename to lib/win64/zDriverAdapter.dll diff --git a/src/MANIFEST.STARTQTCLIENT b/src/MANIFEST.STARTQTCLIENT index 08535a9..d833773 100755 --- a/src/MANIFEST.STARTQTCLIENT +++ b/src/MANIFEST.STARTQTCLIENT @@ -1,8 +1,8 @@ -Main-Class: facsanadu.gui.MainWindow -Manifest-Version: 1.0 -Class-Path: jdom-2.0.4.jar qtjambi-4.6.3.jar qtjambi-macosx-gcc-4.6.3 - .jar qtjambi-util-4.6.3.jar qtjambi-win32-msvc2005-4.6.3.jar qtjambi-4 - .7.0.jar qtjambi-linux32-gcc-4.7.0.jar qtjambi-linux64-gcc-4.7.0.jar q - tjambi-util-4.7.0.jar qtjambi-macosx-gcc-4.7.0.jar qtjambi-linux64-gcc - -4.6.3.jar qtjambi-4.7.1.jar qtjambi-win32-msvc2008-4.7.1.jar vecmath. - jar +Manifest-Version: 1.0 +Main-Class: facsanadu.gui.MainWindow +Class-Path: jdom2-2.0.6.jar qtjambi-6.4.2.jar qtjambi-native-linux-x64-6 + .4.2.jar qtjambi-native-macos-6.4.2.jar qtjambi-native-windows-x64-6.4. + 2.jar vecmath-1.5.2.jar + + + diff --git a/src/Makefile b/src/Makefile index e0fd822..7205d24 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ all: - javac -d ../bin \ - -cp ../lib/jdom-2.0.4.jar:../lib/linux64/qtjambi-4.7.0.jar:../lib/linux64/qtjambi-linux64-gcc-4.7.0.jar:../lib/linux64/qtjambi-util-4.7.0.jar:../lib/vecmath.jar \ + javac -Xlint:deprecation -Xdiags:verbose -d ../bin \ + -cp ../lib/jdom2-2.0.6.1.jar:../lib/qtjambi-6.4.2.jar:../lib/linux64/qtjambi-native-linux64-6.4.2.jar:../lib/vecmath-1.5.2.jar \ */*/*java \ */*/*/*java \ */*/*/*/*java @@ -21,11 +21,17 @@ jars: */*/*/*.txt \ */*/*/*.png +clean: + rm -rf ../bin/facsanadu + rm -rf ../bin/port + rm ../facsanadu.jar + rm -rf ../release + ############################################################################################ ############################ osx ########################################################### ############################################################################################ -macport: jars +macport: all jars rm -Rf ../release/mac cp -r ../ports/mac ../release/mac cp ../facsanadu.jar ../lib/*jar ../lib/mac/*.jar ../release/mac/FACSanadu.app/ @@ -37,26 +43,20 @@ macport: jars ############################ linux ######################################################### ############################################################################################ -ubuntuport: jars +ubuntuport: all jars sudo rm -f ../release/facsanadu*deb cd ..; sudo java -cp bin port.ubuntu.Main sudo mv ../release/facsanadu*deb ../release/facsanadu.deb -linuxport32: jars - mkdir -p ../release/linux32 - rm -Rf ../release/linux32/facsanadu - cd ..; cp -r ports/linux release/linux32/facsanadu - cd ..; cp -r facsanadu.jar lib/*jar lib/linux32/*jar release/linux32/facsanadu/ - #cp translations/* ../release/linux32/facsanadu/translations/ -linuxport64: jars +linuxport64: all jars mkdir -p ../release/linux64 rm -Rf ../release/linux64/facsanadu cd ..; cp -r ports/linux release/linux64/facsanadu cd ..; cp -r facsanadu.jar lib/*jar lib/linux64/*jar release/linux64/facsanadu/ #cp -r translations/* ../release/linux64/facsanadu/translations/ -linuxport: linuxport32 linuxport64 ubuntuport +linuxport: linuxport64 ubuntuport @@ -64,29 +64,29 @@ linuxport: linuxport32 linuxport64 ubuntuport ############################ windows ####################################################### ############################################################################################ -winportjre: jars +winportjre: all jars rm -Rf ../release/winjre/ mkdir -p ../release/winjre/facsanadu cd ..; cp ports/win/starter/facsanadu_bundledjre.exe release/winjre/facsanadu/start.exe cd ..; cp ports/win/installer/* release/winjre/ - cd ..; cp facsanadu.jar lib/*jar lib/win32/*jar release/winjre/facsanadu/ + cd ..; cp facsanadu.jar lib/*jar lib/win64/*jar release/winjre/facsanadu/ #cp -r translations ../release/winjre/facsanadu/ cd ..; cp -r ../support_programs/jre release/winjre/ cd ../release/winjre; "/home/mahogny/.wine/drive_c/Program Files (x86)/NSIS/makensis.exe" bundledjre.nsi cd ../release/winjre; mv install.exe ../facsanadu_winjre.exe -winportzip: jars +winportzip: all jars rm -Rf ../release/facsanadu_win/ mkdir -p ../release/facsanadu_win cd ..; cp ports/win/starter/facsanadu_bundledjre.exe release/facsanadu_win/facsanadu.exe - cd ..; cp facsanadu.jar lib/*jar lib/win32/*jar release/facsanadu_win/ + cd ..; cp facsanadu.jar lib/*jar lib/win64/*jar release/facsanadu_win/ cd ..; cp -r ../support_programs/jre/* release/facsanadu_win/ cd ../release/; zip -r facsanadu_win facsanadu_win -winport: winportzip # winportjre # winport32 winport64 winportjre +winport: winportzip # winportjre # winport64 winportjre ############################################################################################ @@ -97,14 +97,13 @@ release: macport linuxport winport #docs mkdir -p ../release rm -f ../release/facsanadu*zip cd ../release/linux64; zip -r ../facsanadu_linux64.zip facsanadu - cd ../release/linux32; zip -r ../facsanadu_linux32.zip facsanadu #cd ports; zip -r ../../release/docs.zip documentation cd ..; cp -f src/facsanadu/gui/version.txt release/qtversion.txt cleanports: cd ports; rm facsanadu.app/*.jar # cd ports; rm linux/*.jar -# cd ports; rm win32/*.jar +# cd ports; rm win64/*.jar cd ports; rm documentation/* @@ -138,9 +137,6 @@ lupdate: -ts translations/*ts - - - gitaddall: git add --all \ */*java \ diff --git a/src/facsanadu/gates/GatePolygon.java b/src/facsanadu/gates/GatePolygon.java index c6418f0..52130f8 100644 --- a/src/facsanadu/gates/GatePolygon.java +++ b/src/facsanadu/gates/GatePolygon.java @@ -2,9 +2,9 @@ import java.util.ArrayList; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.core.Qt.FillRule; -import com.trolltech.qt.gui.QPolygonF; +import io.qt.core.QPointF; +import io.qt.core.Qt.FillRule; +import io.qt.gui.QPolygonF; /** * @@ -21,12 +21,12 @@ public class GatePolygon extends Gate public ArrayList arrY=new ArrayList(); private QPolygonF poly; - + public void updateInternal() { poly=new QPolygonF(); for(int i=0;i getCurrentDatasets() { @@ -388,7 +386,7 @@ else if(dsList.size()==1) // Export a list of datasets QFileDialog dia=new QFileDialog(); - dia.setFileMode(FileMode.DirectoryOnly); + dia.setFileMode(FileMode.Directory); //dia.setNameFilter(tr("CSV files (*.csv)")); dia.setAcceptMode(AcceptMode.AcceptSave); //dia.setDefaultSuffix("csv"); @@ -572,7 +570,7 @@ public void dothelayout() /** * Event: User drags something onto widget */ - protected void dragEnterEvent(com.trolltech.qt.gui.QDragEnterEvent event) + protected void dragEnterEvent(io.qt.gui.QDragEnterEvent event) { if(event.mimeData().hasFormat("text/uri-list")) event.acceptProposedAction(); diff --git a/src/facsanadu/gui/ProfileChannelWidget.java b/src/facsanadu/gui/ProfileChannelWidget.java index 86ee8b5..c7dd3cb 100644 --- a/src/facsanadu/gui/ProfileChannelWidget.java +++ b/src/facsanadu/gui/ProfileChannelWidget.java @@ -3,17 +3,17 @@ import java.util.Arrays; import java.util.LinkedList; -import com.trolltech.qt.core.QModelIndex; -import com.trolltech.qt.core.Qt; -import com.trolltech.qt.gui.QIcon; -import com.trolltech.qt.gui.QPushButton; -import com.trolltech.qt.gui.QTableWidget; -import com.trolltech.qt.gui.QTableWidgetItem; -import com.trolltech.qt.gui.QVBoxLayout; -import com.trolltech.qt.gui.QAbstractItemView.SelectionBehavior; -import com.trolltech.qt.gui.QHeaderView.ResizeMode; -import com.trolltech.qt.gui.QItemSelectionModel.SelectionFlag; -import com.trolltech.qt.gui.QSizePolicy.Policy; +import io.qt.core.QModelIndex; +import io.qt.core.Qt; +import io.qt.gui.QIcon; +import io.qt.widgets.QPushButton; +import io.qt.widgets.QTableWidget; +import io.qt.widgets.QTableWidgetItem; +import io.qt.widgets.QVBoxLayout; +import io.qt.widgets.QAbstractItemView.SelectionBehavior; +import io.qt.widgets.QHeaderView.ResizeMode; +import io.qt.core.QItemSelectionModel.SelectionFlag; +import io.qt.widgets.QSizePolicy.Policy; import facsanadu.data.ProfChannel; import facsanadu.gui.lengthprofile.ProfilePane; @@ -37,13 +37,13 @@ public class ProfileChannelWidget extends QVBoxLayout public ProfileChannelWidget(MainWindow mw) { this.mw=mw; - setMargin(0); + setContentsMargins(0,0,0,0); tableDatasets.setColumnCount(1); tableDatasets.verticalHeader().hide(); tableDatasets.setHorizontalHeaderLabels(Arrays.asList(tr("Prof.Channel"))); tableDatasets.setSelectionBehavior(SelectionBehavior.SelectRows); - tableDatasets.horizontalHeader().setResizeMode(ResizeMode.ResizeToContents); + tableDatasets.horizontalHeader().setSectionResizeMode(ResizeMode.ResizeToContents); tableDatasets.horizontalHeader().setStretchLastSection(true); tableDatasets.selectionModel().selectionChanged.connect(this,"dothelayout()"); diff --git a/src/facsanadu/gui/ViewsListWidget.java b/src/facsanadu/gui/ViewsListWidget.java index 5d3800c..e45e39e 100644 --- a/src/facsanadu/gui/ViewsListWidget.java +++ b/src/facsanadu/gui/ViewsListWidget.java @@ -3,17 +3,17 @@ import java.util.Arrays; import java.util.LinkedList; -import com.trolltech.qt.core.QModelIndex; -import com.trolltech.qt.core.Qt; -import com.trolltech.qt.gui.QItemSelectionModel.SelectionFlag; -import com.trolltech.qt.gui.QIcon; -import com.trolltech.qt.gui.QPushButton; -import com.trolltech.qt.gui.QTableWidget; -import com.trolltech.qt.gui.QTableWidgetItem; -import com.trolltech.qt.gui.QVBoxLayout; -import com.trolltech.qt.gui.QAbstractItemView.SelectionBehavior; -import com.trolltech.qt.gui.QHeaderView.ResizeMode; -import com.trolltech.qt.gui.QSizePolicy.Policy; +import io.qt.core.QModelIndex; +import io.qt.core.Qt; +import io.qt.core.QItemSelectionModel.SelectionFlag; +import io.qt.gui.QIcon; +import io.qt.widgets.QPushButton; +import io.qt.widgets.QTableWidget; +import io.qt.widgets.QTableWidgetItem; +import io.qt.widgets.QVBoxLayout; +import io.qt.widgets.QAbstractItemView.SelectionBehavior; +import io.qt.widgets.QHeaderView.ResizeMode; +import io.qt.widgets.QSizePolicy.Policy; import facsanadu.data.Dataset; import facsanadu.gui.events.EventViewsChanged; @@ -38,12 +38,12 @@ public class ViewsListWidget extends QVBoxLayout public ViewsListWidget(MainWindow mw) { this.mw=mw; - setMargin(0); + setContentsMargins(0,0,0,0); tableViews.verticalHeader().hide(); tableViews.setSelectionBehavior(SelectionBehavior.SelectRows); - tableViews.horizontalHeader().setResizeMode(ResizeMode.ResizeToContents); + tableViews.horizontalHeader().setSectionResizeMode(ResizeMode.ResizeToContents); tableViews.horizontalHeader().setStretchLastSection(true); tableViews.selectionModel().selectionChanged.connect(this,"dothelayout()"); diff --git a/src/facsanadu/gui/colors/QColorCombo.java b/src/facsanadu/gui/colors/QColorCombo.java index 87fecce..fda4b91 100644 --- a/src/facsanadu/gui/colors/QColorCombo.java +++ b/src/facsanadu/gui/colors/QColorCombo.java @@ -1,12 +1,11 @@ package facsanadu.gui.colors; -import com.trolltech.qt.QSignalEmitter; -import com.trolltech.qt.gui.QColor; -import com.trolltech.qt.gui.QIcon; -import com.trolltech.qt.gui.QPainter; -import com.trolltech.qt.gui.QPixmap; -import com.trolltech.qt.gui.QPushButton; -import com.trolltech.qt.gui.QSizePolicy.Policy; +import io.qt.gui.QColor; +import io.qt.gui.QIcon; +import io.qt.gui.QPainter; +import io.qt.gui.QPixmap; +import io.qt.widgets.QPushButton; +import io.qt.widgets.QSizePolicy.Policy; import facsanadu.gates.GateColor; @@ -23,8 +22,8 @@ public class QColorCombo extends QPushButton GateColor currentColor=colorset.get(0); int size=12; - - public QSignalEmitter.Signal0 currentIndexChanged=new QSignalEmitter.Signal0(); + + public final Signal0 currentIndexChanged=new Signal0(); diff --git a/src/facsanadu/gui/colors/QColorComboPopup.java b/src/facsanadu/gui/colors/QColorComboPopup.java index 40f4c8d..b563910 100644 --- a/src/facsanadu/gui/colors/QColorComboPopup.java +++ b/src/facsanadu/gui/colors/QColorComboPopup.java @@ -1,10 +1,10 @@ package facsanadu.gui.colors; -import com.trolltech.qt.core.Qt.WindowType; -import com.trolltech.qt.gui.QGridLayout; -import com.trolltech.qt.gui.QIcon; -import com.trolltech.qt.gui.QPushButton; -import com.trolltech.qt.gui.QWidget; +import io.qt.core.Qt.WindowType; +import io.qt.widgets.QGridLayout; +import io.qt.gui.QIcon; +import io.qt.widgets.QPushButton; +import io.qt.widgets.QWidget; import facsanadu.gates.GateColor; diff --git a/src/facsanadu/gui/colors/QColorComboProper.java b/src/facsanadu/gui/colors/QColorComboProper.java index 5403edd..3471cd3 100644 --- a/src/facsanadu/gui/colors/QColorComboProper.java +++ b/src/facsanadu/gui/colors/QColorComboProper.java @@ -1,12 +1,12 @@ package facsanadu.gui.colors; -import com.trolltech.qt.core.QSize; -import com.trolltech.qt.gui.QColor; -import com.trolltech.qt.gui.QComboBox; -import com.trolltech.qt.gui.QIcon; -import com.trolltech.qt.gui.QPainter; -import com.trolltech.qt.gui.QPixmap; -import com.trolltech.qt.gui.QSizePolicy.Policy; +import io.qt.core.QSize; +import io.qt.gui.QColor; +import io.qt.widgets.QComboBox; +import io.qt.gui.QIcon; +import io.qt.gui.QPainter; +import io.qt.gui.QPixmap; +import io.qt.widgets.QSizePolicy.Policy; import facsanadu.gates.GateColor; diff --git a/src/facsanadu/gui/lengthprofile/ProfilePane.java b/src/facsanadu/gui/lengthprofile/ProfilePane.java index 00d3826..d973a8f 100644 --- a/src/facsanadu/gui/lengthprofile/ProfilePane.java +++ b/src/facsanadu/gui/lengthprofile/ProfilePane.java @@ -4,18 +4,18 @@ import java.util.LinkedList; import java.util.List; -import com.trolltech.qt.core.Qt.Orientation; -import com.trolltech.qt.gui.QCheckBox; -import com.trolltech.qt.gui.QGridLayout; -import com.trolltech.qt.gui.QHBoxLayout; -import com.trolltech.qt.gui.QIcon; -import com.trolltech.qt.gui.QIntValidator; -import com.trolltech.qt.gui.QLabel; -import com.trolltech.qt.gui.QLineEdit; -import com.trolltech.qt.gui.QPushButton; -import com.trolltech.qt.gui.QSlider; -import com.trolltech.qt.gui.QVBoxLayout; -import com.trolltech.qt.gui.QWidget; +import io.qt.core.Qt.Orientation; +import io.qt.widgets.QCheckBox; +import io.qt.widgets.QGridLayout; +import io.qt.widgets.QHBoxLayout; +import io.qt.gui.QIcon; +import io.qt.gui.QIntValidator; +import io.qt.widgets.QLabel; +import io.qt.widgets.QLineEdit; +import io.qt.widgets.QPushButton; +import io.qt.widgets.QSlider; +import io.qt.widgets.QVBoxLayout; +import io.qt.widgets.QWidget; import facsanadu.data.Dataset; import facsanadu.data.ProfChannel; diff --git a/src/facsanadu/gui/lengthprofile/ProfileView.java b/src/facsanadu/gui/lengthprofile/ProfileView.java index 293c511..9814f1f 100644 --- a/src/facsanadu/gui/lengthprofile/ProfileView.java +++ b/src/facsanadu/gui/lengthprofile/ProfileView.java @@ -4,17 +4,17 @@ import java.util.Arrays; import java.util.List; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.core.QRect; -import com.trolltech.qt.core.Qt.MouseButton; -import com.trolltech.qt.gui.QBrush; -import com.trolltech.qt.gui.QColor; -import com.trolltech.qt.gui.QMouseEvent; -import com.trolltech.qt.gui.QPaintEvent; -import com.trolltech.qt.gui.QPainter; -import com.trolltech.qt.gui.QPainterPath; -import com.trolltech.qt.gui.QPen; -import com.trolltech.qt.gui.QWidget; +import io.qt.core.QPointF; +import io.qt.core.QRect; +import io.qt.core.Qt.MouseButton; +import io.qt.gui.QBrush; +import io.qt.gui.QColor; +import io.qt.gui.QMouseEvent; +import io.qt.gui.QPaintEvent; +import io.qt.gui.QPainter; +import io.qt.gui.QPainterPath; +import io.qt.gui.QPen; +import io.qt.widgets.QWidget; import facsanadu.data.Dataset; import facsanadu.data.LengthProfileData; @@ -138,20 +138,6 @@ public void setevent(Dataset ds, List ids) eventid.addAll(ids); update(); } - - - - - - - - - - - - - - QPointF pointLast=new QPointF(); int moveBoundary=-1; @@ -159,7 +145,7 @@ public void setevent(Dataset ds, List ids) @Override protected void mousePressEvent(QMouseEvent event) { - pointLast=event.posF(); + pointLast=event.globalPosition(); super.mousePressEvent(event); if(event.button()==MouseButton.LeftButton) { @@ -170,10 +156,10 @@ protected void mousePressEvent(QMouseEvent event) toViewX(curchannel.from), toViewX(curchannel.to)}; int si=-1; - int smallest=100000; + double smallest=100000; for(int i=0;i formatsList) { String formats=""; @@ -149,8 +154,9 @@ public static QFileDialog.Filter buildFileDialogSupportedFormatsFilter(String fi formats+=" "; formats+="*."+arr; } +// TODO: QFileDialog.Filter missing. FileMode? return new QFileDialog.Filter(fileType+" ("+formats+")"); - } + }*/ /** @@ -161,9 +167,10 @@ public static QFileDialog.Filter buildFileDialogSupportedFormatsFilter(String fi * @param filter Filter for the files * @return The file, or null if none opened */ - public static File openFileDialog(QWidget parent, String title, Filter filter) + /* + public static File openFileDialog(QWidget parent, String title, String filter) { - String fileName = QFileDialog.getOpenFileName(parent, title, lastQtDir, filter); + String fileName = QFileDialog.getOpenFileName(parent, title, lastQtDir, filter).result; if(!fileName.equals("")) { File f=new File(fileName); @@ -172,14 +179,15 @@ public static File openFileDialog(QWidget parent, String title, Filter filter) } else return null; - } + }*/ /** * Open multiple files dialog. Never returns null */ - public static Collection openFilesDialog(QWidget parent, String title, Filter filter) + /* + public static Collection openFilesDialog(QWidget parent, String title, String filter) { - List fileName = QFileDialog.getOpenFileNames(parent, title, lastQtDir, filter); + List fileName = QFileDialog.getOpenFileNames(parent, title, lastQtDir, filter).result; if(!fileName.isEmpty()) { List fs=new LinkedList(); @@ -194,6 +202,7 @@ public static Collection openFilesDialog(QWidget parent, String title, Fil else return new LinkedList(); } + */ /** * Request a save-file dialog @@ -204,10 +213,11 @@ public static Collection openFilesDialog(QWidget parent, String title, Fil * @param filter Filter for the files * @return The file, or null if none opened */ - public static File saveFileDialog(QWidget parent, String title, String suggestName, String defaultSuffix, QFileDialog.Filter filter) + /* + public static File saveFileDialog(QWidget parent, String title, String suggestName, String defaultSuffix, QDir.Filter filter) { QFileDialog dia=new QFileDialog(parent, title, lastQtDir); - dia.setFilter(filter.filter); + dia.setFilter(filter); if(defaultSuffix!=null) dia.setDefaultSuffix(defaultSuffix); if(suggestName!=null) @@ -233,6 +243,8 @@ public static File saveFileDialog(QWidget parent, String title, Filter filter) { return saveFileDialog(parent, title, null, null, filter); } + */ + /** * Last directory where a file was opened from */ @@ -262,11 +274,11 @@ public static File openExistingDirectoryDialog(QWidget parent, String title, Str return null; } - +/* no longer used public static Filter getAllFilesFilter() { return new QFileDialog.Filter(QCoreApplication.translate("labstory","Files")+" (*.*)"); - } + }*/ public static List getSupportedImageFormats() @@ -344,13 +356,7 @@ public static void showNotice(final QWidget parent, final String text) public static void printError(final QWidget parent, final String text) { - QApplication.invokeAndWait(new Runnable() - { - public void run() - { - QMessageBox.critical(parent, QtProgramInfo.programName, text); - } - }); + QMetaObject.invokeMethod(()->QMessageBox.critical(parent, QtProgramInfo.programName, text)); } /* @@ -404,8 +410,8 @@ public static void setProperHeightOfTable(QTableView listTables) public static QValidator getLabstoryIdvalidator(QObject parent) { //Do NOT use the constructor(regexp), windows qt bug! - QRegExpValidator validator=new QRegExpValidator(parent); - validator.setRegExp(new QRegExp("[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890]*")); + QRegularExpressionValidator validator=new QRegularExpressionValidator(parent); + validator.setRegularExpression(new QRegularExpression("[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890]*")); return validator; } diff --git a/src/facsanadu/gui/qt/QVLabel.java b/src/facsanadu/gui/qt/QVLabel.java index 148c6c2..a82ed51 100644 --- a/src/facsanadu/gui/qt/QVLabel.java +++ b/src/facsanadu/gui/qt/QVLabel.java @@ -1,12 +1,12 @@ package facsanadu.gui.qt; -import com.trolltech.qt.core.QPoint; -import com.trolltech.qt.gui.QColor; -import com.trolltech.qt.gui.QFont; -import com.trolltech.qt.gui.QFontMetrics; -import com.trolltech.qt.gui.QPaintEvent; -import com.trolltech.qt.gui.QPainter; -import com.trolltech.qt.gui.QWidget; +import io.qt.core.QPoint; +import io.qt.gui.QColor; +import io.qt.gui.QFont; +import io.qt.gui.QFontMetrics; +import io.qt.gui.QPaintEvent; +import io.qt.gui.QPainter; +import io.qt.widgets.QWidget; /** * @@ -42,9 +42,9 @@ protected void paintEvent(QPaintEvent e) QFont font=painter.font(); font.setBold(true); painter.setFont(font); - painter.setPen(QColor.black); + painter.setPen(QColor.fromRgb(0,0,0)); //solid black painter.rotate(-90); - painter.drawText(new QPoint(-(height()-fm.width(text))/2,11), text); + painter.drawText(new QPoint(-(height()-fm.horizontalAdvance(text))/2,11), text); } diff --git a/src/facsanadu/gui/resource/ImgResource.java b/src/facsanadu/gui/resource/ImgResource.java index 6b60610..bdcd684 100644 --- a/src/facsanadu/gui/resource/ImgResource.java +++ b/src/facsanadu/gui/resource/ImgResource.java @@ -3,10 +3,10 @@ import java.io.IOException; import java.io.InputStream; -import com.trolltech.qt.gui.QIcon; -import com.trolltech.qt.gui.QLabel; -import com.trolltech.qt.gui.QPixmap; -import com.trolltech.qt.gui.QWidget; +import io.qt.gui.QIcon; +import io.qt.widgets.QLabel; +import io.qt.gui.QPixmap; +import io.qt.widgets.QWidget; /** * Common icons. By loading them once, memory is conserved diff --git a/src/facsanadu/gui/view/GraphExporter.java b/src/facsanadu/gui/view/GraphExporter.java index cad6c6f..4dcfe94 100644 --- a/src/facsanadu/gui/view/GraphExporter.java +++ b/src/facsanadu/gui/view/GraphExporter.java @@ -5,15 +5,15 @@ import java.util.LinkedList; import java.util.List; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.gui.QBrush; -import com.trolltech.qt.gui.QColor; -import com.trolltech.qt.gui.QFont; -import com.trolltech.qt.gui.QFontMetrics; -import com.trolltech.qt.gui.QImage; -import com.trolltech.qt.gui.QImageWriter; -import com.trolltech.qt.gui.QPainter; -import com.trolltech.qt.gui.QImage.Format; +import io.qt.core.QPointF; +import io.qt.gui.QBrush; +import io.qt.gui.QColor; +import io.qt.gui.QFont; +import io.qt.gui.QFontMetrics; +import io.qt.gui.QImage; +import io.qt.gui.QImageWriter; +import io.qt.gui.QPainter; +import io.qt.gui.QImage.Format; import facsanadu.data.Dataset; import facsanadu.gui.FacsanaduProject; @@ -84,7 +84,7 @@ public static void render(File f, FacsanaduProject proj, List listds, L int toth=listviews.size()*(oneh+spacing)+spacing; QImage img=new QImage(totw,toth, Format.Format_RGB32); QPainter pm=new QPainter(img); - pm.setBrush(new QBrush(QColor.white)); + pm.setBrush(new QBrush((QColor.fromRgb(255,255,255)))); //solid white pm.drawRect(-5, -5, totw+10, toth+10); int offsetX=30; @@ -112,7 +112,7 @@ public static void render(File f, FacsanaduProject proj, List listds, L } //Draw the labels - pm.setPen(QColor.black); + pm.setPen(QColor.fromRgb(0,0,0)); //solid black QFont font=new QFont(); font.setBold(true); pm.setFont(font); diff --git a/src/facsanadu/gui/view/ViewRenderer.java b/src/facsanadu/gui/view/ViewRenderer.java index cb000ff..3508d90 100644 --- a/src/facsanadu/gui/view/ViewRenderer.java +++ b/src/facsanadu/gui/view/ViewRenderer.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.LinkedList; -import com.trolltech.qt.core.QRect; -import com.trolltech.qt.gui.QBrush; -import com.trolltech.qt.gui.QColor; -import com.trolltech.qt.gui.QFontMetrics; -import com.trolltech.qt.gui.QPainter; -import com.trolltech.qt.gui.QPen; +import io.qt.core.QRect; +import io.qt.gui.QBrush; +import io.qt.gui.QColor; +import io.qt.gui.QFontMetrics; +import io.qt.gui.QPainter; +import io.qt.gui.QPen; import facsanadu.data.ChannelInfo; import facsanadu.data.Dataset; @@ -63,7 +63,7 @@ private static void renderHistogram(ViewSettings viewsettings, Dataset segment, Histogram h=viewsettings.computeHistogram(segment, gr); //better if this was only once! pm.setPen(new QPen(QColor.fromRgb(0,0,0))); - pm.setBrush(new QBrush(QColor.gray)); + pm.setBrush(new QBrush(QColor.fromRgb(169,169,169))); //solid grey double magicConstant=0.2*Math.sqrt(h.getNumBins())*viewsettings.zoomY; @@ -193,7 +193,7 @@ private static void drawgatesRecursive(QPainter pm, ViewTransform trans, Gate pa for(Gate g:parent.children) { pm.setPen(QColor.fromRgb(255,0,0)); - pm.setBrush(new QBrush(QColor.transparent)); + pm.setBrush(new QBrush(QColor.fromRgb(0,0,0,0))); //transparent GateRenderer rend=GateRendererManager.getGateRenderer(g); rend.render(g, pm, trans, viewsettings, handles); drawgatesRecursive(pm, trans, g, viewsettings, handles); @@ -202,4 +202,4 @@ private static void drawgatesRecursive(QPainter pm, ViewTransform trans, Gate pa - } \ No newline at end of file + } diff --git a/src/facsanadu/gui/view/ViewTransform.java b/src/facsanadu/gui/view/ViewTransform.java index 4e5d9bb..d6a1fc9 100644 --- a/src/facsanadu/gui/view/ViewTransform.java +++ b/src/facsanadu/gui/view/ViewTransform.java @@ -1,6 +1,6 @@ package facsanadu.gui.view; -import com.trolltech.qt.core.QPointF; +import io.qt.core.QPointF; /** * Transformation of coordinates view <-> world diff --git a/src/facsanadu/gui/view/ViewWidget.java b/src/facsanadu/gui/view/ViewWidget.java index 940307a..cb79b1c 100644 --- a/src/facsanadu/gui/view/ViewWidget.java +++ b/src/facsanadu/gui/view/ViewWidget.java @@ -3,20 +3,21 @@ import java.util.ArrayList; import java.util.LinkedList; -import com.trolltech.qt.core.QPoint; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.core.QRectF; -import com.trolltech.qt.core.Qt.MouseButton; -import com.trolltech.qt.gui.QBrush; -import com.trolltech.qt.gui.QColor; -import com.trolltech.qt.gui.QImage; -import com.trolltech.qt.gui.QMenu; -import com.trolltech.qt.gui.QMouseEvent; -import com.trolltech.qt.gui.QPaintEvent; -import com.trolltech.qt.gui.QPainter; -import com.trolltech.qt.gui.QWidget; -import com.trolltech.qt.gui.QImage.Format; -import com.trolltech.qt.gui.QSizePolicy.Policy; +import io.qt.core.QPoint; +import io.qt.core.QPointF; +import io.qt.core.QRectF; +import io.qt.core.Qt.MouseButton; +import io.qt.gui.QBrush; +import io.qt.gui.QColor; +import io.qt.gui.QCursor; +import io.qt.gui.QImage; +import io.qt.widgets.QMenu; +import io.qt.gui.QMouseEvent; +import io.qt.gui.QPaintEvent; +import io.qt.gui.QPainter; +import io.qt.widgets.QWidget; +import io.qt.gui.QImage.Format; +import io.qt.widgets.QSizePolicy.Policy; import facsanadu.data.ChannelInfo; import facsanadu.data.Dataset; @@ -95,7 +96,7 @@ private void updatePointImage() System.out.println("update cache"); img=new QImage(width(),height(), Format.Format_RGB32); QPainter pm2=new QPainter(img); - pm2.setBrush(new QBrush(QColor.white)); + pm2.setBrush(new QBrush((QColor.fromRgb(255,255,255)))); //solid white pm2.drawRect(-5,-5,10000,10000); ViewRenderer.renderData(viewsettings, dataset, gr, trans, pm2, maxevents); pm2.end(); @@ -128,8 +129,8 @@ protected void paintEvent(QPaintEvent pe) //Now render handles? for(GateHandle h:handles) { - pm.setBrush(new QBrush(QColor.transparent)); - pm.setPen(QColor.red); + pm.setBrush(new QBrush(QColor.fromRgb(0,0,0,0))); //transparent + pm.setPen(QColor.fromRgb(255,0,0)); //solid red int size=2; pm.drawRect(new QRectF(h.getX()-size, h.getY()-size,2*size,2*size)); @@ -166,12 +167,12 @@ public GateHandle getClosestHandle(QPointF pos, double cutoff) @Override protected void mousePressEvent(QMouseEvent event) { - pointLast=event.posF(); + pointLast=event.globalPosition(); super.mousePressEvent(event); if(event.button()==MouseButton.LeftButton) { curhandle=null; - GateHandle handle=getClosestHandle(event.posF(), 10); + GateHandle handle=getClosestHandle(event.globalPosition(), 10); if(handle!=null) { //Move a handle @@ -254,7 +255,7 @@ else if(mousePosInBoundary(event.pos())) menu.addMenu(menuHist); menu.addMenu(mHistBins); - menu.exec(event.globalPos()); + menu.exec(QCursor.pos()); } else { @@ -287,12 +288,12 @@ protected void mouseMoveEvent(QMouseEvent event) super.mouseMoveEvent(event); if(curhandle!=null) { - QPointF p=trans.mapScreenToFcs(event.posF()); + QPointF p=trans.mapScreenToFcs(event.globalPosition()); curhandle.move2(mainWindow, p.x(), p.y()); } else tool.mouseMoveEvent(event); - pointLast=event.posF(); + pointLast=event.globalPosition(); } @@ -464,4 +465,4 @@ public void invalidateCache() img=null; } - } \ No newline at end of file + } diff --git a/src/facsanadu/gui/view/gate/GateRenderer.java b/src/facsanadu/gui/view/gate/GateRenderer.java index a58638e..09dd515 100644 --- a/src/facsanadu/gui/view/gate/GateRenderer.java +++ b/src/facsanadu/gui/view/gate/GateRenderer.java @@ -2,7 +2,7 @@ import java.util.Collection; -import com.trolltech.qt.gui.QPainter; +import io.qt.gui.QPainter; import facsanadu.gates.Gate; import facsanadu.gui.view.ViewSettings; diff --git a/src/facsanadu/gui/view/gate/GateRendererEllipse.java b/src/facsanadu/gui/view/gate/GateRendererEllipse.java index 469ad27..06c9152 100644 --- a/src/facsanadu/gui/view/gate/GateRendererEllipse.java +++ b/src/facsanadu/gui/view/gate/GateRendererEllipse.java @@ -2,10 +2,10 @@ import java.util.Collection; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.core.QRectF; -import com.trolltech.qt.gui.QPainter; -import com.trolltech.qt.gui.QPolygonF; +import io.qt.core.QPointF; +import io.qt.core.QRectF; +import io.qt.gui.QPainter; +import io.qt.gui.QPolygonF; import facsanadu.gates.Gate; import facsanadu.gates.GateEllipse; diff --git a/src/facsanadu/gui/view/gate/GateRendererPoly.java b/src/facsanadu/gui/view/gate/GateRendererPoly.java index 6fabbf9..40cce3c 100644 --- a/src/facsanadu/gui/view/gate/GateRendererPoly.java +++ b/src/facsanadu/gui/view/gate/GateRendererPoly.java @@ -2,8 +2,8 @@ import java.util.Collection; -import com.trolltech.qt.gui.QPainter; -import com.trolltech.qt.gui.QPolygonF; +import io.qt.gui.QPainter; +import io.qt.gui.QPolygonF; import facsanadu.gates.Gate; import facsanadu.gates.GatePolygon; @@ -50,7 +50,7 @@ public void render(final Gate gate, QPainter p, final ViewTransform w, final Vie final int x=w.mapFcsToScreenX(thex[i]); final int y=w.mapFcsToScreenY(they[i]); final int ii=i; - poly.add(x, y); + poly.append(x, y); if(!viewsettings.transformation.isEmpty()) { @@ -68,7 +68,7 @@ public void render(final Gate gate, QPainter p, final ViewTransform w, final Vie int x2=w.mapFcsToScreenX(vx); int y2=w.mapFcsToScreenY(vy); - poly.add(x2, y2); + poly.append(x2, y2); } } GateHandle handle=new GateHandle() diff --git a/src/facsanadu/gui/view/gate/GateRendererRange.java b/src/facsanadu/gui/view/gate/GateRendererRange.java index 48182d2..437f97a 100644 --- a/src/facsanadu/gui/view/gate/GateRendererRange.java +++ b/src/facsanadu/gui/view/gate/GateRendererRange.java @@ -2,8 +2,8 @@ import java.util.Collection; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.gui.QPainter; +import io.qt.core.QPointF; +import io.qt.gui.QPainter; import facsanadu.gates.Gate; import facsanadu.gates.GateRange; diff --git a/src/facsanadu/gui/view/gate/GateRendererRect.java b/src/facsanadu/gui/view/gate/GateRendererRect.java index dd39fef..cd62c89 100644 --- a/src/facsanadu/gui/view/gate/GateRendererRect.java +++ b/src/facsanadu/gui/view/gate/GateRendererRect.java @@ -2,9 +2,9 @@ import java.util.Collection; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.core.QRectF; -import com.trolltech.qt.gui.QPainter; +import io.qt.core.QPointF; +import io.qt.core.QRectF; +import io.qt.gui.QPainter; import facsanadu.gates.Gate; import facsanadu.gates.GateRect; diff --git a/src/facsanadu/gui/view/gate/GateRendererRoot.java b/src/facsanadu/gui/view/gate/GateRendererRoot.java index 1478e20..f25154c 100644 --- a/src/facsanadu/gui/view/gate/GateRendererRoot.java +++ b/src/facsanadu/gui/view/gate/GateRendererRoot.java @@ -2,7 +2,7 @@ import java.util.Collection; -import com.trolltech.qt.gui.QPainter; +import io.qt.gui.QPainter; import facsanadu.gates.Gate; import facsanadu.gui.view.ViewSettings; diff --git a/src/facsanadu/gui/view/tool/ViewTool.java b/src/facsanadu/gui/view/tool/ViewTool.java index 0fb8476..4ea1d60 100644 --- a/src/facsanadu/gui/view/tool/ViewTool.java +++ b/src/facsanadu/gui/view/tool/ViewTool.java @@ -1,6 +1,6 @@ package facsanadu.gui.view.tool; -import com.trolltech.qt.gui.QMouseEvent; +import io.qt.gui.QMouseEvent; /** * diff --git a/src/facsanadu/gui/view/tool/ViewToolDrawEllipse.java b/src/facsanadu/gui/view/tool/ViewToolDrawEllipse.java index c9e0de0..7d29aa7 100644 --- a/src/facsanadu/gui/view/tool/ViewToolDrawEllipse.java +++ b/src/facsanadu/gui/view/tool/ViewToolDrawEllipse.java @@ -1,8 +1,8 @@ package facsanadu.gui.view.tool; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.core.Qt.MouseButton; -import com.trolltech.qt.gui.QMouseEvent; +import io.qt.core.QPointF; +import io.qt.core.Qt.MouseButton; +import io.qt.gui.QMouseEvent; import facsanadu.gates.Gate; import facsanadu.gates.GateEllipse; @@ -52,7 +52,7 @@ public void mouseMoveEvent(QMouseEvent event) { GateEllipse grect=(GateEllipse)isDrawing; - QPointF p = w.trans.mapScreenToFcs(event.posF()); + QPointF p = w.trans.mapScreenToFcs(event.position()); grect.rx=p.x()-grect.x; grect.ry=p.y()-grect.y; @@ -69,7 +69,7 @@ public void mousePressEvent(QMouseEvent event) { if(event.button()==MouseButton.LeftButton && !w.viewsettings.isHistogram()) { - QPointF p = w.trans.mapScreenToFcs(event.posF()); + QPointF p = w.trans.mapScreenToFcs(event.position()); GateEllipse grect=new GateEllipse(); grect.indexX=w.getIndexX(); diff --git a/src/facsanadu/gui/view/tool/ViewToolDrawPoly.java b/src/facsanadu/gui/view/tool/ViewToolDrawPoly.java index 459522d..3cc1f23 100644 --- a/src/facsanadu/gui/view/tool/ViewToolDrawPoly.java +++ b/src/facsanadu/gui/view/tool/ViewToolDrawPoly.java @@ -1,8 +1,8 @@ package facsanadu.gui.view.tool; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.core.Qt.MouseButton; -import com.trolltech.qt.gui.QMouseEvent; +import io.qt.core.QPointF; +import io.qt.core.Qt.MouseButton; +import io.qt.gui.QMouseEvent; import facsanadu.gates.GatePolygon; import facsanadu.gui.events.EventGatesChanged; @@ -35,7 +35,7 @@ public void mousePressEvent(QMouseEvent event) { if(event.button()==MouseButton.LeftButton && !w.viewsettings.isHistogram()) { - QPointF p = w.trans.mapScreenToFcs(event.posF()); + QPointF p = w.trans.mapScreenToFcs(event.position()); boolean justcreated=false; GatePolygon g; @@ -86,7 +86,7 @@ public void mouseMoveEvent(QMouseEvent event) { GatePolygon g=isDrawing; - QPointF p = w.trans.mapScreenToFcs(event.posF()); + QPointF p = w.trans.mapScreenToFcs(event.position()); g.setPoint(g.getNumPoints()-1, p.x(), p.y()); g.updateInternal(); diff --git a/src/facsanadu/gui/view/tool/ViewToolDrawRange.java b/src/facsanadu/gui/view/tool/ViewToolDrawRange.java index d4ac36c..344d323 100644 --- a/src/facsanadu/gui/view/tool/ViewToolDrawRange.java +++ b/src/facsanadu/gui/view/tool/ViewToolDrawRange.java @@ -1,8 +1,8 @@ package facsanadu.gui.view.tool; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.core.Qt.MouseButton; -import com.trolltech.qt.gui.QMouseEvent; +import io.qt.core.QPointF; +import io.qt.core.Qt.MouseButton; +import io.qt.gui.QMouseEvent; import facsanadu.gates.Gate; import facsanadu.gates.GateRange; @@ -53,7 +53,7 @@ public void mouseMoveEvent(QMouseEvent event) { GateRange grect=(GateRange)isDrawing; - QPointF p = w.trans.mapScreenToFcs(event.posF()); + QPointF p = w.trans.mapScreenToFcs(event.position()); grect.x2=p.x(); grect.updateInternal(); @@ -69,7 +69,7 @@ public void mousePressEvent(QMouseEvent event) { if(event.button()==MouseButton.LeftButton) { - QPointF p = w.trans.mapScreenToFcs(event.posF()); + QPointF p = w.trans.mapScreenToFcs(event.position()); GateRange grect=new GateRange(); grect.index=w.getIndexX(); diff --git a/src/facsanadu/gui/view/tool/ViewToolDrawRect.java b/src/facsanadu/gui/view/tool/ViewToolDrawRect.java index 0d2410b..b49eaad 100644 --- a/src/facsanadu/gui/view/tool/ViewToolDrawRect.java +++ b/src/facsanadu/gui/view/tool/ViewToolDrawRect.java @@ -1,8 +1,8 @@ package facsanadu.gui.view.tool; -import com.trolltech.qt.core.QPointF; -import com.trolltech.qt.core.Qt.MouseButton; -import com.trolltech.qt.gui.QMouseEvent; +import io.qt.core.QPointF; +import io.qt.core.Qt.MouseButton; +import io.qt.gui.QMouseEvent; import facsanadu.gates.Gate; import facsanadu.gates.GateRect; @@ -52,7 +52,7 @@ public void mouseMoveEvent(QMouseEvent event) { GateRect grect=(GateRect)isDrawing; - QPointF p = w.trans.mapScreenToFcs(event.posF()); + QPointF p = w.trans.mapScreenToFcs(event.position()); grect.x2=p.x(); grect.y2=p.y(); @@ -69,7 +69,7 @@ public void mousePressEvent(QMouseEvent event) { if(event.button()==MouseButton.LeftButton && !w.viewsettings.isHistogram()) { - QPointF p = w.trans.mapScreenToFcs(event.posF()); + QPointF p = w.trans.mapScreenToFcs(event.position()); GateRect grect=new GateRect(); grect.indexX=w.getIndexX(); diff --git a/src/facsanadu/gui/view/tool/ViewToolDrawSelect.java b/src/facsanadu/gui/view/tool/ViewToolDrawSelect.java index d2f1fa8..7a43138 100644 --- a/src/facsanadu/gui/view/tool/ViewToolDrawSelect.java +++ b/src/facsanadu/gui/view/tool/ViewToolDrawSelect.java @@ -1,6 +1,6 @@ package facsanadu.gui.view.tool; -import com.trolltech.qt.gui.QMouseEvent; +import io.qt.gui.QMouseEvent; import facsanadu.gui.view.ViewWidget;