refactor glyph loading into glyph manager. Closes NISystemsEngineerin…

…g#26
smithed · Jan 8, 2015 · 26ed3f5 · 26ed3f5
1 parent c39b042
commit 26ed3f5
Show file tree

Hide file tree

Showing 70 changed files with 231 additions and 165 deletions.
diff --git a/Tests/GetIDs.vi b/Tests/GetIDs.vi
diff --git a/Tests/LinkTest.vi b/Tests/LinkTest.vi
diff --git a/Tests/TestTreeToRepo.vi b/Tests/TestTreeToRepo.vi
diff --git a/Trunk/CEF.lvproj b/Trunk/CEF.lvproj
@@ -38,12 +38,14 @@
 				<Item Name="DialogType.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/DialogType.ctl"/>
 				<Item Name="DialogTypeEnum.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/DialogTypeEnum.ctl"/>
 				<Item Name="Directory of Top Level VI.vi" Type="VI" URL="/&lt;vilib&gt;/picture/jpeg.llb/Directory of Top Level VI.vi"/>
+				<Item Name="Draw Flattened Pixmap.vi" Type="VI" URL="/&lt;vilib&gt;/picture/picture.llb/Draw Flattened Pixmap.vi"/>
 				<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
 				<Item Name="Error Code Database.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Code Database.vi"/>
 				<Item Name="ErrWarn.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/ErrWarn.ctl"/>
 				<Item Name="eventvkey.ctl" Type="VI" URL="/&lt;vilib&gt;/event_ctls.llb/eventvkey.ctl"/>
 				<Item Name="ex_CorrectErrorChain.vi" Type="VI" URL="/&lt;vilib&gt;/express/express shared/ex_CorrectErrorChain.vi"/>
 				<Item Name="Find Tag.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Find Tag.vi"/>
+				<Item Name="FixBadRect.vi" Type="VI" URL="/&lt;vilib&gt;/picture/pictutil.llb/FixBadRect.vi"/>
 				<Item Name="Format Message String.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Format Message String.vi"/>
 				<Item Name="General Error Handler CORE.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/General Error Handler CORE.vi"/>
 				<Item Name="General Error Handler.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/General Error Handler.vi"/>
@@ -65,6 +67,7 @@
 				<Item Name="NI_FileType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/lvfile.llb/NI_FileType.lvlib"/>
 				<Item Name="NI_PackedLibraryUtility.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/LVLibp/NI_PackedLibraryUtility.lvlib"/>
 				<Item Name="Not Found Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Not Found Dialog.vi"/>
+				<Item Name="Picture to Pixmap.vi" Type="VI" URL="/&lt;vilib&gt;/picture/pictutil.llb/Picture to Pixmap.vi"/>
 				<Item Name="Read PNG File.vi" Type="VI" URL="/&lt;vilib&gt;/picture/png.llb/Read PNG File.vi"/>
 				<Item Name="Recursive File List.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Recursive File List.vi"/>
 				<Item Name="Search and Replace Pattern.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Search and Replace Pattern.vi"/>

diff --git a/Trunk/Configuration Framework/AddNode.vi b/Trunk/Configuration Framework/AddNode.vi
diff --git a/Trunk/Configuration Framework/LoadCustomGlyphs.vi b/Trunk/Configuration Framework/LoadCustomGlyphs.vi
diff --git a/Trunk/Configuration Framework/NISE_CEF_TreeControl.lvlib b/Trunk/Configuration Framework/NISE_CEF_TreeControl.lvlib
@@ -56,8 +56,11 @@
 	<Item Name="NonDuplicateArrays.vi" Type="VI" URL="../NonDuplicateArrays.vi"/>
 	<Item Name="one shot error.vi" Type="VI" URL="../one shot error.vi"/>
 	<Item Name="PopulateTreeSumary.vi" Type="VI" URL="../PopulateTreeSumary.vi"/>
+	<Item Name="PopulateTreeSumaryWithGlyphManager.vi" Type="VI" URL="../PopulateTreeSumaryWithGlyphManager.vi"/>
 	<Item Name="RefreshEntireTree.vi" Type="VI" URL="../RefreshEntireTree.vi"/>
+	<Item Name="RefreshEntireTreeWithGlyphManager.vi" Type="VI" URL="../RefreshEntireTreeWithGlyphManager.vi"/>
 	<Item Name="RefreshSubTree.vi" Type="VI" URL="../RefreshSubTree.vi"/>
+	<Item Name="RefreshSubTreeWithGlyphManager.vi" Type="VI" URL="../RefreshSubTreeWithGlyphManager.vi"/>
 	<Item Name="RemoveNode.vi" Type="VI" URL="../RemoveNode.vi"/>
 	<Item Name="Summary.vi" Type="VI" URL="../Summary.vi"/>
 	<Item Name="ValidDragDrop.vi" Type="VI" URL="../ValidDragDrop.vi"/>

diff --git a/Trunk/Configuration Framework/Node/AddGlyphtoGManager.vi b/Trunk/Configuration Framework/Node/AddGlyphtoGManager.vi
diff --git a/Trunk/Configuration Framework/Node/GetOverlay.vi b/Trunk/Configuration Framework/Node/GetOverlay.vi
diff --git a/Trunk/Configuration Framework/Node/Initialize.vi b/Trunk/Configuration Framework/Node/Initialize.vi
diff --git a/Trunk/Configuration Framework/Node/NISE_CEF_Node.lvclass b/Trunk/Configuration Framework/Node/NISE_CEF_Node.lvclass
diff --git a/Trunk/Configuration Framework/Node/Summary.ctl b/Trunk/Configuration Framework/Node/Summary.ctl
diff --git a/Trunk/Configuration Framework/PopulateTreeSumary.vi b/Trunk/Configuration Framework/PopulateTreeSumary.vi
diff --git a/Trunk/Configuration Framework/PopulateTreeSumaryWithGlyphManager.vi b/Trunk/Configuration Framework/PopulateTreeSumaryWithGlyphManager.vi
diff --git a/Trunk/Configuration Framework/RefreshEntireTree.vi b/Trunk/Configuration Framework/RefreshEntireTree.vi
diff --git a/Trunk/Configuration Framework/RefreshEntireTreeWithGlyphManager.vi b/Trunk/Configuration Framework/RefreshEntireTreeWithGlyphManager.vi
diff --git a/Trunk/Configuration Framework/RefreshSubTree.vi b/Trunk/Configuration Framework/RefreshSubTree.vi
diff --git a/Trunk/Configuration Framework/RefreshSubTreeWithGlyphManager.vi b/Trunk/Configuration Framework/RefreshSubTreeWithGlyphManager.vi
diff --git a/Trunk/Configuration Framework/Summary.vi b/Trunk/Configuration Framework/Summary.vi
diff --git a/Trunk/Configuration Framework/folder/AddChildtoNode.vi b/Trunk/Configuration Framework/folder/AddChildtoNode.vi
diff --git a/Trunk/Configuration Framework/folder/EditOptions.vi b/Trunk/Configuration Framework/folder/EditOptions.vi
diff --git a/Trunk/Configuration Framework/folder/RemoveChildFromNode.vi b/Trunk/Configuration Framework/folder/RemoveChildFromNode.vi
diff --git a/Trunk/Configuration Framework/glyph manager/add glyph core.vi b/Trunk/Configuration Framework/glyph manager/add glyph core.vi
diff --git a/Trunk/Configuration Framework/glyph manager/add glyphs from path.vi b/Trunk/Configuration Framework/glyph manager/add glyphs from path.vi
diff --git a/Trunk/Configuration Framework/glyph manager/add glyphs.vi b/Trunk/Configuration Framework/glyph manager/add glyphs.vi
diff --git a/Trunk/Configuration Framework/glyph manager/add search path.vi b/Trunk/Configuration Framework/glyph manager/add search path.vi
diff --git a/Trunk/Configuration Framework/glyph manager/create glyph manager.vi b/Trunk/Configuration Framework/glyph manager/create glyph manager.vi
diff --git a/Trunk/Configuration Framework/glyph manager/create overlay set.vi b/Trunk/Configuration Framework/glyph manager/create overlay set.vi
diff --git a/Trunk/Configuration Framework/glyph manager/find glyph data by name.vi b/Trunk/Configuration Framework/glyph manager/find glyph data by name.vi
diff --git a/Trunk/Configuration Framework/glyph manager/glyph manager.ctl b/Trunk/Configuration Framework/glyph manager/glyph manager.ctl
diff --git a/Trunk/Configuration Framework/glyph manager/glyph manager.lvlib b/Trunk/Configuration Framework/glyph manager/glyph manager.lvlib
diff --git a/Trunk/Configuration Framework/glyph manager/refresh glyph set.vi b/Trunk/Configuration Framework/glyph manager/refresh glyph set.vi
diff --git a/Trunk/Configuration Framework/glyph manager/update tree control.vi b/Trunk/Configuration Framework/glyph manager/update tree control.vi
diff --git a/Trunk/Configuration Framework/serializable configuration/validate.vi b/Trunk/Configuration Framework/serializable configuration/validate.vi
diff --git a/Trunk/Configuration Framework/serializable node/AddGlyphtoGManager.vi b/Trunk/Configuration Framework/serializable node/AddGlyphtoGManager.vi
diff --git a/Trunk/Configuration Framework/serializable node/Duplicate.vi b/Trunk/Configuration Framework/serializable node/Duplicate.vi
diff --git a/Trunk/Configuration Framework/serializable node/GetOverlay.vi b/Trunk/Configuration Framework/serializable node/GetOverlay.vi
diff --git a/Trunk/Configuration Framework/serializable node/Initialize.vi b/Trunk/Configuration Framework/serializable node/Initialize.vi
diff --git a/Trunk/Configuration Framework/serializable node/NISE_CEF_serializable node.lvclass b/Trunk/Configuration Framework/serializable node/NISE_CEF_serializable node.lvclass
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Classes/cRIO node/Initialize.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/Classes/cRIO node/Initialize.vi
diff --git a/.../Source/Advanced Configurator/Classes/channel configuration/channel configuration.lvclass b/.../Source/Advanced Configurator/Classes/channel configuration/channel configuration.lvclass
diff --git a/...k/ProjectTemplates/Source/Advanced Configurator/Classes/channel configuration/validate.vi b/...k/ProjectTemplates/Source/Advanced Configurator/Classes/channel configuration/validate.vi
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Classes/current node/Initialize.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/Classes/current node/Initialize.vi
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Classes/group node/Duplicate.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/Classes/group node/Duplicate.vi
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Classes/group node/Initialize.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/Classes/group node/Initialize.vi
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Classes/voltage node/Initialize.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/Classes/voltage node/Initialize.vi
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Configuration Tool Main.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/Configuration Tool Main.vi
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Controls/StateCluster.ctl b/Trunk/ProjectTemplates/Source/Advanced Configurator/Controls/StateCluster.ctl
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Glyphs/Async.png b/Trunk/ProjectTemplates/Source/Advanced Configurator/Glyphs/Async.png
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Glyphs/Error.png b/Trunk/ProjectTemplates/Source/Advanced Configurator/Glyphs/Error.png
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Glyphs/PC.png b/Trunk/ProjectTemplates/Source/Advanced Configurator/Glyphs/PC.png
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/Glyphs/cRIO.png b/Trunk/ProjectTemplates/Source/Advanced Configurator/Glyphs/cRIO.png
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/subVI/FilePaths.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/subVI/FilePaths.vi
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/subVI/Save.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/subVI/Save.vi
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/subVI/SaveAs.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/subVI/SaveAs.vi
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/subVI/SaveDialog.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/subVI/SaveDialog.vi
diff --git a/Trunk/ProjectTemplates/Source/Advanced Configurator/subVI/generate default path.vi b/Trunk/ProjectTemplates/Source/Advanced Configurator/subVI/generate default path.vi
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Classes/Current/Initialize.vi b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Classes/Current/Initialize.vi
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Classes/Group/Initialize.vi b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Classes/Group/Initialize.vi
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Classes/Voltage/Initialize.vi b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Classes/Voltage/Initialize.vi
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Classes/cRIO/Initialize.vi b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Classes/cRIO/Initialize.vi
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Configuration Tool Main.vi b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Configuration Tool Main.vi
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Controls/StateCluster.ctl b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Controls/StateCluster.ctl
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Glyphs/Async.png b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Glyphs/Async.png
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Glyphs/Error.png b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Glyphs/Error.png
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Glyphs/PC.png b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Glyphs/PC.png
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Glyphs/cRIO.png b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/Glyphs/cRIO.png
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/subVI/Save.vi b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/subVI/Save.vi
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/subVI/SaveAs.vi b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/subVI/SaveAs.vi
diff --git a/Trunk/ProjectTemplates/Source/Configuration Editor Framework/subVI/SaveDialog.vi b/Trunk/ProjectTemplates/Source/Configuration Editor Framework/subVI/SaveDialog.vi