Skip to content

Commit 6dbc651

Browse files
All4GisAll4Gis
committed
Merge branch 'dev'
2 parents b42a0e9 + 44226ac commit 6dbc651

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+16010
-15570
lines changed

‎README.md

+7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Standards supported:
2020
- [Recommended readings](#recommended-readings)
2121
- [Installation](#installation)
2222
- [Installation on Windows](#installation-on-windows)
23+
- [Installation on Ubuntu](#installation-on-ubuntu)
2324
- [Installation on Archlinux](#installation-on-archlinux)
2425
- [Slides](#slides)
2526
- [Screenshots](#screenshots)
@@ -65,6 +66,8 @@ To see the video you need:
6566

6667
- **Linux**: install <a href="https://gstreamer.freedesktop.org/documentation/installing/on-linux.html" target="_blank">GStreamer dependencies</a>
6768
- **Window**: install LAV Filters (install <a href="https://github.com/Nevcairiel/LAVFilters/releases" target="_blank">DirectShow Media Decoders</a>)
69+
70+
If everything works well the plugin should install these dependencies automatically in both, Windows and Linux.
6871

6972
&#8593; [Back to top](#table-of-contents)
7073

@@ -106,6 +109,10 @@ Windows automatically installs all, with user permission,If an error occurs, you
106109

107110
[![Watch the video (Spanish)](https://i.imgur.com/vXpMJhS.png)](https://youtu.be/9C973pz5i6k "Como usa QGISFMV en windows")
108111

112+
## Installation on Ubuntu
113+
114+
Ubuntu automatically installs all the dependencies if the user wants, for this his password will be requested.
115+
109116
## Installation on Archlinux
110117

111118
_Archlinux installation :_

‎code/QgsFmv.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
QThread)
3131
from qgis.PyQt.QtGui import QIcon
3232
from qgis.PyQt.QtWidgets import QAction
33-
from QGIS_FMV.player.QgsFmvAbout import FmvAbout
34-
from QGIS_FMV.player.QgsManager import FmvManager
33+
from QGIS_FMV.about.QgsFmvAbout import FmvAbout
34+
from QGIS_FMV.manager.QgsManager import FmvManager
3535
from QGIS_FMV.utils.QgsFmvLog import log
3636
from qgis.PyQt.QtCore import Qt
3737
from QGIS_FMV.utils.QgsUtils import QgsUtils as qgsu
@@ -101,7 +101,6 @@ def unload(self):
101101
"QgsFmv", "Full Motion Video (FMV)"), self.actionAbout)
102102
self.iface.removeToolBarIcon(self.actionFMV)
103103
log.removeLogging()
104-
# qgsu.removeMosaicFolder()
105104

106105
def About(self):
107106
''' Show About Dialog '''

‎code/__init__.py

+28-18
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
# -*- coding: utf-8 -*-
22
import sys
3-
try:
4-
sys.path.append(
5-
"D:\eclipse\plugins\org.python.pydev.core_7.1.0.201902031515\pysrc")
6-
from pydevd import *
7-
except ImportError:
8-
None
9-
10-
from QGIS_FMV.utils.QgsFmvInstaller import WindowsInstaller
3+
from QGIS_FMV.utils.QgsFmvInstaller import WindowsInstaller, LinuxInstaller
114
import platform
125
windows = platform.system() == 'Windows'
136
from QGIS_FMV.utils.QgsUtils import QgsUtils as qgsu
@@ -19,17 +12,34 @@
1912
from qgis.PyQt.QtWidgets import QApplication
2013

2114
# Check dependencies
22-
if windows:
23-
try:
24-
QApplication.setOverrideCursor(Qt.PointingHandCursor)
25-
QApplication.processEvents()
15+
try:
16+
QApplication.setOverrideCursor(Qt.PointingHandCursor)
17+
QApplication.processEvents()
18+
19+
if windows: # Windows Installer
20+
try:
21+
sys.path.append(
22+
"D:\eclipse\plugins\org.python.pydev.core_7.1.0.201902031515\pysrc")
23+
from pydevd import *
24+
except ImportError:
25+
None
26+
2627
WindowsInstaller()
27-
reloadPlugin('QGIS_FMV')
28-
iface.messageBar().pushMessage("QGIS FMV", "QGIS Full Motion Video installed correctly", QGis.Info, 3)
29-
QApplication.restoreOverrideCursor()
30-
except Exception as e:
31-
QApplication.restoreOverrideCursor()
32-
None
28+
else: # Linux Installer
29+
try:
30+
sys.path.append(
31+
"/home/fran/Escritorio/eclipse/plugins/org.python.pydev.core_7.2.1.201904261721/pysrc")
32+
from pydevd import *
33+
except ImportError:
34+
None
35+
LinuxInstaller()
36+
37+
reloadPlugin('QGIS_FMV')
38+
iface.messageBar().pushMessage("QGIS FMV", "QGIS Full Motion Video installed correctly", QGis.Info, 3)
39+
QApplication.restoreOverrideCursor()
40+
except Exception as e:
41+
QApplication.restoreOverrideCursor()
42+
None
3343
# buttonReply = qgsu.CustomMessage("QGIS FMV", "", "you need to restart your QGIS,Do you really close?", icon="Information")
3444
# if buttonReply == QMessageBox.Yes:
3545
# # TODO : Restart QGIS

‎code/player/QgsFmvAbout.py ‎code/about/QgsFmvAbout.py

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
# -*- coding: utf-8 -*-
2-
from qgis.PyQt.QtCore import QUrl, Qt
3-
from qgis.PyQt.QtWidgets import QDialog
4-
from QGIS_FMV.gui.ui_FmvAbout import Ui_FmvAbout
5-
6-
try:
7-
from pydevd import *
8-
except ImportError:
9-
None
10-
11-
12-
class FmvAbout(QDialog, Ui_FmvAbout):
13-
""" About Dialog """
14-
15-
def __init__(self):
16-
""" Contructor """
17-
QDialog.__init__(self)
18-
self.setupUi(self)
19-
self.webView.setContextMenuPolicy(Qt.NoContextMenu)
20-
self.webView.load(QUrl("https://all4gis.github.io/QGISFMV/"))
1+
# -*- coding: utf-8 -*-
2+
from qgis.PyQt.QtCore import QUrl, Qt
3+
from qgis.PyQt.QtWidgets import QDialog
4+
from QGIS_FMV.gui.ui_FmvAbout import Ui_FmvAbout
5+
6+
try:
7+
from pydevd import *
8+
except ImportError:
9+
None
10+
11+
12+
class FmvAbout(QDialog, Ui_FmvAbout):
13+
""" About Dialog """
14+
15+
def __init__(self):
16+
""" Contructor """
17+
QDialog.__init__(self)
18+
self.setupUi(self)
19+
self.webView.setContextMenuPolicy(Qt.NoContextMenu)
20+
self.webView.load(QUrl("https://all4gis.github.io/QGISFMV/"))

‎code/about/__init__.py

Whitespace-only changes.

‎code/converter/Converter.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Original Code : https://github.com/senko/python-video-converter
1+
 # Original Code : https://github.com/senko/python-video-converter
22
# Modificated for work in QGIS FMV Plugin
3-
3+
# -*- coding: utf-8 -*-
44
from qgis.PyQt.QtCore import QObject
55
from QGIS_FMV.converter.avcodecs import (video_codec_list,
66
audio_codec_list,

‎code/converter/avcodecs.py

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
 # -*- coding: utf-8 -*-
2+
3+
14
class BaseCodec(object):
25
"""
36
Base audio/video codec class.

‎code/converter/ffmpeg.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
 # -*- coding: utf-8 -*-
12
import locale
23
import os
34
import os.path

‎code/converter/formats.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# -*- coding: utf-8 -*-
1+
 # -*- coding: utf-8 -*-
2+
3+
24
class BaseFormat(object):
35
"""
46
Base format class.

‎code/geo/constants.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
 # -*- coding: utf-8 -*-
12
from collections import namedtuple
23
from math import pi
34

‎code/geo/ellipsoid.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
 # -*- coding: utf-8 -*-
12
from math import (
23
degrees, radians,
34
sin, cos, tan, atan, atan2,

‎code/geo/mgrs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# -*- coding: utf-8 -*-
1+
 # -*- coding: utf-8 -*-
22

33
"""
44
***************************************************************************

‎code/geo/sphere.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# -*- coding: utf-8 -*-
1+
 # -*- coding: utf-8 -*-
22
from math import (
33
degrees, radians,
44
sin, cos, asin, tan, atan, atan2, pi,

0 commit comments

Comments
 (0)