From 2feeb3db083d5d8273b6c763a1885257c0486452 Mon Sep 17 00:00:00 2001 From: Gerhard Kitzler Date: Thu, 10 Nov 2016 14:31:04 +0100 Subject: [PATCH] almost all tix removed --- ng/dialog.tcl | 50 ++++++++++++++++++++++++++++---------------------- ng/occgeom.tcl | 48 +++++++++++++++++++++++++++--------------------- 2 files changed, 55 insertions(+), 43 deletions(-) diff --git a/ng/dialog.tcl b/ng/dialog.tcl index 7373aa87..91ac9df0 100644 --- a/ng/dialog.tcl +++ b/ng/dialog.tcl @@ -893,7 +893,6 @@ proc viewingoptionsdialog { } { # stl geometry set f $w.nb.stl - ttk::labelframe $f.show -relief groove -borderwidth 3 -text "STL viewing options" pack $f.show -fill x -pady 15 ttk::checkbutton $f.show.showtrias -text "Show STL-Triangles" \ @@ -935,7 +934,7 @@ proc viewingoptionsdialog { } { -validatecommand "Ng_SetVisParameters; redraw;my_validate %W [$f.fn.scale3 cget -from] [$f.fn.scale3 cget -to] %P 0" \ -invalidcommand "my_invalid %W;Ng_SetVisParameters; redraw;" - grid $f.fn.scale3 $f.fn.ent3 $f.fn.lab3 -stick nw -padx 4 + grid $f.fn.scale3 $f.fn.ent3 $f.fn.lab3 -sticky nw -padx 4 #frame $f.fo -relief groove -borderwidth 3 @@ -2229,17 +2228,17 @@ proc stloptionsdialog { } { } proc stldoctordialog { } { - + Ng_STLDoctor 0 0 set wd .stldoctor_dlg if {[winfo exists .stldoctor_dlg] == 1} { + wm withdraw $wd wm deiconify $wd focus $wd } { toplevel $wd - pack [ttk::notebook $wd.nb] -fill both -fill both -side top $wd.nb add [ttk::frame $wd.nb.general] -text "General" -underline 0 $wd.nb add [ttk::frame $wd.nb.topology] -text "Edit Topology" -underline 5 @@ -2695,45 +2694,52 @@ proc meshdoctordialog { } { Ng_MeshDoctor; - frame $w.vis -relief groove -borderwidth 3 + ttk::frame $w.vis -relief groove -borderwidth 3 pack $w.vis - checkbutton $w.vis.showfilledtrigs -text "Show filled triangles" \ + ttk::checkbutton $w.vis.showfilledtrigs -text "Show filled triangles" \ -variable viewoptions.drawfilledtrigs \ -command { Ng_SetVisParameters; redraw } - checkbutton $w.vis.showedges -text "Show edges" \ + ttk::checkbutton $w.vis.showedges -text "Show edges" \ -variable viewoptions.drawedges \ -command { Ng_SetVisParameters; redraw } - checkbutton $w.vis.showoutline -text "Show Triangle Outline" \ + ttk::checkbutton $w.vis.showoutline -text "Show Triangle Outline" \ -variable viewoptions.drawoutline \ -command { Ng_SetVisParameters; redraw } pack $w.vis.showfilledtrigs $w.vis.showoutline $w.vis.showedges - tixControl $w.markedgedist -label "Mark edge dist: " -integer true \ - -min 0 -max 999 \ - -variable meshdoc.markedgedist \ - -options { - entry.width 3 - label.width 20 - label.anchor e - } \ - -command { - Ng_MeshDoctor markedgedist ${meshdoc.markedgedist} - redraw - } + ttk::frame $w.markedgedist + ttk::label $w.markedgedist.l -text "Mark edge dist: " + ttk::spinbox $w.markedgedist.s -from 0 -to 999 -width 5 -increment 1 -validate focus -validatecommand "my_validatespinbox %W %P 0" \ + -invalidcommand "my_invalidspinbox %W" -command {Ng_MeshDoctor markedgedist ${meshdoc.markedgedist};redraw} -textvariable meshdoc.markedgedist + #pack $f.grading -fill x + pack $w.markedgedist.l $w.markedgedist.s -side left + + # tixControl $w.markedgedist -label "Mark edge dist: " -integer true \ + # -min 0 -max 999 \ + # -variable meshdoc.markedgedist \ + # -options { + # entry.width 3 + # label.width 20 + # label.anchor e + # } \ + # -command { + # Ng_MeshDoctor markedgedist ${meshdoc.markedgedist} + # redraw + # } pack $w.markedgedist - button $w.deledge -text "Delete marked segments" -command { + ttk::button $w.deledge -text "Delete marked segments" -command { Ng_MeshDoctor deletemarkedsegments redraw } pack $w.deledge - button $w.close -text "Close" -command { + ttk::button $w.close -text "Close" -command { set meshdoctor.active 0; Ng_MeshDoctor; destroy .meshdoc_dlg diff --git a/ng/occgeom.tcl b/ng/occgeom.tcl index 8332899e..1af11260 100644 --- a/ng/occgeom.tcl +++ b/ng/occgeom.tcl @@ -237,11 +237,11 @@ proc occdialog { } { } } - button $w.cl -text "Close" -command { + ttk::button $w.cl -text "Close" -command { destroy .occ_dlg } - 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.mtre subwidget hlist] info data $solname] set spacepos [string first " " $entityname] @@ -255,7 +255,7 @@ proc occdialog { } { # Ng_SetVisParameters redraw } - 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.mtre subwidget hlist] info data $solname] set spacepos [string first " " $entityname] @@ -288,7 +288,7 @@ proc occdialog { } { occdialogbuildtree } - 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.mtre subwidget hlist] info data $solname] set spacepos [string first " " $entityname] @@ -337,7 +337,7 @@ proc occdialog { } { } - checkbutton $w.zoomtohighlightedentity -text "Zoom to highlighted entity" \ + ttk::checkbutton $w.zoomtohighlightedentity -text "Zoom to highlighted entity" \ -variable occoptions.zoomtohighlightedentity \ -command { Ng_SetOCCVisParameters @@ -353,9 +353,9 @@ proc occdialog { } { - frame $w.healing -relief groove -borderwidth 3 + ttk::frame $w.healing -relief groove -borderwidth 3 - button $w.healing.checkentities -text "Analyze geometry" -command { + ttk::button $w.healing.checkentities -text "Analyze geometry" -command { set irregent [Ng_OCCCommand findsmallentities] set w .occ_dlg @@ -377,30 +377,36 @@ proc occdialog { } { $w.mtre autosetmode } - tixControl $w.healing.tolerance -label "Healing tolerance: " -integer false \ - -variable occoptions.tolerance -min 1e-9 -max 1e6 \ - -options { - entry.width 6 - label.width 25 - label.anchor e - } - - checkbutton $w.healing.fixsmalledges -text "Fix small edges" \ + # tixControl $w.healing.tolerance -label "Healing tolerance: " -integer false \ + # -variable occoptions.tolerance -min 1e-9 -max 1e6 \ + # -options { + # entry.width 6 + # label.width 25 + # label.anchor e + # } + + ttk::frame $w.healing.tolerance + ttk::label $w.healing.tolerance.label -text "Healing tolerance: " + ttk::spinbox $w.healing.tolerance.sp -textvariable occoptions.tolerance -width 6 -increment 0.01 -validate focus -validatecommand "my_validatespinbox %W %P 12" \ + -invalidcommand "my_invalidspinbox %W" -from -1e-9 -to 1e6 + grid $w.healing.tolerance.label $w.healing.tolerance.sp + + ttk::checkbutton $w.healing.fixsmalledges -text "Fix small edges" \ -variable occoptions.fixsmalledges - checkbutton $w.healing.fixspotstripfaces -text "Fix spot/strip faces" \ + ttk::checkbutton $w.healing.fixspotstripfaces -text "Fix spot/strip faces" \ -variable occoptions.fixspotstripfaces - checkbutton $w.healing.sewfaces -text "Sew faces" \ + ttk::checkbutton $w.healing.sewfaces -text "Sew faces" \ -variable occoptions.sewfaces - checkbutton $w.healing.makesolids -text "Make solids" \ + ttk::checkbutton $w.healing.makesolids -text "Make solids" \ -variable occoptions.makesolids - checkbutton $w.healing.splitpartitions -text "Split partitions" \ + ttk::checkbutton $w.healing.splitpartitions -text "Split partitions" \ -variable occoptions.splitpartitions - button $w.healing.heal -text "Heal geometry" -command { + ttk::button $w.healing.heal -text "Heal geometry" -command { .occ_dlg.healing.tolerance invoke Ng_OCCCommand shapehealing redraw