Skip to content

Commit 68ddd38

Browse files
amrit3701amrit3701
committed
Fixed pre-commit hooks
1 parent e784c02 commit 68ddd38

21 files changed

+354
-102
lines changed

‎.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ exclude: >
88
)$
99
minimum_pre_commit_version: 1.13.0
1010
repos:
11-
- repo: https://github.com/ambv/black
12-
rev: 20.8b1
11+
- repo: https://github.com/psf/black
12+
rev: 23.9.1
1313
hooks:
1414
- id: black
1515
- repo: https://github.com/pre-commit/pre-commit-hooks
1616
rev: v2.2.1
1717
hooks:
1818
- id: end-of-file-fixer
1919
- id: trailing-whitespace
20-
- repo: https://gitlab.com/pycqa/flake8
20+
- repo: https://github.com/pycqa/flake8
2121
rev: 3.7.7
2222
hooks:
2323
- id: flake8

‎BeamReinforcement/HookExtensionEditDialog.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,19 @@ def setupUi(self):
5757
self.addSet()
5858
if self.HookExtensionTuple[layer - 1][i] is None:
5959
self.HookExtensionInputFieldList[layer - 1][i].setText(
60-
FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString
60+
FreeCAD.Units.Quantity(
61+
40.0, FreeCAD.Units.Length
62+
).UserString
6163
)
6264
self.HookExtensionInputFieldList[layer - 1][i].setEnabled(
6365
False
6466
)
6567
else:
6668
self.HookExtensionInputFieldList[layer - 1][i].setText(
67-
FreeCAD.Units.Quantity(self.HookExtensionTuple[layer - 1][i], FreeCAD.Units.Length).UserString
69+
FreeCAD.Units.Quantity(
70+
self.HookExtensionTuple[layer - 1][i],
71+
FreeCAD.Units.Length,
72+
).UserString
6873
)
6974
self.HookExtensionInputFieldList[layer - 1][i].setEnabled(
7075
True
@@ -102,7 +107,9 @@ def addSet(self):
102107
hook_extension = ui.createWidget("Gui::InputField")
103108
hook_extension.setProperty("unit", "mm")
104109
hook_extension.setProperty("minimum", 10)
105-
hook_extension.setText(FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString)
110+
hook_extension.setText(
111+
FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString
112+
)
106113
h_layout.addWidget(set_label)
107114
h_layout.addWidget(hook_extension)
108115
v_layout = self.form.verticalLayout

‎BeamReinforcement/LayerSpacingEditDialog.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ def setupUi(self):
5353
for layer in range(1, layers_count + 1):
5454
self.addLayer()
5555
self.LayerSpacingInputFieldList[layer - 1].setText(
56-
FreeCAD.Units.Quantity(self.LayerSpacingTuple[layer - 1], FreeCAD.Units.Length).UserString
56+
FreeCAD.Units.Quantity(
57+
self.LayerSpacingTuple[layer - 1], FreeCAD.Units.Length
58+
).UserString
5759
)
5860

5961
def connectSignalSlots(self):
@@ -68,7 +70,9 @@ def addLayer(self):
6870
ui = FreeCADGui.UiLoader()
6971
layer_spacing = ui.createWidget("Gui::InputField")
7072
layer_spacing.setProperty("unit", "mm")
71-
layer_spacing.setText(FreeCAD.Units.Quantity(30.0, FreeCAD.Units.Length).UserString)
73+
layer_spacing.setText(
74+
FreeCAD.Units.Quantity(30.0, FreeCAD.Units.Length).UserString
75+
)
7276
self.LayerSpacingInputFieldList.append(layer_spacing)
7377

7478
layout = self.form.formLayout

‎BeamReinforcement/NumberDiameterOffset.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,20 @@ def setupUi(self):
7474
][0]
7575
)
7676
diameter.setText(
77-
FreeCAD.Units.Quantity(
77+
FreeCAD.Units.Quantity(
7878
number_diameter_offset_dict["layer" + str(layer + 1)][
7979
sets - 1
80-
][1]
81-
, FreeCAD.Units.Length).UserString
80+
][1],
81+
FreeCAD.Units.Length,
82+
).UserString
8283
)
8384
offset.setText(
8485
FreeCAD.Units.Quantity(
8586
number_diameter_offset_dict["layer" + str(layer + 1)][
8687
sets - 1
87-
][2]
88-
, FreeCAD.Units.Length).UserString
88+
][2],
89+
FreeCAD.Units.Length,
90+
).UserString
8991
)
9092

9193
def connectSignalSlots(self):
@@ -125,15 +127,19 @@ def addSetButtonClicked(self, button):
125127
)
126128
)
127129
diameter.setProperty("unit", "mm")
128-
diameter.setText(FreeCAD.Units.Quantity(16.0, FreeCAD.Units.Length).UserString)
130+
diameter.setText(
131+
FreeCAD.Units.Quantity(16.0, FreeCAD.Units.Length).UserString
132+
)
129133
offset = ui.createWidget("Gui::InputField")
130134
offset.setSizePolicy(
131135
QtWidgets.QSizePolicy(
132136
QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed
133137
)
134138
)
135139
offset.setProperty("unit", "mm")
136-
offset.setText(FreeCAD.Units.Quantity(20.0, FreeCAD.Units.Length).UserString)
140+
offset.setText(
141+
FreeCAD.Units.Quantity(20.0, FreeCAD.Units.Length).UserString
142+
)
137143
h_layout.addWidget(set_label)
138144
h_layout.addWidget(number)
139145
h_layout.addWidget(diameter)

‎BeamReinforcement/ShearRebars_HookExtensionEditDialog.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,17 @@ def setupUi(self):
5252
for i in range(0, sets):
5353
self.addSet()
5454
if self.HookExtensionTuple[i] is None:
55-
self.HookExtensionInputFieldList[i].setText(FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString)
55+
self.HookExtensionInputFieldList[i].setText(
56+
FreeCAD.Units.Quantity(
57+
40.0, FreeCAD.Units.Length
58+
).UserString
59+
)
5660
self.HookExtensionInputFieldList[i].setEnabled(False)
5761
else:
5862
self.HookExtensionInputFieldList[i].setText(
59-
FreeCAD.Units.Quantity(self.HookExtensionTuple[i], FreeCAD.Units.Length).UserString
63+
FreeCAD.Units.Quantity(
64+
self.HookExtensionTuple[i], FreeCAD.Units.Length
65+
).UserString
6066
)
6167
self.HookExtensionInputFieldList[i].setEnabled(True)
6268

@@ -73,7 +79,9 @@ def addSet(self):
7379
hook_extension = ui.createWidget("Gui::InputField")
7480
hook_extension.setProperty("unit", "mm")
7581
hook_extension.setProperty("minimum", 10)
76-
hook_extension.setText(FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString)
82+
hook_extension.setText(
83+
FreeCAD.Units.Quantity(40.0, FreeCAD.Units.Length).UserString
84+
)
7785
form_layout = self.form.formLayout
7886
index = sets
7987
form_layout.insertRow(index, "Set " + str(sets + 1), hook_extension)

‎BeamReinforcement/ShearRebars_NumberDiameterOffset.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,16 @@ def setupUi(self):
6161
"set" + str(i + 1)
6262
]
6363
number.setValue(number_diameter_offset_tuple[i][0])
64-
diameter.setText(FreeCAD.Units.Quantity(number_diameter_offset_tuple[i][1], FreeCAD.Units.Length).UserString)
65-
offset.setText(FreeCAD.Units.Quantity(number_diameter_offset_tuple[i][2], FreeCAD.Units.Length).UserString)
64+
diameter.setText(
65+
FreeCAD.Units.Quantity(
66+
number_diameter_offset_tuple[i][1], FreeCAD.Units.Length
67+
).UserString
68+
)
69+
offset.setText(
70+
FreeCAD.Units.Quantity(
71+
number_diameter_offset_tuple[i][2], FreeCAD.Units.Length
72+
).UserString
73+
)
6674

6775
def connectSignalSlots(self):
6876
"""This function is used to connect different slots in UI to appropriate
@@ -99,15 +107,19 @@ def addSetButtonClicked(self):
99107
)
100108
)
101109
diameter.setProperty("unit", "mm")
102-
diameter.setText(FreeCAD.Units.Quantity(16.0, FreeCAD.Units.Length).UserString)
110+
diameter.setText(
111+
FreeCAD.Units.Quantity(16.0, FreeCAD.Units.Length).UserString
112+
)
103113
offset = ui.createWidget("Gui::InputField")
104114
offset.setSizePolicy(
105115
QtWidgets.QSizePolicy(
106116
QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed
107117
)
108118
)
109119
offset.setProperty("unit", "mm")
110-
offset.setText(FreeCAD.Units.Quantity(20.0, FreeCAD.Units.Length).UserString)
120+
offset.setText(
121+
FreeCAD.Units.Quantity(20.0, FreeCAD.Units.Length).UserString
122+
)
111123
h_layout.addWidget(set_label)
112124
h_layout.addWidget(number)
113125
h_layout.addWidget(diameter)

‎BentShapeRebar.py

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -682,13 +682,41 @@ def editBentShapeRebar(
682682
def editDialog(vobj):
683683
FreeCADGui.Control.closeDialog()
684684
obj = _BentShapeRebarTaskPanel(vobj.Object)
685-
obj.form.frontCover.setText(FreeCAD.Units.Quantity(vobj.Object.FrontCover, FreeCAD.Units.Length).UserString)
686-
obj.form.l_sideCover.setText(FreeCAD.Units.Quantity(vobj.Object.LeftCover, FreeCAD.Units.Length).UserString)
687-
obj.form.r_sideCover.setText(FreeCAD.Units.Quantity(vobj.Object.RightCover, FreeCAD.Units.Length).UserString)
688-
obj.form.bottomCover.setText(FreeCAD.Units.Quantity(vobj.Object.BottomCover, FreeCAD.Units.Length).UserString)
689-
obj.form.diameter.setText(FreeCAD.Units.Quantity(vobj.Object.Diameter, FreeCAD.Units.Length).UserString)
690-
obj.form.topCover.setText(FreeCAD.Units.Quantity(vobj.Object.TopCover, FreeCAD.Units.Length).UserString)
691-
obj.form.bentLength.setText(FreeCAD.Units.Quantity(vobj.Object.BentLength, FreeCAD.Units.Length).UserString)
685+
obj.form.frontCover.setText(
686+
FreeCAD.Units.Quantity(
687+
vobj.Object.FrontCover, FreeCAD.Units.Length
688+
).UserString
689+
)
690+
obj.form.l_sideCover.setText(
691+
FreeCAD.Units.Quantity(
692+
vobj.Object.LeftCover, FreeCAD.Units.Length
693+
).UserString
694+
)
695+
obj.form.r_sideCover.setText(
696+
FreeCAD.Units.Quantity(
697+
vobj.Object.RightCover, FreeCAD.Units.Length
698+
).UserString
699+
)
700+
obj.form.bottomCover.setText(
701+
FreeCAD.Units.Quantity(
702+
vobj.Object.BottomCover, FreeCAD.Units.Length
703+
).UserString
704+
)
705+
obj.form.diameter.setText(
706+
FreeCAD.Units.Quantity(
707+
vobj.Object.Diameter, FreeCAD.Units.Length
708+
).UserString
709+
)
710+
obj.form.topCover.setText(
711+
FreeCAD.Units.Quantity(
712+
vobj.Object.TopCover, FreeCAD.Units.Length
713+
).UserString
714+
)
715+
obj.form.bentLength.setText(
716+
FreeCAD.Units.Quantity(
717+
vobj.Object.BentLength, FreeCAD.Units.Length
718+
).UserString
719+
)
692720
obj.form.bentAngle.setValue(vobj.Object.BentAngle)
693721
obj.form.rounding.setValue(vobj.Object.Rounding)
694722
obj.form.orientationValue.setCurrentIndex(
@@ -701,7 +729,11 @@ def editDialog(vobj):
701729
obj.form.spacing_radio.setChecked(True)
702730
obj.form.amount.setDisabled(True)
703731
obj.form.spacing.setEnabled(True)
704-
obj.form.spacing.setText(FreeCAD.Units.Quantity(vobj.Object.TrueSpacing, FreeCAD.Units.Length).UserString)
732+
obj.form.spacing.setText(
733+
FreeCAD.Units.Quantity(
734+
vobj.Object.TrueSpacing, FreeCAD.Units.Length
735+
).UserString
736+
)
705737
# obj.form.PickSelectedFace.setVisible(False)
706738
FreeCADGui.Control.showDialog(obj)
707739

‎BillOfMaterial/BOMPreferences.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ def getDiaWeightMap(self) -> Dict[float, FreeCAD.Units.Quantity]:
352352
dia_weight_map = {}
353353
for dia in self.dia_weight_map.GetFloats():
354354
weight = self.dia_weight_map.GetFloat(dia)
355-
weight = FreeCAD.Units.Quantity(str(weight * 10 ** 3) + "kg/m")
355+
weight = FreeCAD.Units.Quantity(str(weight * 10**3) + "kg/m")
356356
dia_weight_map[int(dia)] = weight
357357
return dia_weight_map
358358

‎ColumnReinforcement/MainColumnReinforcement.py

Lines changed: 66 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,26 @@ def setDefaultValues(self):
132132
self.form.ties_configuration.setCurrentIndex(
133133
self.form.ties_configuration.findText("SingleTie")
134134
)
135-
self.ties_widget.ties_leftCover.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
136-
self.ties_widget.ties_rightCover.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
137-
self.ties_widget.ties_topCover.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
138-
self.ties_widget.ties_bottomCover.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
135+
self.ties_widget.ties_leftCover.setText(
136+
FreeCAD.Units.Quantity(40.00, "mm").UserString
137+
)
138+
self.ties_widget.ties_rightCover.setText(
139+
FreeCAD.Units.Quantity(40.00, "mm").UserString
140+
)
141+
self.ties_widget.ties_topCover.setText(
142+
FreeCAD.Units.Quantity(40.00, "mm").UserString
143+
)
144+
self.ties_widget.ties_bottomCover.setText(
145+
FreeCAD.Units.Quantity(40.00, "mm").UserString
146+
)
139147
self.ties_widget.ties_allCoversEqual.setChecked(True)
140148
self.tiesAllCoversEqualClicked()
141-
self.ties_widget.ties_offset.setText(FreeCAD.Units.Quantity(100.00, "mm").UserString)
142-
self.ties_widget.ties_diameter.setText(FreeCAD.Units.Quantity(8.00, "mm").UserString)
149+
self.ties_widget.ties_offset.setText(
150+
FreeCAD.Units.Quantity(100.00, "mm").UserString
151+
)
152+
self.ties_widget.ties_diameter.setText(
153+
FreeCAD.Units.Quantity(8.00, "mm").UserString
154+
)
143155
self.ties_widget.ties_bentAngle.setCurrentIndex(
144156
self.ties_widget.ties_bentAngle.findText("135")
145157
)
@@ -149,7 +161,9 @@ def setDefaultValues(self):
149161
self.ties_widget.ties_number.setEnabled(True)
150162
self.ties_widget.ties_spacing.setEnabled(False)
151163
self.ties_widget.ties_number.setValue(5)
152-
self.ties_widget.ties_spacing.setText(FreeCAD.Units.Quantity(100.00, "mm").UserString)
164+
self.ties_widget.ties_spacing.setText(
165+
FreeCAD.Units.Quantity(100.00, "mm").UserString
166+
)
153167
# Set Main Rebars data
154168
self.main_rebars_widget.main_rebars_type.setCurrentIndex(
155169
self.main_rebars_widget.main_rebars_type.findText("StraightRebar")
@@ -164,11 +178,19 @@ def setDefaultValues(self):
164178
"x-axis"
165179
)
166180
)
167-
self.main_rebars_widget.main_rebars_hookExtension.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
181+
self.main_rebars_widget.main_rebars_hookExtension.setText(
182+
FreeCAD.Units.Quantity(40.00, "mm").UserString
183+
)
168184
self.main_rebars_widget.main_rebars_rounding.setValue(2)
169-
self.main_rebars_widget.main_rebars_topOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
170-
self.main_rebars_widget.main_rebars_bottomOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
171-
self.main_rebars_widget.main_rebars_diameter.setText(FreeCAD.Units.Quantity(20.00, "mm").UserString)
185+
self.main_rebars_widget.main_rebars_topOffset.setText(
186+
FreeCAD.Units.Quantity(0.00, "mm").UserString
187+
)
188+
self.main_rebars_widget.main_rebars_bottomOffset.setText(
189+
FreeCAD.Units.Quantity(0.00, "mm").UserString
190+
)
191+
self.main_rebars_widget.main_rebars_diameter.setText(
192+
FreeCAD.Units.Quantity(20.00, "mm").UserString
193+
)
172194
# Set Secondary Xdir Rebars Data
173195
self.sec_xdir_rebars_widget.xdir_rebars_type.setCurrentIndex(
174196
self.sec_xdir_rebars_widget.xdir_rebars_type.findText(
@@ -184,8 +206,12 @@ def setDefaultValues(self):
184206
FreeCAD.Units.Quantity(40.00, "mm").UserString
185207
)
186208
self.sec_xdir_rebars_widget.xdir_rebars_rounding.setValue(1)
187-
self.sec_xdir_rebars_widget.xdir_rebars_topOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
188-
self.sec_xdir_rebars_widget.xdir_rebars_bottomOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
209+
self.sec_xdir_rebars_widget.xdir_rebars_topOffset.setText(
210+
FreeCAD.Units.Quantity(0.00, "mm").UserString
211+
)
212+
self.sec_xdir_rebars_widget.xdir_rebars_bottomOffset.setText(
213+
FreeCAD.Units.Quantity(0.00, "mm").UserString
214+
)
189215
self.sec_xdir_rebars_widget.numberDiameter.setText(
190216
"2#20mm+1#16mm+2#20mm"
191217
)
@@ -204,22 +230,40 @@ def setDefaultValues(self):
204230
FreeCAD.Units.Quantity(40.00, "mm").UserString
205231
)
206232
self.sec_ydir_rebars_widget.ydir_rebars_rounding.setValue(1)
207-
self.sec_ydir_rebars_widget.ydir_rebars_topOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
208-
self.sec_ydir_rebars_widget.ydir_rebars_bottomOffset.setText(FreeCAD.Units.Quantity(0.00, "mm").UserString)
233+
self.sec_ydir_rebars_widget.ydir_rebars_topOffset.setText(
234+
FreeCAD.Units.Quantity(0.00, "mm").UserString
235+
)
236+
self.sec_ydir_rebars_widget.ydir_rebars_bottomOffset.setText(
237+
FreeCAD.Units.Quantity(0.00, "mm").UserString
238+
)
209239
self.sec_ydir_rebars_widget.numberDiameter.setText(
210240
"1#20mm+1#16mm+1#20mm"
211241
)
212242
# Set circular column data
213-
self.circular_column_widget.sideCover.setText(FreeCAD.Units.Quantity(20.00, "mm").UserString)
214-
self.circular_column_widget.helical_rebars_topOffset.setText(FreeCAD.Units.Quantity(40.00, "mm").UserString)
243+
self.circular_column_widget.sideCover.setText(
244+
FreeCAD.Units.Quantity(20.00, "mm").UserString
245+
)
246+
self.circular_column_widget.helical_rebars_topOffset.setText(
247+
FreeCAD.Units.Quantity(40.00, "mm").UserString
248+
)
215249
self.circular_column_widget.helical_rebars_bottomOffset.setText(
216250
FreeCAD.Units.Quantity(40.00, "mm").UserString
217251
)
218-
self.circular_column_widget.pitch.setText(FreeCAD.Units.Quantity(50.00, "mm").UserString)
219-
self.circular_column_widget.helical_rebars_diameter.setText(FreeCAD.Units.Quantity(8.00, "mm").UserString)
220-
self.circular_column_widget.main_rebars_topOffset.setText(FreeCAD.Units.Quantity(20.00, "mm").UserString)
221-
self.circular_column_widget.main_rebars_bottomOffset.setText(FreeCAD.Units.Quantity(20.00, "mm").UserString)
222-
self.circular_column_widget.main_rebars_diameter.setText(FreeCAD.Units.Quantity(16.00, "mm").UserString)
252+
self.circular_column_widget.pitch.setText(
253+
FreeCAD.Units.Quantity(50.00, "mm").UserString
254+
)
255+
self.circular_column_widget.helical_rebars_diameter.setText(
256+
FreeCAD.Units.Quantity(8.00, "mm").UserString
257+
)
258+
self.circular_column_widget.main_rebars_topOffset.setText(
259+
FreeCAD.Units.Quantity(20.00, "mm").UserString
260+
)
261+
self.circular_column_widget.main_rebars_bottomOffset.setText(
262+
FreeCAD.Units.Quantity(20.00, "mm").UserString
263+
)
264+
self.circular_column_widget.main_rebars_diameter.setText(
265+
FreeCAD.Units.Quantity(16.00, "mm").UserString
266+
)
223267
self.circular_column_widget.main_rebars_number_radio.setChecked(True)
224268
self.circular_column_widget.main_rebars_angle_radio.setChecked(False)
225269
self.circular_column_widget.main_rebars_number.setEnabled(True)

0 commit comments

Comments
 (0)