3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Adding the replacement text for the maybe corrected formula

Browse source 
CURA-10901
This commit is contained in:
Saumya Jain 2024-04-09 16:10:27 +02:00
parent eecf9cdebf
commit 9db52e3888
1 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

46
printer-linter/src/printerlinter/linters/formulas.py
View file

@ -7,6 +7,7 @@ from typing import Iterator
from cura.Settings.CuraFormulaFunctions import CuraFormulaFunctions from cura.Settings.CuraFormulaFunctions import CuraFormulaFunctions
from ..diagnostic import Diagnostic from ..diagnostic import Diagnostic
from ..replacement import Replacement
from .linter import Linter from .linter import Linter
from configparser import ConfigParser from configparser import ConfigParser
@ -21,7 +22,7 @@ class Formulas(Linter):
def check(self) -> Iterator[Diagnostic]: def check(self) -> Iterator[Diagnostic]:
if self._settings["checks"].get("diagnostic-incorrect-formula", False): if self._settings["checks"].get("diagnostic-incorrect-formula", False):
for check in self.checkFormulas(): for check in self.checkFormulas:
yield check yield check
yield yield
@ -36,17 +37,38 @@ class Formulas(Linter):
for key, value_dict in definition["overrides"].items(): for key, value_dict in definition["overrides"].items():
for value in value_dict: for value in value_dict:
if value in ("enable", "resolve", "value", "minimum_value_warning", "maximum_value_warning", "maximum_value", "minimum_value"): if value in ("enable", "resolve", "value", "minimum_value_warning", "maximum_value_warning", "maximum_value", "minimum_value"):
value_incorrect = self.checkValueIncorrect(value_dict[value].strip("=")) value_incorrect = self.checkValueIncorrect(self._removeLeadingEqual(value_dict[value]))
if value_incorrect: if value_incorrect:
yield Diagnostic( if self._file.suffix =='.cfg':
key_with_incorrectValue = re.compile(r'(\b' + key + r'\b\s*=\s*[^=\n]+.*)')
else:
key_with_incorrectValue = re.compile(r'.*(\"' + key + r'\"[\s\:\S]*?)\{[\s\S]*?\},?')
found = key_with_incorrectValue.search(self._content)
if len(found.group().splitlines()) > 1:
replacements = []
else:
replacement_text = found.group().replace(self._removeLeadingEqual(value_dict[value]), self._correct_formula )
replacements = [Replacement(
file=self._file,
offset=found.span(1)[0],
length=len(found.group()),
replacement_text=replacement_text)]
yield Diagnostic(
file=self._file, file=self._file,
diagnostic_name="diagnostic-incorrect-formula", diagnostic_name="diagnostic-incorrect-formula",
message=f"Given formula {value_dict} to calulate {key} of seems incorrect, Do you mean {self._correct_formula}? please correct the formula and try again.", message=f"Given formula {value_dict} to calulate {key} of seems incorrect, Do you mean {self._correct_formula}? please correct the formula and try again.",
level="Error", level="Error",
offset=1 offset=found.span(0)[0],
) replacements=replacements
)
yield yield
def _removeLeadingEqual(self, input_value):
if isinstance(input_value, str) and input_value.startswith('='):
return input_value[1:]
return input_value
def _loadDefinitionFiles(self, definition_file) -> None: def _loadDefinitionFiles(self, definition_file) -> None:
""" Loads definition file contents into self._definition. Also load parent definition if it exists. """ """ Loads definition file contents into self._definition. Also load parent definition if it exists. """
definition_name = Path(definition_file.stem).stem definition_name = Path(definition_file.stem).stem
@ -79,12 +101,14 @@ class Formulas(Linter):
return file_data return file_data
def checkValueIncorrect(self, formula:str) -> bool: def checkValueIncorrect(self, formula) -> bool:
self._correct_formula = self._correctFormula(formula) if isinstance(formula, str):
if self._correct_formula == formula: self._correct_formula = self._correctFormula(formula)
return False if self._correct_formula == formula:
else: return False
return True return True
else:
return False
def _correctFormula(self, input_sentence: str) -> str: def _correctFormula(self, input_sentence: str) -> str:
# Find all alphanumeric words, '()' and content inside them, and punctuation # Find all alphanumeric words, '()' and content inside them, and punctuation