ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-27 06:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'remove_tix2' into 'master'

Browse Source 
Remove tix2



See merge request !14
This commit is contained in:
Joachim Schöberl 2016-11-15 06:46:31 +01:00
commit 8e97d91912
1 changed files with 118 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
ng/occgeom.tcl
View File

@ -39,7 +39,7 @@ proc occdialogbuildtree {} {
global entities global entities
set w .occ_dlg set w .occ_dlg
set hlist [$w.mtre subwidget hlist] #set hlist [$w.mtre subwidget hlist]
set entities [Ng_GetOCCData getentities] set entities [Ng_GetOCCData getentities]
set nrentities [expr [llength $entities]] set nrentities [expr [llength $entities]]
@ -47,57 +47,74 @@ proc occdialogbuildtree {} {
if {$nrentities != 0} { if {$nrentities != 0} {
$hlist add Topology -itemtype text -text "Topology" #$hlist add Topology -itemtype text -text "Topology"
$hlist add Topology/CompSolids -itemtype text -text "Composite Solids" -data "Composite Solids" #$hlist add Topology/CompSolids -itemtype text -text "Composite Solids" -data "Composite Solids"
$hlist add Topology/FreeSolids -itemtype text -text "Free Solids" -data "Free Solids" #$hlist add Topology/FreeSolids -itemtype text -text "Free Solids" -data "Free Solids"
$hlist add Topology/FreeShells -itemtype text -text "Free Shells" -data "Free Shells" #$hlist add Topology/FreeShells -itemtype text -text "Free Shells" -data "Free Shells"
$hlist add Topology/FreeFaces -itemtype text -text "Free Faces" -data "Free Faces" #$hlist add Topology/FreeFaces -itemtype text -text "Free Faces" -data "Free Faces"
$hlist add Topology/FreeWires -itemtype text -text "Free Wires" -data "Free Wires" #$hlist add Topology/FreeWires -itemtype text -text "Free Wires" -data "Free Wires"
$hlist add Topology/FreeEdges -itemtype text -text "Free Edges" -data "Free Edges" #$hlist add Topology/FreeEdges -itemtype text -text "Free Edges" -data "Free Edges"
$hlist add Topology/FreeVertices -itemtype text -text "Free Vertices" -data "Free Vertices" #$hlist add Topology/FreeVertices -itemtype text -text "Free Vertices" -data "Free Vertices"
$w.tree insert {Topology} end -id "CompSolids" -text "Composite Solids"
$w.tree insert {Topology} end -id "FreeSolids" -text "Free Solids"
$w.tree insert {Topology} end -id "FreeShells" -text "Free Shells"
$w.tree insert {Topology} end -id "FreeFaces" -text "Free Faces"
$w.tree insert {Topology} end -id "FreeWires" -text "Free Wires"
$w.tree insert {Topology} end -id "FreeEdges" -text "Free Edges"
$w.tree insert {Topology} end -id "FreeVertices" -text "Free Vertices"
# $hlist add SingularEntities -itemtype text -text "Entities marked as singular" # $hlist add SingularEntities -itemtype text -text "Entities marked as singular"
$w.tree item "Topology" -open true
set i [expr 0] set i [expr 0]
while {$i < $nrentities} { while {$i < $nrentities} {
set entity [lindex $entities [expr $i]] set entity [lindex $entities [expr $i]]
incr i 1 incr i 1
set entityname [lindex $entities [expr $i]] set entityname [lindex $entities [expr $i]]
$hlist add Topology/$entity -text $entityname -data $entityname #$hlist add Topology/$entity -text $entityname -data $entityname
set myroot [string range $entity 0 [string last / $entity]-1]
$w.tree insert $myroot end -id $entity -text $entityname -value 1
incr i 1 incr i 1
$w.mtre close Topology/$entity #$w.mtre close Topology/$entity
} }
$w.mtre autosetmode #$w.mtre autosetmode
$w.mtre open Topology #$w.mtre open Topology
$w.mtre close Topology/CompSolids #$w.mtre close Topology/CompSolids
$w.mtre close Topology/FreeSolids #$w.mtre close Topology/FreeSolids
$w.mtre close Topology/FreeShells #$w.mtre close Topology/FreeShells
$w.mtre close Topology/FreeFaces #$w.mtre close Topology/FreeFaces
$w.mtre close Topology/FreeWires #$w.mtre close Topology/FreeWires
$w.mtre close Topology/FreeEdges #$w.mtre close Topology/FreeEdges
$w.mtre close Topology/FreeVertices #$w.mtre close Topology/FreeVertices
set i [expr 0] set i [expr 0]
while {$i < $nrentities} { while {$i < $nrentities} {
set entity [lindex $entities [expr $i]] set entity [lindex $entities [expr $i]]
$w.mtre close Topology/$entity #$w.mtre close Topology/$entity
$w.tree item $entity -open false
incr i 2 incr i 2
} }
set faces [Ng_OCCCommand getunmeshedfaceinfo] set faces [Ng_OCCCommand getunmeshedfaceinfo]
set nrfaces [expr [llength $faces]] set nrfaces [expr [llength $faces]]
if {$nrfaces >= 2} { if {$nrfaces >= 2} {
$hlist add ErrorFaces -itemtype text -text "Faces with surface meshing error" #$hlist add ErrorFaces -itemtype text -text "Faces with surface meshing error"
$w.mtre open ErrorFaces $w.tree insert {} -id ErrorFaces -text "Faces with surface meshing error"
#$w.mtre open ErrorFaces
$w.tree item ErrorFaces -open true
set i [expr 0] set i [expr 0]
while {$i < $nrfaces} { while {$i < $nrfaces} {
set entity [lindex $faces [expr $i]] set entity [lindex $faces [expr $i]]
set myroot [string range $entity 0 [string last / $entity]-1]
if { [string length $myroot] == 0 } {
set myroot ErrorFaces
}
incr i 1 incr i 1
set entityname [lindex $faces [expr $i]] set entityname [lindex $faces [expr $i]]
$hlist add ErrorFaces/$entity -text $entityname -data $entityname #$hlist add ErrorFaces/$entity -text $entityname -data $entityname
$w.tree insert {myroot} end -id $entity -text $entityname -value 0
incr i 1 incr i 1
} }
} }
@ -106,20 +123,27 @@ proc occdialogbuildtree {} {
set faces [Ng_OCCCommand getnotdrawablefaces] set faces [Ng_OCCCommand getnotdrawablefaces]
set nrfaces [expr [llength $faces]] set nrfaces [expr [llength $faces]]
if {$nrfaces >= 2} { if {$nrfaces >= 2} {
$hlist add NotDrawableFaces -itemtype text -text "Faces impossible to visualize" #$hlist add NotDrawableFaces -itemtype text -text "Faces impossible to visualize"
$w.mtre open NotDrawableFaces $w.tree insert {} -id NotDrawableFaces -text "Faces impossible to visualize"
#$w.mtre open NotDrawableFaces
$w.tree item NotDrawableFaces -open true
set i [expr 0] set i [expr 0]
while {$i < $nrfaces} { while {$i < $nrfaces} {
set entity [lindex $faces [expr $i]] set entity [lindex $faces [expr $i]]
set myroot [string range $entity 0 [string last / $entity]-1]
if { [string length $myroot ] == 0 } {
set myroot NotDrawableFaces
}
incr i 1 incr i 1
set entityname [lindex $faces [expr $i]] set entityname [lindex $faces [expr $i]]
$hlist add NotDrawableFaces/$entity -text $entityname -data $entityname #$hlist add NotDrawableFaces/$entity -text $entityname -data $entityname
$w.tree insert $myroot end -id $entity -text $entityname -value 0
incr i 1 incr i 1
} }
} }
$w.mtre autosetmode #$w.mtre autosetmode
puts "done" puts "done"
} }
@ -128,7 +152,8 @@ proc occdialogbuildtree {} {
proc rebuildoccdialog {} { proc rebuildoccdialog {} {
if {[winfo exists .occ_dlg] == 1} { if {[winfo exists .occ_dlg] == 1} {
[.occ_dlg.mtre subwidget hlist] delete all .occ_dlg.tree delete [.occ_dlg.tree children Topology]
#[.occ_dlg.mtre subwidget hlist] delete all
occdialogbuildtree occdialogbuildtree
} }
} }
@ -152,27 +177,28 @@ proc selectentity { entityname } {
set i [expr 0] set i [expr 0]
while {$i < $nrentities} { while {$i < $nrentities} {
set entitylength [] set entitylength []
set entity2 [lindex $entities [expr $i]] set entity2 [lindex $entities [expr $i]]
incr i 1 incr i 1
set entityname2 [lindex $entities [expr $i]] set entityname2 [lindex $entities [expr $i]]
incr i 1 incr i 1
set entityname2 [string range $entityname2 0 [expr [string length $entityname]-1]] set entityname2 [string range $entityname2 0 [expr [string length $entityname]-1]]
if {$entityname == $entityname2} { if {$entityname == $entityname2} {
set hlist [.occ_dlg.mtre subwidget hlist] # #set hlist [.occ_dlg.mtre subwidget hlist]
.occ_dlg.mtre open Topology # #.occ_dlg.mtre open Topology
set slashpos [string last "/" $entity2] # .occ_dlg.tree item Topology -open true
set entity3 [string range $entity2 0 [expr $slashpos-1]] # puts $entity2
while {$slashpos != -1} { # set slashpos [string last "/" $entity2]
.occ_dlg.mtre open Topology/$entity3 # set entity3 [string range $entity2 0 [expr $slashpos-1]]
# while {$slashpos != -1} {
set slashpos [string last "/" $entity3] # #.occ_dlg.mtre open Topology/$entity3
set entity3 [string range $entity3 0 [expr $slashpos-1]] # .occ_dlg.tree item $entity3 -open true
} # puts $entity3
$hlist selection clear # set slashpos [string last "/" $entity3]
$hlist see Topology/$entity2 # set entity3 [string range $entity3 0 [expr $slashpos-1]]
$hlist selection set Topology/$entity2 # }
#$hlist selection clear
.occ_dlg.tree see $entity2
.occ_dlg.tree selection set $entity2
} }
} }
} }
@ -197,26 +223,17 @@ proc occdialog { } {
} { } {
toplevel $w toplevel $w
tixTree $w.mtre -options { separator "/" } ttk::treeview $w.tree
pack $w.mtre -fill both -expand yes $w.tree insert {} end -id "Topology" -text "Topology"
pack $w.tree -fill both -expand yes
occdialogbuildtree occdialogbuildtree
set hlist [$w.mtre subwidget hlist] bind $w.tree <Double-1> {
$hlist configure -selectforeground black set entityname [.occ_dlg.tree item [.occ_dlg.tree selection] -text ]
$hlist configure -selectbackground grey set rootname ""
if {[.occ_dlg.tree item [.occ_dlg.tree selection] -value] == 1 } {
set solname {""} set rootname "Topology"
}
bind $hlist <Double-1> {
set oldsolname {$solname}
set solname [[.occ_dlg.mtre subwidget hlist] info selection]
if {$solname != "" && $oldsolname != $solname } {
set seppos [string first "/" $solname]
set rootname [string range $solname 0 [expr $seppos-1]]
set entityname [[.occ_dlg.mtre subwidget hlist] info data $solname]
set spacepos [string first " " $entityname] set spacepos [string first " " $entityname]
set entitytype [string range $entityname 0 [expr $spacepos-1]] set entitytype [string range $entityname 0 [expr $spacepos-1]]
set helpstring [string range $entityname [expr $spacepos+1] [expr [string length $entityname]-1]] set helpstring [string range $entityname [expr $spacepos+1] [expr [string length $entityname]-1]]
@ -231,19 +248,15 @@ proc occdialog { } {
if {$brackpos != -1} { if {$brackpos != -1} {
set entityname [string range $entityname 0 $brackpos] set entityname [string range $entityname 0 $brackpos]
} }
selectentity $entityname selectentity $entityname
} }
} }
}
ttk::button $w.cl -text "Close" -command { ttk::button $w.cl -text "Close" -command {
destroy .occ_dlg destroy .occ_dlg
} }
ttk::button $w.show -text "Show" -command { ttk::button $w.show -text "Show" -command {
set solname [[.occ_dlg.mtre subwidget hlist] info selection] set entityname [.occ_dlg.tree item [.occ_dlg.tree selection] -text ]
set entityname [[.occ_dlg.mtre subwidget hlist] info data $solname]
set spacepos [string first " " $entityname] set spacepos [string first " " $entityname]
set entitytype [string range $entityname 0 [expr $spacepos-1]] set entitytype [string range $entityname 0 [expr $spacepos-1]]
set helpstring [string range $entityname [expr $spacepos+1] [expr [string length $entityname]-1]] set helpstring [string range $entityname [expr $spacepos+1] [expr [string length $entityname]-1]]
@ -256,8 +269,7 @@ proc occdialog { } {
redraw redraw
} }
ttk::button $w.hide -text "Hide" -command { ttk::button $w.hide -text "Hide" -command {
set solname [[.occ_dlg.mtre subwidget hlist] info selection] set entityname [.occ_dlg.tree item [.occ_dlg.tree selection] -text ]
set entityname [[.occ_dlg.mtre subwidget hlist] info data $solname]
set spacepos [string first " " $entityname] set spacepos [string first " " $entityname]
set entitytype [string range $entityname 0 [expr $spacepos-1]] set entitytype [string range $entityname 0 [expr $spacepos-1]]
set helpstring [string range $entityname [expr $spacepos+1] [expr [string length $entityname]-1]] set helpstring [string range $entityname [expr $spacepos+1] [expr [string length $entityname]-1]]
@ -270,9 +282,8 @@ proc occdialog { } {
redraw redraw
} }
button $w.swaporientation -text "Swap orientation" -command { ttk::button $w.swaporientation -text "Swap orientation" -command {
set solname [[.occ_dlg.mtre subwidget hlist] info selection] set entityname [.occ_dlg.tree item [.occ_dlg.tree selection] -text ]
set entityname [[.occ_dlg.mtre subwidget hlist] info data $solname]
set spacepos [string first " " $entityname] set spacepos [string first " " $entityname]
set entitytype [string range $entityname 0 [expr $spacepos-1]] set entitytype [string range $entityname 0 [expr $spacepos-1]]
set helpstring [string range $entityname [expr $spacepos+1] [expr [string length $entityname]-1]] set helpstring [string range $entityname [expr $spacepos+1] [expr [string length $entityname]-1]]
@ -283,14 +294,13 @@ proc occdialog { } {
set selectvisual geometry set selectvisual geometry
# Ng_SetVisParameters # Ng_SetVisParameters
redraw redraw
.occ_dlg.tree delete [.occ_dlg.tree children Topology]
[.occ_dlg.mtre subwidget hlist] delete all #[.occ_dlg.mtre subwidget hlist] delete all
occdialogbuildtree occdialogbuildtree
} }
ttk::button $w.marksingular -text "Mark/Unmark as singular" -command { ttk::button $w.marksingular -text "Mark/Unmark as singular" -command {
set solname [[.occ_dlg.mtre subwidget hlist] info selection] set entityname [.occ_dlg.tree item [.occ_dlg.tree selection] -text ]
set entityname [[.occ_dlg.mtre subwidget hlist] info data $solname]
set spacepos [string first " " $entityname] set spacepos [string first " " $entityname]
if { $spacepos != 0 } { if { $spacepos != 0 } {
set entitytype [string range $entityname 0 [expr $spacepos-1]] set entitytype [string range $entityname 0 [expr $spacepos-1]]
@ -298,45 +308,22 @@ proc occdialog { } {
set spacepos2 [string first " " $helpstring] set spacepos2 [string first " " $helpstring]
if { $spacepos2 != 0 } { if { $spacepos2 != 0 } {
set entitynumber [string range $helpstring 0 [expr $spacepos2-1]] set entitynumber [string range $helpstring 0 [expr $spacepos2-1]]
puts $entitytype
puts $entitynumber
global ismarkedsingular global ismarkedsingular
Ng_OCCCommand marksingular $entitytype $entitynumber Ng_OCCCommand marksingular $entitytype $entitynumber
set hlist [$w.mtre subwidget hlist]
# $hlist entryconfigure $solname -text "hallo"
# set style1 [tixDisplayStyle imagetext -font 8x13]
set style1 [tixDisplayStyle imagetext -foreground black -background white -selectforeground white -selectbackground blue]
set style2 [tixDisplayStyle imagetext -foreground red -background white -selectforeground red -selectbackground blue]
if { $ismarkedsingular == 0 } { if { $ismarkedsingular == 0 } {
$hlist entryconfigure $solname -style $style1 .occ_dlg.tree tag remove "Color" [.occ_dlg.tree selection]
} { } {
$hlist entryconfigure $solname -style $style2 .occ_dlg.tree tag add "Color" [.occ_dlg.tree selection]
.occ_dlg.tree tag configure "Color" -foreground "red"
.occ_dlg.tree tag configure "Color" -background "blue"
} }
# set hlist [$w.mtre subwidget hlist]
# foreach solname2 $hlist {
# if { $ismarkedsingular == 0 } {
# $hlist entryconfigure $solname2 -style $style1
# } {
# $hlist entryconfigure $solname2 -style $style2
# }
# }
} }
} }
# $hlist add test -after $solname
# $hlist add SingularEntities/$entityname -text $entityname
# set selectvisual geometry
# Ng_SetVisParameters
# redraw
# [.occ_dlg.mtre subwidget hlist] delete all
# occdialogbuildtree
} }
ttk::checkbutton $w.zoomtohighlightedentity -text "Zoom to highlighted entity" \ ttk::checkbutton $w.zoomtohighlightedentity -text "Zoom to highlighted entity" \
-variable occoptions.zoomtohighlightedentity \ -variable occoptions.zoomtohighlightedentity \
-command { -command {
@ -357,24 +344,29 @@ proc occdialog { } {
ttk::button $w.healing.checkentities -text "Analyze geometry" -command { ttk::button $w.healing.checkentities -text "Analyze geometry" -command {
set irregent [Ng_OCCCommand findsmallentities] set irregent [Ng_OCCCommand findsmallentities]
set w .occ_dlg set w .occ_dlg
set hlist [$w.mtre subwidget hlist]
$hlist add ProblematicEntities -text "Problematic Entities"
$hlist delete offsprings ProblematicEntities
set nritems [expr [llength $irregent]] set nritems [expr [llength $irregent]]
set i [expr 0] set i [expr 0]
if {$nritems > 0 } {
if { [.occ_dlg.tree exists ProblematicEntities] == 1 } {
$w.tree delete ProblematicEntities
}
$w.tree insert {} end -id ProblematicEntities -text "Problematic Entities"
}
while {$i < $nritems} { while {$i < $nritems} {
set entity [lindex $irregent [expr $i]] set entity [lindex $irregent [expr $i]]
incr i 1 incr i 1
set entityname [lindex $irregent [expr $i]] set entityname [lindex $irregent [expr $i]]
$hlist add ProblematicEntities/$entity -text $entityname -data $entityname #puts $entity
#puts $entityname
set myroot [string range $entity 0 [string last / $entity]-1]
if { [string length $myroot] == 0 } {
set myroot ProblematicEntities
}
$w.tree insert $myroot end -id $entity -text $entityname
incr i 1 incr i 1
} }
$w.mtre open ProblematicEntities $w.tree item ProblematicEntities -open true
$w.mtre autosetmode
} }
# tixControl $w.healing.tolerance -label "Healing tolerance: " -integer false \ # tixControl $w.healing.tolerance -label "Healing tolerance: " -integer false \
@ -407,10 +399,11 @@ proc occdialog { } {
-variable occoptions.splitpartitions -variable occoptions.splitpartitions
ttk::button $w.healing.heal -text "Heal geometry" -command { ttk::button $w.healing.heal -text "Heal geometry" -command {
.occ_dlg.healing.tolerance invoke #.occ_dlg.healing.tolerance.sp invoke
Ng_OCCCommand shapehealing Ng_OCCCommand shapehealing
redraw redraw
[.occ_dlg.mtre subwidget hlist] delete all .occ_dlg.tree delete [.occ_dlg.tree children Topology]
#[.occ_dlg.mtre subwidget hlist] delete all
occdialogbuildtree occdialogbuildtree
} }