diff --git a/modules/gui/pymod/scene/custom_widget.py b/modules/gui/pymod/scene/custom_widget.py index be2e434a3455d36ea702d4af00442f370c3fb4fc..85a5bcd258dfdf025281ce1db375c21e5a4a7af2 100644 --- a/modules/gui/pymod/scene/custom_widget.py +++ b/modules/gui/pymod/scene/custom_widget.py @@ -64,7 +64,7 @@ class CustomWidget(RenderModeWidget): self.radius_bond_spinbox_.setSingleStep(0.05) self.radius_bond_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.radius_bond_slider_.setRange(min_rad*100.0, max_bond_rad*100.0) + self.radius_bond_slider_.setRange(int(min_rad*100.0), int(max_bond_rad*100.0)) self.radius_bond_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.radius_bond_slider_.setTickInterval(5) @@ -78,7 +78,7 @@ class CustomWidget(RenderModeWidget): self.radius_sphere_spinbox_.setSingleStep(0.05) self.radius_sphere_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.radius_sphere_slider_.setRange(min_rad*100.0, max_sphere_rad*100.0) + self.radius_sphere_slider_.setRange(int(min_rad*100.0), int(max_sphere_rad*100.0)) self.radius_sphere_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.radius_sphere_slider_.setTickInterval(5) @@ -148,14 +148,14 @@ class CustomWidget(RenderModeWidget): def UpdateSphereRadiusGui(self,value): value = round(value, 2) if(abs(value*100.0 - self.radius_sphere_slider_.value())>=self.radius_sphere_slider_.singleStep()): - self.radius_sphere_slider_.setValue(value*100.0) + self.radius_sphere_slider_.setValue(int(value*100.0)) if (abs(value - self.radius_sphere_spinbox_.value())>=self.radius_sphere_spinbox_.singleStep()): self.radius_sphere_spinbox_.setValue(value) def UpdateBondRadiusGui(self,value): value = round(value, 2) if(abs(value*100.0 - self.radius_bond_slider_.value())>=self.radius_bond_slider_.singleStep()): - self.radius_bond_slider_.setValue(value*100.0) + self.radius_bond_slider_.setValue(int(value*100.0)) if (abs(value - self.radius_bond_spinbox_.value())>=self.radius_bond_spinbox_.singleStep()): self.radius_bond_spinbox_.setValue(value) diff --git a/modules/gui/pymod/scene/gradient_editor_widget.py b/modules/gui/pymod/scene/gradient_editor_widget.py index 2b5a69f227e16b39524e0cab2695d0da6eb8774f..e64fe6d64ee1a1985dbdb6326fb6b5689420d531 100644 --- a/modules/gui/pymod/scene/gradient_editor_widget.py +++ b/modules/gui/pymod/scene/gradient_editor_widget.py @@ -284,7 +284,7 @@ class MyGradientStop(ColorSelectWidget): return rel def MoveToNewPos(self): - self.move(self.pos_ - self.halflength_, 0) + self.move(int(self.pos_ - self.halflength_), 0) self.update() self.gradientChanged.emit() diff --git a/modules/gui/pymod/scene/hsc_widget.py b/modules/gui/pymod/scene/hsc_widget.py index ea6292258fd4dc5263344cfdbe53cd0d97c63892..6aaac94883c3aef40bd104b078554f4929d5572c 100644 --- a/modules/gui/pymod/scene/hsc_widget.py +++ b/modules/gui/pymod/scene/hsc_widget.py @@ -92,7 +92,7 @@ class HSCWidget(RenderModeWidget): self.width_tube_spinbox_.setSingleStep(0.1) self.width_tube_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.width_tube_slider_.setRange(min_width*10.0, max_tube_width*10.0) + self.width_tube_slider_.setRange(int(min_width*10.0), int(max_tube_width*10.0)) self.width_tube_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.width_tube_slider_.setTickInterval(1) @@ -105,7 +105,7 @@ class HSCWidget(RenderModeWidget): self.thickness_tube_spinbox_.setSingleStep(0.1) self.thickness_tube_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.thickness_tube_slider_.setRange(min_tube_ratio*10.0, max_tube_ratio*10) + self.thickness_tube_slider_.setRange(int(min_tube_ratio*10.0), int(max_tube_ratio*10)) self.thickness_tube_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.thickness_tube_slider_.setTickInterval(1) @@ -128,7 +128,7 @@ class HSCWidget(RenderModeWidget): self.width_helix_spinbox_.setSingleStep(0.1) self.width_helix_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.width_helix_slider_.setRange(min_width*10.0, max_width*10.0) + self.width_helix_slider_.setRange(int(min_width*10.0), int(max_width*10.0)) self.width_helix_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.width_helix_slider_.setTickInterval(1) @@ -141,7 +141,7 @@ class HSCWidget(RenderModeWidget): self.thickness_helix_spinbox_.setSingleStep(0.1) self.thickness_helix_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.thickness_helix_slider_.setRange(min_ratio*10.0,max_ratio*10.0) + self.thickness_helix_slider_.setRange(int(min_ratio*10.0), int(max_ratio*10.0)) self.thickness_helix_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.thickness_helix_slider_.setTickInterval(1) @@ -154,7 +154,7 @@ class HSCWidget(RenderModeWidget): self.ecc_helix_spinbox_.setSingleStep(0.1) self.ecc_helix_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.ecc_helix_slider_.setRange(min_ecc*10,max_ecc*10) + self.ecc_helix_slider_.setRange(int(min_ecc*10), int(max_ecc*10)) self.ecc_helix_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.ecc_helix_slider_.setTickInterval(1) @@ -182,7 +182,7 @@ class HSCWidget(RenderModeWidget): self.width_strand_spinbox_.setSingleStep(0.1) self.width_strand_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.width_strand_slider_.setRange(min_width*10, max_width*10) + self.width_strand_slider_.setRange(int(min_width*10), int(max_width*10)) self.width_strand_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.width_strand_slider_.setTickInterval(1) @@ -195,7 +195,7 @@ class HSCWidget(RenderModeWidget): self.thickness_strand_spinbox_.setSingleStep(0.1) self.thickness_strand_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.thickness_strand_slider_.setRange(min_ratio*10,max_ratio*10) + self.thickness_strand_slider_.setRange(int(min_ratio*10),int(max_ratio*10)) self.thickness_strand_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.thickness_strand_slider_.setTickInterval(1) @@ -208,7 +208,7 @@ class HSCWidget(RenderModeWidget): self.ecc_strand_spinbox_.setSingleStep(0.1) self.ecc_strand_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.ecc_strand_slider_.setRange(min_ecc*10,max_ecc*10) + self.ecc_strand_slider_.setRange(int(min_ecc*10), int(max_ecc*10)) self.ecc_strand_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.ecc_strand_slider_.setTickInterval(1) @@ -439,56 +439,56 @@ class HSCWidget(RenderModeWidget): def UpdateTubeRadiusGui(self,value): value = round(value, 2) if(abs(value*10.0 - self.width_tube_slider_.value())>=self.width_tube_slider_.singleStep()): - self.width_tube_slider_.setValue(value*10.0) + self.width_tube_slider_.setValue(int(value*10.0)) if(abs(value - self.width_tube_spinbox_.value())>=self.width_tube_spinbox_.singleStep()): self.width_tube_spinbox_.setValue(value) def UpdateTubeRatioGui(self,value): value = round(value, 2) if(abs(value*10.0 - self.thickness_tube_slider_.value())>=self.thickness_tube_slider_.singleStep()): - self.thickness_tube_slider_.setValue(value*10.0) + self.thickness_tube_slider_.setValue(int(value*10.0)) if(abs(value - self.thickness_tube_spinbox_.value())>=self.thickness_tube_spinbox_.singleStep()): self.thickness_tube_spinbox_.setValue(value) def UpdateHelixWidthGui(self, value): value = round(value, 2) if(abs(value*10.0 - self.width_helix_slider_.value())>=self.width_helix_slider_.singleStep()): - self.width_helix_slider_.setValue(value*10.0) + self.width_helix_slider_.setValue(int(value*10.0)) if(abs(value - self.width_helix_spinbox_.value())>=self.width_helix_spinbox_.singleStep()): self.width_helix_spinbox_.setValue(value) def UpdateHelixThicknessGui(self, value): value = round(value, 2) if(abs(value*10.0 - self.thickness_helix_slider_.value())>=self.thickness_helix_slider_.singleStep()): - self.thickness_helix_slider_.setValue(value*10.0) + self.thickness_helix_slider_.setValue(int(value*10.0)) if(abs(value - self.thickness_helix_spinbox_.value())>=self.thickness_helix_spinbox_.singleStep()): self.thickness_helix_spinbox_.setValue(value) def UpdateHelixEccGui(self, value): value = round(value, 2) if(abs(value*10.0 - self.ecc_helix_slider_.value())>=self.ecc_helix_slider_.singleStep()): - self.ecc_helix_slider_.setValue(value*10.0) + self.ecc_helix_slider_.setValue(int(value*10.0)) if(abs(value - self.ecc_helix_spinbox_.value())>=self.ecc_helix_spinbox_.singleStep()): self.ecc_helix_spinbox_.setValue(value) def UpdateStrandWidthGui(self, value): value = round(value, 2) if(abs(value*10.0 - self.width_strand_slider_.value())>=self.width_strand_slider_.singleStep()): - self.width_strand_slider_.setValue(value*10.0) + self.width_strand_slider_.setValue(int(value*10.0)) if(abs(value - self.width_strand_spinbox_.value())>=self.width_strand_spinbox_.singleStep()): self.width_strand_spinbox_.setValue(value) def UpdateStrandThicknessGui(self, value): value = round(value, 2) if(abs(value*10.0 - self.thickness_strand_slider_.value())>=self.thickness_strand_slider_.singleStep()): - self.thickness_strand_slider_.setValue(value*10.0) + self.thickness_strand_slider_.setValue(int(value*10.0)) if(abs(value - self.thickness_strand_spinbox_.value())>=self.thickness_strand_spinbox_.singleStep()): self.thickness_strand_spinbox_.setValue(value) def UpdateStrandEccGui(self, value): value = round(value, 2) if(abs(value*10.0 - self.ecc_strand_slider_.value())>=self.ecc_strand_slider_.singleStep()): - self.ecc_strand_slider_.setValue(value*10.0) + self.ecc_strand_slider_.setValue(int(value*10.0)) if(abs(value - self.ecc_strand_spinbox_.value())>=self.ecc_strand_spinbox_.singleStep()): self.ecc_strand_spinbox_.setValue(value) diff --git a/modules/gui/pymod/scene/immutable_gradient_info_handler.py b/modules/gui/pymod/scene/immutable_gradient_info_handler.py index ca59ac92d4f62f0ce56f4a811885a1978d191594..aa89680a1aee6950c91541ff8fe21dce7cf78884 100644 --- a/modules/gui/pymod/scene/immutable_gradient_info_handler.py +++ b/modules/gui/pymod/scene/immutable_gradient_info_handler.py @@ -65,10 +65,10 @@ class ImmutableGradientInfoHandler: qgrad = QtGui.QLinearGradient() for stop in stops: color = stop.GetColor() - qcolor = QtGui.QColor(color.Red()*255, - color.Green()*255, - color.Blue()*255, - color.Alpha()*255) + qcolor = QtGui.QColor(int(color.Red()*255), + int(color.Green()*255), + int(color.Blue()*255), + int(color.Alpha()*255)) qgrad.setColorAt(stop.GetRel(), qcolor) return qgrad diff --git a/modules/gui/pymod/scene/trace_widget.py b/modules/gui/pymod/scene/trace_widget.py index b0eaf20c2d777069d6d3205af5ac6fba4dc615d0..64e1abb2ece66fd367759e4d13f2af22fbc62a98 100644 --- a/modules/gui/pymod/scene/trace_widget.py +++ b/modules/gui/pymod/scene/trace_widget.py @@ -58,7 +58,7 @@ class TraceWidget(RenderModeWidget): self.width_tube_spinbox_.setSingleStep(0.1) self.width_tube_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.width_tube_slider_.setRange(min_width*10.0, max_tube_width*10.0) + self.width_tube_slider_.setRange(int(min_width*10.0), int(max_tube_width*10.0)) self.width_tube_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.width_tube_slider_.setTickInterval(1) @@ -101,7 +101,7 @@ class TraceWidget(RenderModeWidget): def UpdateTubeRadiusGui(self,value): value = round(value, 2) if(abs(value*10.0 - self.width_tube_slider_.value())>=self.width_tube_slider_.singleStep()): - self.width_tube_slider_.setValue(value*10.0) + self.width_tube_slider_.setValue(int(value*10.0)) if(abs(value - self.width_tube_spinbox_.value())>=self.width_tube_spinbox_.singleStep()): self.width_tube_spinbox_.setValue(value) diff --git a/modules/gui/pymod/scene/tube_widget.py b/modules/gui/pymod/scene/tube_widget.py index 3413373d92698c2df01111bb4619b7c33b01498f..517b58dc395314eb6355dccf390c72ce460f488c 100644 --- a/modules/gui/pymod/scene/tube_widget.py +++ b/modules/gui/pymod/scene/tube_widget.py @@ -82,7 +82,7 @@ class TubeWidget(RenderModeWidget): self.radius_spinbox_.setSingleStep(0.1) self.radius_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.radius_slider_.setRange(min_radius*10.0, max_radius*10.0) + self.radius_slider_.setRange(int(min_radius*10.0), int(max_radius*10.0)) self.radius_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.radius_slider_.setTickInterval(1) @@ -94,7 +94,7 @@ class TubeWidget(RenderModeWidget): self.ratio_spinbox_.setDecimals(1) self.ratio_spinbox_.setSingleStep(0.1) self.ratio_slider_ = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) - self.ratio_slider_.setRange(min_ratio*10.0, max_ratio*10.0) + self.ratio_slider_.setRange(int(min_ratio*10.0), int(max_ratio*10.0)) self.ratio_slider_.setTickPosition(QtWidgets.QSlider.NoTicks) self.ratio_slider_.setTickInterval(2) @@ -160,14 +160,14 @@ class TubeWidget(RenderModeWidget): def UpdateRadiusGui(self,value): value = round(value, 2) if(abs(value*10.0 - self.radius_slider_.value())>=self.radius_slider_.singleStep()): - self.radius_slider_.setValue(value*10.0) + self.radius_slider_.setValue(int(value*10.0)) if(abs(value - self.radius_spinbox_.value())>=self.radius_spinbox_.singleStep()): self.radius_spinbox_.setValue(value) def UpdateRatioGui(self,value): value = round(value, 2) if(abs(value*10.0 - self.ratio_slider_.value())>=self.ratio_slider_.singleStep()): - self.ratio_slider_.setValue(value*10.0) + self.ratio_slider_.setValue(int(value*10.0)) if(abs(value - self.ratio_spinbox_.value())>=self.ratio_spinbox_.singleStep()): self.ratio_spinbox_.setValue(value)