Revision: 75259
http://sourceforge.net/p/brlcad/code/75259
Author: starseeker
Date: 2020-04-02 21:48:22 +0000 (Thu, 02 Apr 2020)
Log Message:
-----------
Revert some Archer changes made long ago when testing Itcl/Itk 4 - not sure yet
how we'll proceed to upgrade.
Modified Paths:
--------------
brlcad/trunk/src/archer/archer_launch.tcl
brlcad/trunk/src/archer/plugins/Wizards/humanwizard/HumanWizard.tcl
brlcad/trunk/src/archer/plugins/Wizards/tankwizard/TankWizard.tcl
brlcad/trunk/src/archer/plugins/Wizards/tirewizard/TireWizard.tcl
brlcad/trunk/src/tclscripts/archer/Archer.tcl
brlcad/trunk/src/tclscripts/archer/AttrGroupsDisplayUtility.tcl
brlcad/trunk/src/tclscripts/archer/BotUtility.tcl
brlcad/trunk/src/tclscripts/archer/GeometryEditFrame.tcl
brlcad/trunk/src/tclscripts/archer/LODUtility.tcl
Property Changed:
----------------
brlcad/trunk/src/tclscripts/archer/
Modified: brlcad/trunk/src/archer/archer_launch.tcl
===================================================================
--- brlcad/trunk/src/archer/archer_launch.tcl 2020-04-02 21:41:04 UTC (rev
75258)
+++ brlcad/trunk/src/archer/archer_launch.tcl 2020-04-02 21:48:22 UTC (rev
75259)
@@ -167,7 +167,7 @@
}
update idletasks
- #$::ArcherCore::splash configure -background $::ArcherCore::SystemWindow
+ $::ArcherCore::splash configure -background $::ArcherCore::SystemWindow
$::ArcherCore::splash center
update idletasks
$::ArcherCore::splash activate
Modified: brlcad/trunk/src/archer/plugins/Wizards/humanwizard/HumanWizard.tcl
===================================================================
--- brlcad/trunk/src/archer/plugins/Wizards/humanwizard/HumanWizard.tcl
2020-04-02 21:41:04 UTC (rev 75258)
+++ brlcad/trunk/src/archer/plugins/Wizards/humanwizard/HumanWizard.tcl
2020-04-02 21:48:22 UTC (rev 75259)
@@ -31,8 +31,8 @@
public {
# Override's for the Wizard class
- common wizardMajorType "Wizard"
- common wizardMinorType "Mged"
+ common wizardMajorType $Archer::pluginMajorTypeWizard
+ common wizardMinorType $Archer::pluginMinorTypeMged
common wizardName "Human Wizard"
common wizardVersion "0.5"
common wizardClass HumanWizard
Modified: brlcad/trunk/src/archer/plugins/Wizards/tankwizard/TankWizard.tcl
===================================================================
--- brlcad/trunk/src/archer/plugins/Wizards/tankwizard/TankWizard.tcl
2020-04-02 21:41:04 UTC (rev 75258)
+++ brlcad/trunk/src/archer/plugins/Wizards/tankwizard/TankWizard.tcl
2020-04-02 21:48:22 UTC (rev 75259)
@@ -34,8 +34,8 @@
public {
# Override's for the Wizard class
- common wizardMajorType "Wizard"
- common wizardMinorType "Mged"
+ common wizardMajorType $Archer::pluginMajorTypeWizard
+ common wizardMinorType $Archer::pluginMinorTypeMged
common wizardName "Tank Wizard"
common wizardVersion "1.0"
common wizardClass TankWizard
Modified: brlcad/trunk/src/archer/plugins/Wizards/tirewizard/TireWizard.tcl
===================================================================
--- brlcad/trunk/src/archer/plugins/Wizards/tirewizard/TireWizard.tcl
2020-04-02 21:41:04 UTC (rev 75258)
+++ brlcad/trunk/src/archer/plugins/Wizards/tirewizard/TireWizard.tcl
2020-04-02 21:48:22 UTC (rev 75259)
@@ -31,8 +31,8 @@
public {
# Override's for the Wizard class
- common wizardMajorType "Wizard"
- common wizardMinorType "Mged"
+ common wizardMajorType $Archer::pluginMajorTypeWizard
+ common wizardMinorType $Archer::pluginMinorTypeMged
common wizardName "Tire Wizard"
common wizardVersion "1.0"
common wizardClass TireWizard
Index: brlcad/trunk/src/tclscripts/archer
===================================================================
--- brlcad/trunk/src/tclscripts/archer 2020-04-02 21:41:04 UTC (rev 75258)
+++ brlcad/trunk/src/tclscripts/archer 2020-04-02 21:48:22 UTC (rev 75259)
Property changes on: brlcad/trunk/src/tclscripts/archer
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,2 ##
/brlcad/branches/RELEASE/src/tclscripts/archer:70323-70333,71915-71935,72826-72858,74376-74454
-/brlcad/branches/brep-debug/src/tclscripts/archer:69168,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
-/brlcad/branches/tcltk86/src/tclscripts/archer:68300-75257
\ No newline at end of property
+/brlcad/branches/brep-debug/src/tclscripts/archer:69168,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
\ No newline at end of property
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2020-04-02 21:41:04 UTC
(rev 75258)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2020-04-02 21:48:22 UTC
(rev 75259)
@@ -597,8 +597,7 @@
-hscrollmode dynamic \
-vscrollmode dynamic \
-labeltext "Installed Plug-ins" \
- #-labelfont [list $SystemWindowFont 10 bold] \
-
+ -labelfont [list $SystemWindowFont 10 bold] \
-labelpos n]
set i 0
@@ -2528,7 +2527,7 @@
}
-proc ::get_html_data {helpfile} {
+proc Archer::get_html_data {helpfile} {
global archer_help_data
set help_fd [open $helpfile]
@@ -2630,7 +2629,7 @@
set docstochtml [$docstoclist html]
$docstochtml configure -parsemode html
set help_fd [lindex [list [file join [bu_brlcad_root "share/doc/html"]
toc.html]] 0]
- ::get_html_data $help_fd
+ get_html_data $help_fd
$docstochtml parse $archer_help_data
grid $docstoclist -sticky nsew -in $docstoc
@@ -2658,7 +2657,7 @@
$htmlviewer configure -parsemode html
$htmlviewer configure -imagecmd Archer::mkHelpTkImage
set help_fd [lindex [list [file join [bu_brlcad_root "share/doc/html"]
books BRL-CAD_Tutorial_Series-VolumeI.html]] 0]
- ::get_html_data $help_fd
+ get_html_data $help_fd
$htmlviewer parse $archer_help_data
grid $hv3htmlviewer -sticky nsew -in $sfcs
@@ -8523,7 +8522,7 @@
set wplugins {}
foreach plugin $::Archer::plugins {
set majorType [$plugin get -majorType]
- if {$majorType != "Wizard"} {
+ if {$majorType != $pluginMajorTypeWizard} {
continue
}
@@ -9863,6 +9862,7 @@
}
}
+
Archer::initArcher
if {$Archer::corePluginInit != ""} {
Modified: brlcad/trunk/src/tclscripts/archer/AttrGroupsDisplayUtility.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/AttrGroupsDisplayUtility.tcl
2020-04-02 21:41:04 UTC (rev 75258)
+++ brlcad/trunk/src/tclscripts/archer/AttrGroupsDisplayUtility.tcl
2020-04-02 21:48:22 UTC (rev 75259)
@@ -33,8 +33,8 @@
public {
# Override's for the Utility class
- common utilityMajorType "Utility"
- common utilityMinorType "Mged"
+ common utilityMajorType $Archer::pluginMajorTypeUtility
+ common utilityMinorType $Archer::pluginMinorTypeMged
common utilityName "AttrGroupsDisplay Utility"
common utilityVersion "1.0"
common utilityClass AttrGroupsDisplayUtility
@@ -227,8 +227,8 @@
initLists
- #$itk_component(glistFrame) configure -labelfont [list
$::ArcherCore::SystemWindowFont 12]
- #$itk_component(alistFrame) configure -labelfont [list
$::ArcherCore::SystemWindowFont 12]
+ $itk_component(glistFrame) configure -labelfont [list
$::ArcherCore::SystemWindowFont 12]
+ $itk_component(alistFrame) configure -labelfont [list
$::ArcherCore::SystemWindowFont 12]
if {$mHandleToplevel} {
set mToplevel [winfo toplevel $itk_interior]
Modified: brlcad/trunk/src/tclscripts/archer/BotUtility.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/BotUtility.tcl 2020-04-02 21:41:04 UTC
(rev 75258)
+++ brlcad/trunk/src/tclscripts/archer/BotUtility.tcl 2020-04-02 21:48:22 UTC
(rev 75259)
@@ -38,8 +38,8 @@
public {
# Override's for the Utility class
- common utilityMajorType "Utility"
- common utilityMinorType "Mged"
+ common utilityMajorType $Archer::pluginMajorTypeUtility
+ common utilityMinorType $Archer::pluginMinorTypeMged
common utilityName "Bot Utility"
common utilityVersion "1.0"
common utilityClass BotUtility
Modified: brlcad/trunk/src/tclscripts/archer/GeometryEditFrame.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/GeometryEditFrame.tcl 2020-04-02
21:41:04 UTC (rev 75258)
+++ brlcad/trunk/src/tclscripts/archer/GeometryEditFrame.tcl 2020-04-02
21:48:22 UTC (rev 75259)
@@ -32,9 +32,9 @@
itk_option define -geometryChangedCallback geometryChangedCallback
GeometryChangedCallback ""
itk_option define -prevGeometryObject prevGeometryObject
PrevGeometryObject ""
- itk_option define -labelFont labelFont Font [list Helvetica 12]
- itk_option define -boldLabelFont boldLabelFont Font [list Helvetica 12
bold]
- itk_option define -entryFont entryFont Font [list Helvetica 12]
+ itk_option define -labelFont labelFont Font [list
$::ArcherCore::SystemWindowFont 12]
+ itk_option define -boldLabelFont boldLabelFont Font [list
$::ArcherCore::SystemWindowFont 12 bold]
+ itk_option define -entryFont entryFont Font [list
$::ArcherCore::SystemWindowFont 12]
itk_option define -units units Units ""
itk_option define -valueUnits valueUnits ValueUnits ""
@@ -54,7 +54,7 @@
common mEditCommand ""
common mEditParam1 0
common mEditParam2 0
- common mEditLastTransMode "10"
+ common mEditLastTransMode $::ArcherCore::OBJECT_CENTER_MODE
common mEditPCommand ""
common mHighlightPoints 1
common mHighlightPointSize 1.0
Modified: brlcad/trunk/src/tclscripts/archer/LODUtility.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/LODUtility.tcl 2020-04-02 21:41:04 UTC
(rev 75258)
+++ brlcad/trunk/src/tclscripts/archer/LODUtility.tcl 2020-04-02 21:48:22 UTC
(rev 75259)
@@ -35,8 +35,8 @@
public {
# Override's for the Utility class
- common utilityMajorType "Utility"
- common utilityMinorType "Mged"
+ common utilityMajorType $Archer::pluginMajorTypeUtility
+ common utilityMinorType $Archer::pluginMinorTypeMged
common utilityName "LOD Utility"
common utilityVersion "1.0"
common utilityClass LODUtility
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
