Skip to content
Snippets Groups Projects
Commit 9a2a2976 authored by Sepehr Madani's avatar Sepehr Madani
Browse files

Removed redundant arguments from Parameter

parent 3174cec0
No related branches found
No related tags found
No related merge requests found
...@@ -24,8 +24,8 @@ class Parameter: ...@@ -24,8 +24,8 @@ class Parameter:
self.min = min self.min = min
self.max = max self.max = max
def scaleTo100Ratio(self, value) -> int: def scaleTo100Ratio(self) -> int:
return int(100 * ((value - self.min) / (self.max - self.min))) return int(100 * ((self.value - self.min) / (self.max - self.min)))
def scaleFrom100Ratio(self, ratio_value) -> float: def scaleFrom100Ratio(self, ratio_value) -> float:
return self.min + (ratio_value / 100) * (self.max - self.min) return self.min + (ratio_value / 100) * (self.max - self.min)
...@@ -141,7 +141,7 @@ class MainWindow(QMainWindow): ...@@ -141,7 +141,7 @@ class MainWindow(QMainWindow):
newSlider.setSizePolicy(expandingSizePolicy) newSlider.setSizePolicy(expandingSizePolicy)
newSlider.setMinimumSize(QSize(100, 0)) newSlider.setMinimumSize(QSize(100, 0))
newSlider.setRange(0, 100) newSlider.setRange(0, 100)
newSlider.setValue(parameter.scaleTo100Ratio(parameter.value)) newSlider.setValue(parameter.scaleTo100Ratio())
newSlider.setTickPosition(QSlider.TicksBelow) newSlider.setTickPosition(QSlider.TicksBelow)
newSlider.setTickInterval(5) newSlider.setTickInterval(5)
newSlider.valueChanged.connect( newSlider.valueChanged.connect(
...@@ -203,36 +203,36 @@ class MainWindow(QMainWindow): ...@@ -203,36 +203,36 @@ class MainWindow(QMainWindow):
# try: # try:
# newValue = float(lineEdit.text()) # newValue = float(lineEdit.text())
# parameter.value = newValue # parameter.value = newValue
# slider.setValue(parameter.scaleTo100Ratio(newValue)) # slider.setValue(parameter.scaleTo100Ratio())
# except ValueError: # except ValueError:
# pass # pass
# if source == None: # if source == None:
# newValue = round(parameter.value, 4) # newValue = round(parameter.value, 4)
# slider.setValue(parameter.scaleTo100Ratio(newValue)) # slider.setValue(parameter.scaleTo100Ratio())
# lineEdit.setText(str(newValue)) # lineEdit.setText(str(newValue))
# self.update_chart() # self.update_chart()
def update_parameters(self, source=None): def update_parameters(self, source=None):
for idx in range(len(self.parameterSet)): if source == QSlider:
if source == QSlider: for idx in range(len(self.parameterSet)):
newValue = self.parameterSet[idx].scaleFrom100Ratio(self.sliderList[idx].value()) newValue = self.parameterSet[idx].scaleFrom100Ratio(self.sliderList[idx].value())
self.parameterSet[idx].value = newValue self.parameterSet[idx].value = newValue
self.lineEditList[idx].setText(str(newValue)) self.lineEditList[idx].setText(str(newValue))
if source == QLineEdit: if source == QLineEdit:
for idx in range(len(self.parameterSet)):
try: try:
newValue = float(self.lineEditList[idx].text()) self.parameterSet[idx].value = float(self.lineEditList[idx].text())
self.parameterSet[idx].value = newValue self.sliderList[idx].setValue(self.parameterSet[idx].scaleTo100Ratio())
self.sliderList[idx].setValue(self.parameterSet[idx].scaleTo100Ratio(newValue))
except ValueError: except ValueError:
pass pass
if source == None: if source is None:
newValue = self.parameterSet[idx].value for idx in range(len(self.parameterSet)):
self.sliderList[idx].setValue(self.parameterSet[idx].scaleTo100Ratio(newValue)) self.sliderList[idx].setValue(self.parameterSet[idx].scaleTo100Ratio())
self.lineEditList[idx].setText(str(newValue)) self.lineEditList[idx].setText(str(self.parameterSet[idx].value))
self.update_chart() self.update_chart()
...@@ -270,13 +270,10 @@ class MainWindow(QMainWindow): ...@@ -270,13 +270,10 @@ class MainWindow(QMainWindow):
self.statusBar().showMessage("Ready") self.statusBar().showMessage("Ready")
def call_algorithm(self): def call_algorithm(self):
self.statusBar().showMessage("Re-running the algorithm...", 2000)
A = [x.value for x in self.parameterSet] A = [x.value for x in self.parameterSet]
self.parameterSet = self.paramBuilder.build_params() self.parameterSet = self.paramBuilder.build_params()
B = [x.value for x in self.parameterSet] B = [x.value for x in self.parameterSet]
diff = [int(100 * (a - b)) for a, b in zip(A, B)] diff = [int(100 * (a - b)) for a, b in zip(A, B)]
if sum(diff) > 25: if sum(list(map(abs, diff))) > 0:
print(diff) print(diff)
self.update_parameters() self.update_parameters()
print("chart updated") \ No newline at end of file
self.statusBar().showMessage("Ready")
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment