diff --git a/3dptv_vc2010/3dptv_vc2010.suo b/3dptv_vc2010/3dptv_vc2010.suo index 2d8c44c..593665c 100644 Binary files a/3dptv_vc2010/3dptv_vc2010.suo and b/3dptv_vc2010/3dptv_vc2010.suo differ diff --git a/3dptv_vc2010/3dptv_vc2010/3dptv_vc2010.vcxproj.user b/3dptv_vc2010/3dptv_vc2010/3dptv_vc2010.vcxproj.user index fe50502..944054f 100644 --- a/3dptv_vc2010/3dptv_vc2010/3dptv_vc2010.vcxproj.user +++ b/3dptv_vc2010/3dptv_vc2010/3dptv_vc2010.vcxproj.user @@ -1,9 +1,9 @@  - c:\ptv\ptv.tcl + D:\OpenPTV\3dptv\ptv.tcl WindowsLocalDebugger - c:\ptv\test + D:\OpenPTV\3dptv\test c:\ptv\ptv.tcl diff --git a/ptv.tcl b/ptv.tcl index f2e92d1..df2293c 100644 --- a/ptv.tcl +++ b/ptv.tcl @@ -1,4 +1,4 @@ - +package require BWidget package require tooltip lappend auto_path [file dirname [info script]] diff --git a/src_tcl/calpar.tcl b/src_tcl/calpar.tcl index db92a50..72800dc 100644 --- a/src_tcl/calpar.tcl +++ b/src_tcl/calpar.tcl @@ -2,10 +2,26 @@ ######################################## proc calpar { } { -set w .changecalib +set p .changecalib catch {destroy $w} -toplevel .changecalib -wm title $w "Changing Parameters" +catch {destroy $p} +# Create new Window & adjustment of initial size and position +toplevel $p +wm title $p "Changing Parameters" +wm geometry $p 550x550+150+150 + + +# Editet by: P.Steinhoff 24.01.2012 +# Put everything in a ScrolledWindow, bwidget1.9.4 (included in TCL 8.4.19) is required in folder: ..svn-ptv/lib/!! +set sw [ScrolledWindow $p.sw] +pack $p.sw -fill both -expand true + +set sf [ScrollableFrame $p.sw.sf] + +$p.sw setwidget $sf +# +set q [$sf getframe] +set w $q global cp diff --git a/src_tcl/mainpar.tcl b/src_tcl/mainpar.tcl index 2644a41..df78de2 100644 --- a/src_tcl/mainpar.tcl +++ b/src_tcl/mainpar.tcl @@ -2,12 +2,30 @@ # Changing of mainparameters proc mainpar {} { - -set w .changemain +set p .changemain catch {destroy $w} -toplevel .changemain -wm title $w "Changing Parameters" - +catch {destroy $p} +# Create new Window & adjustment of initial size and position +toplevel $p +wm title $p "Changing Parameters" +wm geometry $p 550x650+150+150 + + +# Editet by: P.Steinhoff 24.01.2012 +# Put everything in a ScrolledWindow, bwidget1.9.4 (included in TCL 8.4.19) is required +set sw [ScrolledWindow $p.sw] +pack $p.sw -fill both -expand true + +set sf [ScrollableFrame $p.sw.sf] + +$p.sw setwidget $sf +# +set q [$sf getframe] +set w $q +# Panning via right mouse button: (does not work at the moment) +# bind .changemain {%W scan mark %x %y} +# bind .changemain {%W scan dragto %x %y} +# global mp label $w.title -text "Main Parameters" -font {Helvetica 12 bold} -width 20 -anchor center diff --git a/src_tcl/trackpar.tcl b/src_tcl/trackpar.tcl index ee3b12f..33197fb 100644 --- a/src_tcl/trackpar.tcl +++ b/src_tcl/trackpar.tcl @@ -2,11 +2,26 @@ ######################################## proc trackpar { } { -set w .changetrack +set p .changetrack catch {destroy $w} -toplevel .changetrack -wm title $w "Changing Parameters" - +catch {destroy $p} +# Create new Window & adjustment of initial size and position +toplevel $p +wm title $p "Changing Parameters" +wm geometry $p 550x550+150+150 + +# Editet by: P.Steinhoff 24.01.2012 +# Put everything in a ScrolledWindow, bwidget1.9.4 (included in TCL 8.4.19) is required!! +set sw [ScrolledWindow $p.sw] +pack $p.sw -fill both -expand true + +set sf [ScrollableFrame $p.sw.sf] + +$p.sw setwidget $sf +# +set q [$sf getframe] +set w $q +# global tp label $w.title -text "Tracking Parameters" -font {Helvetica 12 bold} -width 50 -anchor center