Skip to content

Commit 12a563d

Browse files
easyweasyw
committed
fine tuning widget for FC openthemes num cmtnum=77
1 parent 08e6b85 commit 12a563d

File tree

3 files changed

+47
-38
lines changed

3 files changed

+47
-38
lines changed

‎DefeaturingTools.py‎

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
global created_faces, rh_faces_indexes, rh_edges_to_connect
3737
global force_recompute, invert
3838

39-
__version__ = "v1.3.8"
39+
__version__ = "v1.3.9"
4040

4141

4242
## shape.sewShape(), shape.isClosed(), shape.isValid()
@@ -1821,13 +1821,11 @@ def setupUi(self, DockWidget):
18211821
self.dockWidgetContents.setObjectName("dockWidgetContents")
18221822
self.PB_RHoles = QtGui.QPushButton(self.dockWidgetContents)
18231823
self.PB_RHoles.setGeometry(QtCore.QRect(12, 288, 32, 32))
1824-
self.PB_RHoles.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
18251824
self.PB_RHoles.setToolTip("remove Hole from Face")
18261825
self.PB_RHoles.setText("")
18271826
self.PB_RHoles.setObjectName("PB_RHoles")
18281827
self.PB_Edges = QtGui.QPushButton(self.dockWidgetContents)
18291828
self.PB_Edges.setGeometry(QtCore.QRect(220, 20, 32, 32))
1830-
self.PB_Edges.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
18311829
self.PB_Edges.setToolTip("add selected Edges to List")
18321830
self.PB_Edges.setText("")
18331831
self.PB_Edges.setObjectName("PB_Edges")
@@ -1854,19 +1852,16 @@ def setupUi(self, DockWidget):
18541852
self.TE_Edges.setObjectName("TE_Edges")
18551853
self.PB_Faces = QtGui.QPushButton(self.dockWidgetContents)
18561854
self.PB_Faces.setGeometry(QtCore.QRect(220, 164, 32, 32))
1857-
self.PB_Faces.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
18581855
self.PB_Faces.setToolTip("add selected Faces to List")
18591856
self.PB_Faces.setText("")
18601857
self.PB_Faces.setObjectName("PB_Faces")
18611858
self.PB_Edges_Clear = QtGui.QPushButton(self.dockWidgetContents)
18621859
self.PB_Edges_Clear.setGeometry(QtCore.QRect(220, 92, 32, 32))
1863-
self.PB_Edges_Clear.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
18641860
self.PB_Edges_Clear.setToolTip("clear List")
18651861
self.PB_Edges_Clear.setText("")
18661862
self.PB_Edges_Clear.setObjectName("PB_Edges_Clear")
18671863
self.PB_Faces_Clear = QtGui.QPushButton(self.dockWidgetContents)
18681864
self.PB_Faces_Clear.setGeometry(QtCore.QRect(220, 200, 32, 32))
1869-
self.PB_Faces_Clear.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
18701865
self.PB_Faces_Clear.setToolTip("clear List")
18711866
self.PB_Faces_Clear.setText("")
18721867
self.PB_Faces_Clear.setObjectName("PB_Faces_Clear")
@@ -1897,32 +1892,27 @@ def setupUi(self, DockWidget):
18971892
self.checkBox_keep_faces.setObjectName("checkBox_keep_faces")
18981893
self.PB_RFaces = QtGui.QPushButton(self.dockWidgetContents)
18991894
self.PB_RFaces.setGeometry(QtCore.QRect(68, 288, 32, 32))
1900-
self.PB_RFaces.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19011895
self.PB_RFaces.setToolTip("remove \'in List\' Faces")
19021896
self.PB_RFaces.setText("")
19031897
self.PB_RFaces.setObjectName("PB_RFaces")
19041898
self.PB_AFaces = QtGui.QPushButton(self.dockWidgetContents)
19051899
self.PB_AFaces.setGeometry(QtCore.QRect(124, 288, 32, 32))
1906-
self.PB_AFaces.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19071900
self.PB_AFaces.setToolTip("add Faces from \'in List\' Edges")
19081901
self.PB_AFaces.setText("")
19091902
self.PB_AFaces.setObjectName("PB_AFaces")
19101903
self.PB_makeShell = QtGui.QPushButton(self.dockWidgetContents)
19111904
self.PB_makeShell.setGeometry(QtCore.QRect(12, 360, 32, 32))
1912-
self.PB_makeShell.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19131905
self.PB_makeShell.setToolTip("make Solid from in list Faces")
19141906
self.PB_makeShell.setText("")
19151907
self.PB_makeShell.setObjectName("PB_makeShell")
19161908
self.PB_makeShell_2 = QtGui.QPushButton(self.dockWidgetContents)
19171909
self.PB_makeShell_2.setGeometry(QtCore.QRect(68, 360, 32, 32))
1918-
self.PB_makeShell_2.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19191910
self.PB_makeShell_2.setToolTip("make Solid from the Faces\n"
19201911
"of the selected Objects")
19211912
self.PB_makeShell_2.setText("")
19221913
self.PB_makeShell_2.setObjectName("PB_makeShell_2")
19231914
self.PB_check_TypeId = QtGui.QPushButton(self.dockWidgetContents)
19241915
self.PB_check_TypeId.setGeometry(QtCore.QRect(124, 468, 32, 32))
1925-
self.PB_check_TypeId.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19261916
font = QtGui.QFont()
19271917
try:
19281918
font.setWeight(50)
@@ -1945,43 +1935,36 @@ def setupUi(self, DockWidget):
19451935
self.Obj_Nbr_2.setObjectName("Obj_Nbr_2")
19461936
self.PB_AEdges = QtGui.QPushButton(self.dockWidgetContents)
19471937
self.PB_AEdges.setGeometry(QtCore.QRect(220, 288, 32, 32))
1948-
self.PB_AEdges.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19491938
self.PB_AEdges.setToolTip("create a copy of the \'in List\' Edges")
19501939
self.PB_AEdges.setText("")
19511940
self.PB_AEdges.setObjectName("PB_AEdges")
19521941
self.PB_showEdgeList = QtGui.QPushButton(self.dockWidgetContents)
19531942
self.PB_showEdgeList.setGeometry(QtCore.QRect(12, 396, 32, 32))
1954-
self.PB_showEdgeList.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19551943
self.PB_showEdgeList.setToolTip("show \'in List\' Edge(s)")
19561944
self.PB_showEdgeList.setText("")
19571945
self.PB_showEdgeList.setObjectName("PB_showEdgeList")
19581946
self.PB_showFaceList = QtGui.QPushButton(self.dockWidgetContents)
19591947
self.PB_showFaceList.setGeometry(QtCore.QRect(68, 396, 32, 32))
1960-
self.PB_showFaceList.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19611948
self.PB_showFaceList.setToolTip("show \'in List\' Face(s)")
19621949
self.PB_showFaceList.setText("")
19631950
self.PB_showFaceList.setObjectName("PB_showFaceList")
19641951
self.PB_Refine = QtGui.QPushButton(self.dockWidgetContents)
19651952
self.PB_Refine.setGeometry(QtCore.QRect(124, 396, 32, 32))
1966-
self.PB_Refine.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19671953
self.PB_Refine.setToolTip("refine")
19681954
self.PB_Refine.setText("")
19691955
self.PB_Refine.setObjectName("PB_Refine")
19701956
self.PB_RefineParametric = QtGui.QPushButton(self.dockWidgetContents)
19711957
self.PB_RefineParametric.setGeometry(QtCore.QRect(220, 396, 32, 32))
1972-
self.PB_RefineParametric.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19731958
self.PB_RefineParametric.setToolTip("parametric Refine")
19741959
self.PB_RefineParametric.setText("")
19751960
self.PB_RefineParametric.setObjectName("PB_RefineParametric")
19761961
self.PB_CFaces = QtGui.QPushButton(self.dockWidgetContents)
19771962
self.PB_CFaces.setGeometry(QtCore.QRect(12, 324, 32, 32))
1978-
self.PB_CFaces.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19791963
self.PB_CFaces.setToolTip("copy Faces from \'in List\' Edges")
19801964
self.PB_CFaces.setText("")
19811965
self.PB_CFaces.setObjectName("PB_CFaces")
19821966
self.PB_TFace = QtGui.QPushButton(self.dockWidgetContents)
19831967
self.PB_TFace.setGeometry(QtCore.QRect(68, 324, 32, 32))
1984-
self.PB_TFace.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19851968
self.PB_TFace.setToolTip("copy Faces from \'in List\' Edges")
19861969
self.PB_TFace.setText("")
19871970
self.PB_TFace.setObjectName("PB_TFace")
@@ -1992,14 +1975,12 @@ def setupUi(self, DockWidget):
19921975
self.offset_input.setObjectName("offset_input")
19931976
self.PB_TEdge = QtGui.QPushButton(self.dockWidgetContents)
19941977
self.PB_TEdge.setGeometry(QtCore.QRect(220, 324, 32, 32))
1995-
self.PB_TEdge.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
19961978
self.PB_TEdge.setToolTip("copy Faces from \'in List\' Edges")
19971979
self.PB_TEdge.setText("")
19981980
self.PB_TEdge.setObjectName("PB_TEdge")
19991981
self.PB_close = QtGui.QPushButton(self.dockWidgetContents)
20001982
self.PB_close.setGeometry(QtCore.QRect(-1, -1, 20, 20))
20011983
#self.PB_close.setMaximumSize(QtCore.QSize(14, 14))
2002-
self.PB_close.setStyleSheet(u"min-width: 12px;min-height: 12px; ")
20031984
self.PB_close.setToolTip("add selected Edges to List")
20041985
self.PB_close.setText("")
20051986
self.PB_close.setObjectName("PB_close")
@@ -2012,43 +1993,36 @@ def setupUi(self, DockWidget):
20121993
self.PB_left.setToolTip("dock left")
20131994
self.PB_left.setText("")
20141995
self.PB_left.setObjectName("PB_left")
2015-
self.PB_left.setStyleSheet(u"min-width: 12px;min-height: 12px; ")
20161996
self.PB_right = QtGui.QPushButton(self.dockWidgetContents)
20171997
self.PB_right.setGeometry(QtCore.QRect(-1, 34, 20, 20))
20181998
self.PB_right.setToolTip("dock right")
2019-
self.PB_right.setStyleSheet(u"min-width: 12px;min-height: 12px; ")
20201999
self.PB_right.setText("")
20212000
self.PB_right.setObjectName("PB_right")
20222001
self.PB_makeEdge = QtGui.QPushButton(self.dockWidgetContents)
20232002
self.PB_makeEdge.setGeometry(QtCore.QRect(12, 468, 32, 32))
2024-
self.PB_makeEdge.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20252003
self.PB_makeEdge.setToolTip("make Edge from selected Vertexes")
20262004
self.PB_makeEdge.setText("")
20272005
self.PB_makeEdge.setObjectName("PB_makeEdge")
20282006
self.PB_expSTEP = QtGui.QPushButton(self.dockWidgetContents)
20292007
self.PB_expSTEP.setGeometry(QtCore.QRect(124, 360, 32, 32))
2030-
self.PB_expSTEP.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20312008
self.PB_expSTEP.setToolTip("make Solid from the Faces\n"
20322009
"of the selected Objects")
20332010
self.PB_expSTEP.setText("")
20342011
self.PB_expSTEP.setObjectName("PB_expSTEP")
20352012
self.PB_PartDefeaturing = QtGui.QPushButton(self.dockWidgetContents)
20362013
self.PB_PartDefeaturing.setEnabled(False)
20372014
self.PB_PartDefeaturing.setGeometry(QtCore.QRect(172, 288, 32, 32))
2038-
self.PB_PartDefeaturing.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20392015
self.PB_PartDefeaturing.setToolTip("show \'in List\' Edge(s)")
20402016
self.PB_PartDefeaturing.setText("")
20412017
self.PB_PartDefeaturing.setObjectName("PB_PartDefeaturing")
20422018
self.PB_CleaningFaces = QtGui.QPushButton(self.dockWidgetContents)
20432019
self.PB_CleaningFaces.setGeometry(QtCore.QRect(220, 360, 32, 32))
2044-
self.PB_CleaningFaces.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20452020
self.PB_CleaningFaces.setToolTip("clean Face(s) removing\n"
20462021
"holes and merging Outwire")
20472022
self.PB_CleaningFaces.setText("")
20482023
self.PB_CleaningFaces.setObjectName("PB_CleaningFaces")
20492024
self.PB_checkS = QtGui.QPushButton(self.dockWidgetContents)
20502025
self.PB_checkS.setGeometry(QtCore.QRect(12, 432, 32, 32))
2051-
self.PB_checkS.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20522026
self.PB_checkS.setToolTip("show \'in List\' Edge(s)")
20532027
self.PB_checkS.setText("")
20542028
self.PB_checkS.setObjectName("PB_checkS")
@@ -2059,52 +2033,86 @@ def setupUi(self, DockWidget):
20592033
self.tolerance_value.setObjectName("tolerance_value")
20602034
self.PB_setTol = QtGui.QPushButton(self.dockWidgetContents)
20612035
self.PB_setTol.setGeometry(QtCore.QRect(220, 432, 32, 32))
2062-
self.PB_setTol.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20632036
self.PB_setTol.setToolTip("copy Faces from \'in List\' Edges")
20642037
self.PB_setTol.setText("")
20652038
self.PB_setTol.setObjectName("PB_setTol")
20662039
self.PB_getTol = QtGui.QPushButton(self.dockWidgetContents)
20672040
self.PB_getTol.setGeometry(QtCore.QRect(68, 432, 32, 32))
2068-
self.PB_getTol.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20692041
self.PB_getTol.setToolTip("copy Faces from \'in List\' Edges")
20702042
self.PB_getTol.setText("")
20712043
self.PB_getTol.setObjectName("PB_getTol")
20722044
self.PB_sewS = QtGui.QPushButton(self.dockWidgetContents)
20732045
self.PB_sewS.setGeometry(QtCore.QRect(220, 468, 32, 32))
2074-
self.PB_sewS.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20752046
self.PB_sewS.setToolTip("copy Faces from \'in List\' Edges")
20762047
self.PB_sewS.setText("")
20772048
self.PB_sewS.setObjectName("PB_sewS")
20782049
self.PB_RHhelp = QtGui.QPushButton(self.dockWidgetContents)
20792050
self.PB_RHhelp.setGeometry(QtCore.QRect(172, 468, 32, 32))
2080-
self.PB_RHhelp.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20812051
self.PB_RHhelp.setToolTip("Help")
20822052
self.PB_RHhelp.setText("")
20832053
self.PB_RHhelp.setObjectName("PB_RHhelp")
20842054
self.PB_Connect = QtGui.QPushButton(self.dockWidgetContents)
20852055
self.PB_Connect.setGeometry(QtCore.QRect(172, 360, 32, 32))
2086-
self.PB_Connect.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20872056
self.PB_Connect.setToolTip("connect")
20882057
self.PB_Connect.setText("")
20892058
self.PB_Connect.setObjectName("PB_Connect")
20902059
self.PB_SimpleCopy = QtGui.QPushButton(self.dockWidgetContents)
20912060
self.PB_SimpleCopy.setGeometry(QtCore.QRect(172, 396, 32, 32))
2092-
self.PB_SimpleCopy.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20932061
self.PB_SimpleCopy.setToolTip("simple copy")
20942062
self.PB_SimpleCopy.setText("")
20952063
self.PB_SimpleCopy.setObjectName("PB_SimpleCopy")
20962064
self.PB_resetPlacement = QtGui.QPushButton(self.dockWidgetContents)
20972065
self.PB_resetPlacement.setGeometry(QtCore.QRect(68, 468, 32, 32))
2098-
self.PB_resetPlacement.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
20992066
self.PB_resetPlacement.setToolTip("reset Placement")
21002067
self.PB_resetPlacement.setText("")
21012068
self.PB_resetPlacement.setObjectName("PB_resetPlacement")
21022069
self.PB_LoopEdge = QtGui.QPushButton(self.dockWidgetContents)
21032070
self.PB_LoopEdge.setGeometry(QtCore.QRect(220, 56, 32, 32))
2104-
self.PB_LoopEdge.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
21052071
self.PB_LoopEdge.setToolTip("add Loop Edges to List")
21062072
self.PB_LoopEdge.setText("")
21072073
self.PB_LoopEdge.setObjectName("PB_LoopEdge")
2074+
2075+
# fix for FC Light and OpenLight themes
2076+
pg = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/MainWindow")
2077+
if not pg.GetString("Theme").startswith("Open"):
2078+
self.PB_RHoles.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2079+
self.PB_Edges.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2080+
self.PB_Faces.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2081+
self.PB_Edges_Clear.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2082+
self.PB_Faces_Clear.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2083+
self.PB_RFaces.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2084+
self.PB_AFaces.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2085+
self.PB_makeShell.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2086+
self.PB_makeShell_2.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2087+
self.PB_check_TypeId.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2088+
self.PB_AEdges.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2089+
self.PB_showEdgeList.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2090+
self.PB_showFaceList.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2091+
self.PB_Refine.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2092+
self.PB_RefineParametric.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2093+
self.PB_CFaces.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2094+
self.PB_TFace.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2095+
self.PB_TEdge.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2096+
self.PB_close.setStyleSheet(u"min-width: 12px;min-height: 12px; ")
2097+
self.PB_close.setStyleSheet(u"min-width: 12px;min-height: 12px; ")
2098+
self.PB_left.setStyleSheet(u"min-width: 12px;min-height: 12px; ")
2099+
self.PB_right.setStyleSheet(u"min-width: 12px;min-height: 12px; ")
2100+
self.PB_makeEdge.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2101+
self.PB_expSTEP.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2102+
self.PB_PartDefeaturing.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2103+
self.PB_CleaningFaces.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2104+
self.PB_checkS.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2105+
self.PB_setTol.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2106+
self.PB_getTol.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2107+
self.PB_sewS.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2108+
self.PB_RHhelp.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2109+
self.PB_Connect.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2110+
self.PB_SimpleCopy.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2111+
self.PB_resetPlacement.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2112+
self.PB_LoopEdge.setStyleSheet(u"min-width: 24px;min-height: 24px; ")
2113+
# and fc dark and fc opendark theme
2114+
2115+
21082116
DockWidget.setWidget(self.dockWidgetContents)
21092117

21102118
self.retranslateUi(DockWidget)
@@ -2343,6 +2351,7 @@ def setupUi(self, DockWidget):
23432351
if pt_osx:
23442352
self.InfoLabel.setText("Select Edge(s)\nCmd+Click")
23452353
self.label.setText("Select Face(s)\nCmd+Click")
2354+
23462355
################################################################################################
23472356
def retranslateUi(self, DockWidget):
23482357
pass

‎InitGui.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
# for detail see the LICENCE text file. *
1616
#****************************************************************************
1717

18-
DWB_wb_version='v 1.2.5'
18+
DWB_wb_version='v 1.2.6'
1919
global myurlDWB
2020
myurlDWB='https://github.com/easyw/Defeaturing_WB'
2121
global mycommitsDWB
22-
mycommitsDWB=75 #v 1.2.5
22+
mycommitsDWB=77 #v 1.2.6
2323

2424

2525
import FreeCAD, FreeCADGui, Part, os, sys

‎package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package format="1" xmlns="https://wiki.freecad.org/Package_Metadata">
33
<name>Defeaturing Workbench</name>
44
<description>A set of tools to edit a Shape or a STEP model.</description>
5-
<version>1.2.5</version>
5+
<version>1.2.6</version>
66
<maintainer email="easyw@katamail.com">Maui</maintainer>
77
<license file="LICENSE">AGPLv3.0</license>
88
<url type="repository" branch="master">https://github.com/easyw/Defeaturing_WB</url>

0 commit comments

Comments
 (0)