Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev workflow refactor #806

Merged
merged 25 commits into from
May 31, 2024
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
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CHANGELOG

## 4.13.48 - dev
## 4.13.49 - dev

Novas Funcionalidades:

Expand Down Expand Up @@ -37,6 +37,9 @@ Melhorias:
- Adiciona a opção de permitir linhas fechadas no processamento de unir linhas (utilizado para fechar curvas de nível em processamentos específicos de estilos na edição);
- Altera o valor default da ferramenta de revisão para Pan to Next;
- Adiciona a melhoria no menu de reclassificação para puxar os campos idênticos da camada de origem;
- Workflow refatorado para corrigir constantes crashes durante a utilização;
- Alterada a forma de importar e exportar os modelos de dentro do workflow;
- Alterada a interface de gerência de flags na construção do workflow (combo box selecionando as saídas);


Correção de bug:
Expand Down Expand Up @@ -389,4 +392,4 @@ Correção de bugs:
- O problema onde a Ferramenta de Aquisição com Ângulos Retos e a Ferramenta de Aquisição à Mão Livre não atribuíam os valores padrões nos formulários da feição foi corrigido
- Correção nos processings de geração de MI: remover MI que não existem

Changelog completo: <https://github.com/dsgoficial/DsgTools/wiki/Changelog-4.3>
Changelog completo: <https://github.com/dsgoficial/DsgTools/wiki/Changelog-4.3>
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def processAlgorithm(self, parameters, context, feedback):
elif len(inputJSONData) > 0:
self.loadThemes(inputJSONData)
return {self.OUTPUT: []}

def loadExpressionFieldFromJSONFile(self, inputJSONFile):
with open(inputJSONFile, "r") as f:
inputJSONData = json.load(f)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ def processAlgorithm(self, parameters, context, feedback):
nSteps = len(layerList)
multiStepFeedback = QgsProcessingMultiStepFeedback(nSteps, feedback)
for idx, layer_id in enumerate(layerList):
if feedback.isCanceled():
break
layer = QgsProcessingUtils.mapLayerFromString(layer_id, context)
layerName = layer.name()
multiStepFeedback.setCurrentStep(idx)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ def processAlgorithm(self, parameters, context, feedback):
nSteps = len(layerList)
multiStepFeedback = QgsProcessingMultiStepFeedback(nSteps, feedback)
for idx, layer_id in enumerate(layerList):
if feedback.isCanceled():
break
layer = QgsProcessingUtils.mapLayerFromString(layer_id, context)
layerName = layer.name()
multiStepFeedback.setCurrentStep(idx)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def processAlgorithm(self, parameters, context, feedback):

for current, feature in enumerate(features):
if feedback.isCanceled():
break
return {}
if not feature.geometry():
target.deleteFeature(feature.id())
feedback.setProgress(int(current * total))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ def processAlgorithm(self, parameters, context, feedback):
parameters, self.GEOGRAPHIC_BOUNDARY, context
)


nSteps = 9 if geographicBoundaryLyr is None else 10
multiStepFeedback = QgsProcessingMultiStepFeedback(nSteps, feedback)
currentStep = 0
Expand Down
Loading
Loading