Skip to content

Commit e1a64f6

Browse files
alexbruyalexbruy
committedFeb 5, 2018
[processing] remove unused files
·
ltr-3_44final-3_0_0
1 parent 724390c commit e1a64f6

File tree

12 files changed

+4
-463
lines changed

12 files changed

+4
-463
lines changed
 

‎images/images.qrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,6 @@
596596
<file>themes/default/providerGdal.svg</file>
597597
<file>themes/default/providerGrass.svg</file>
598598
<file>themes/default/providerQgis.svg</file>
599-
<file>themes/default/providerR.svg</file>
600599
<file>themes/default/providerSaga.svg</file>
601600
<file>themes/default/processingModel.svg</file>
602601
<file>themes/default/processingScript.svg</file>

‎images/themes/default/providerR.svg‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎python/plugins/processing/script/ScriptAlgorithm.py‎

Lines changed: 0 additions & 313 deletions
This file was deleted.

‎python/plugins/processing/script/ScriptAlgorithmProvider.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def loadAlgorithms(self):
103103
for folder in folders:
104104
items = os.scandir(folder)
105105
for entry in items:
106-
if entry.name.lower().endswith("py") and entry.is_file():
106+
if entry.name.lower().endswith(".py") and entry.is_file():
107107
algName = os.path.splitext(entry.name)[0]
108108
filePath = os.path.abspath(os.path.join(folder, entry.name))
109109
alg = ScriptUtils.loadAlgorithm(algName, filePath)

‎python/plugins/processing/script/ScriptEditorDialog.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ def __init__(self, filePath=None, parent=None):
5656

5757
QgsGui.instance().enableAutoGeometryRestore(self)
5858

59-
#~ self.setWindowFlags(Qt.WindowMinimizeButtonHint |
60-
#~ Qt.WindowMaximizeButtonHint |
61-
#~ Qt.WindowCloseButtonHint)
62-
6359
self.searchWidget.setVisible(False)
6460

6561
self.toolBar.setIconSize(iface.iconSize())
@@ -70,8 +66,6 @@ def __init__(self, filePath=None, parent=None):
7066
QgsApplication.getThemeIcon('/mActionFileSave.svg'))
7167
self.actionSaveScriptAs.setIcon(
7268
QgsApplication.getThemeIcon('/mActionFileSaveAs.svg'))
73-
self.actionEditScriptHelp.setIcon(
74-
QgsApplication.getThemeIcon('/mActionEditHelpContent.svg'))
7569
self.actionRunScript.setIcon(
7670
QgsApplication.getThemeIcon('/mActionStart.svg'))
7771
self.actionCut.setIcon(
@@ -95,7 +89,6 @@ def __init__(self, filePath=None, parent=None):
9589
self.actionOpenScript.triggered.connect(self.openScript)
9690
self.actionSaveScript.triggered.connect(self.save)
9791
self.actionSaveScriptAs.triggered.connect(self.saveAs)
98-
#self.actionEditScriptHelp.triggered.connect(self.editHelp)
9992
self.actionRunScript.triggered.connect(self.runAlgorithm)
10093
self.actionCut.triggered.connect(self.editor.cut)
10194
self.actionCopy.triggered.connect(self.editor.copy)

‎python/plugins/processing/script/ScriptUtils.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
from qgis.core import QgsProcessingAlgorithm, QgsMessageLog
3535

3636
from processing.core.ProcessingConfig import ProcessingConfig
37-
38-
from processing.script.ScriptAlgorithm import ScriptAlgorithm
39-
from processing.script.WrongScriptException import WrongScriptException
40-
4137
from processing.tools.system import mkdir, userFolder
4238

4339

‎python/plugins/processing/script/WrongScriptException.py‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎python/plugins/processing/script/snippets.py‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎python/plugins/processing/tests/AlgorithmsTestBase.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
from utilities import unitTestDataPath
5656

5757
import processing
58-
from processing.script.ScriptAlgorithm import ScriptAlgorithm # NOQA
5958

6059

6160
def processingTestDataPath():
@@ -87,13 +86,8 @@ def check_algorithm(self, name, defs):
8786

8887
params = self.load_params(defs['params'])
8988

90-
if defs['algorithm'].startswith('script:'):
91-
filePath = os.path.join(processingTestDataPath(), 'scripts', '{}.py'.format(defs['algorithm'][len('script:'):]))
92-
alg = ScriptAlgorithm(filePath)
93-
alg.initAlgorithm()
94-
else:
95-
print('Running alg: "{}"'.format(defs['algorithm']))
96-
alg = QgsApplication.processingRegistry().createAlgorithmById(defs['algorithm'])
89+
print('Running alg: "{}"'.format(defs['algorithm']))
90+
alg = QgsApplication.processingRegistry().createAlgorithmById(defs['algorithm'])
9791

9892
parameters = {}
9993
if isinstance(params, list):

‎python/plugins/processing/tests/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ IF(ENABLE_TESTS)
1111
ADD_PYTHON_TEST(ProcessingToolsTest ToolsTest.py)
1212
ADD_PYTHON_TEST(ProcessingQgisAlgorithmsTest QgisAlgorithmsTest.py)
1313
ADD_PYTHON_TEST(ProcessingGdalAlgorithmsTest GdalAlgorithmsTest.py)
14-
ADD_PYTHON_TEST(ProcessingScriptAlgorithmsTest ScriptAlgorithmsTest.py)
1514
ADD_PYTHON_TEST(ProcessingGrass7AlgorithmsImageryTest Grass7AlgorithmsImageryTest.py)
1615
ADD_PYTHON_TEST(ProcessingGrass7AlgorithmsRasterTest Grass7AlgorithmsRasterTest.py)
1716
ADD_PYTHON_TEST(ProcessingSagaAlgorithmsTest SagaAlgorithmsTest.py)

‎python/plugins/processing/tests/ScriptAlgorithmsTest.py‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎python/plugins/processing/ui/DlgScriptEditor.ui‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
<addaction name="actionSaveScript"/>
108108
<addaction name="actionSaveScriptAs"/>
109109
<addaction name="separator"/>
110-
<addaction name="actionEditScriptHelp"/>
111110
<addaction name="separator"/>
112111
<addaction name="actionRunScript"/>
113112
<addaction name="separator"/>
@@ -156,14 +155,6 @@
156155
<string>Ctrl+Shift+S</string>
157156
</property>
158157
</action>
159-
<action name="actionEditScriptHelp">
160-
<property name="text">
161-
<string>Edit script help</string>
162-
</property>
163-
<property name="toolTip">
164-
<string>Edit script help</string>
165-
</property>
166-
</action>
167158
<action name="actionRunScript">
168159
<property name="text">
169160
<string>Run script</string>
@@ -251,7 +242,7 @@
251242
<bool>true</bool>
252243
</property>
253244
<property name="text">
254-
<string>FindReplace</string>
245+
<string>Find &amp; replace</string>
255246
</property>
256247
</action>
257248
</widget>

0 commit comments

Comments
 (0)
Please sign in to comment.