igarden-commit Mailing List for GardenSketch (Page 76)
Status: Beta
Brought to you by:
jlbedell
Menu
▾
▴
igarden-commit — CVS Commits for GardenSketch
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
(77) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(103) |
Feb
(278) |
Mar
(130) |
Apr
(66) |
May
(56) |
Jun
(31) |
Jul
(94) |
Aug
(73) |
Sep
(22) |
Oct
(306) |
Nov
(52) |
Dec
|
| 2008 |
Jan
(27) |
Feb
(90) |
Mar
(218) |
Apr
(145) |
May
(114) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jeffrey B. <jlb...@us...> - 2006-12-13 12:11:26
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28457 Modified Files: Tag: Release_branch_v1 MaterialCollection.cpp MaterialCollection.h Log Message: Fully implement planting regions for choosing the quick pick list Index: MaterialCollection.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialCollection.cpp,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -d -r1.6.2.3 -r1.6.2.4 *** MaterialCollection.cpp 12 Dec 2006 03:57:09 -0000 1.6.2.3 --- MaterialCollection.cpp 13 Dec 2006 12:11:22 -0000 1.6.2.4 *************** *** 352,355 **** --- 352,372 ---- } + // --------------------------------------------------------------------------- + /// ParseXML + // + void MaterialCollection::GetNameFromXML(XGXMLObject *obj, String &str) + { + XGXMLData *dataObj; + const char *val; + + dataObj = dynamic_cast<XGXMLData*>(obj); + PRECONDITION(strcmp(dataObj->GetTag(), "Palette") == 0); + val = dataObj->GetArgValue("Name"); + if(val != NULL) + str.SetCString(val); + else + str.SetCString(""); + } + //elem.name = material->GetDisplayName(kUsePreferencesSetting); Index: MaterialCollection.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialCollection.h,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -d -r1.5.2.3 -r1.5.2.4 *** MaterialCollection.h 12 Dec 2006 23:23:15 -0000 1.5.2.3 --- MaterialCollection.h 13 Dec 2006 12:11:22 -0000 1.5.2.4 *************** *** 64,67 **** --- 64,68 ---- void ParseXML(XGXMLObject *obj); + static void GetNameFromXML(XGXMLObject *obj, String &str); protected: |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-13 00:43:41
|
Update of /cvsroot/igarden/Garden/UnitTest In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31282 Modified Files: Tag: Release_branch_v1 LayoutDBTests.cpp Log Message: Port initial unit test to MacIntel Index: LayoutDBTests.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/UnitTest/Attic/LayoutDBTests.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** LayoutDBTests.cpp 12 Dec 2006 23:23:21 -0000 1.1.2.2 --- LayoutDBTests.cpp 13 Dec 2006 00:43:39 -0000 1.1.2.3 *************** *** 29,35 **** BasicTests::testCase1() { ! XGDynArray items; ! matCollItem_t *oneItem; ! long n; oneItem = new matCollItem_t; --- 29,35 ---- BasicTests::testCase1() { ! XGDynArray<matCollItem_t*> items; ! matCollItem_t *oneItem; ! long n; oneItem = new matCollItem_t; *************** *** 57,61 **** QuicksortByName(items, 0, items.Length()-1); for(n = 0; n < items.Length()-1; n++) ! CPTAssert(items[n] <= items[n+1]); } --- 57,61 ---- QuicksortByName(items, 0, items.Length()-1); for(n = 0; n < items.Length()-1; n++) ! CPTAssert(items[n]->sortName <= items[n+1]->sortName); } |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-13 00:43:35
|
Update of /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31267 Modified Files: Tag: Release_branch_v1 project.pbxproj Log Message: Port initial unit test to MacIntel Index: project.pbxproj =================================================================== RCS file: /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj/project.pbxproj,v retrieving revision 1.58.2.10 retrieving revision 1.58.2.11 diff -C2 -d -r1.58.2.10 -r1.58.2.11 *** project.pbxproj 12 Dec 2006 03:57:47 -0000 1.58.2.10 --- project.pbxproj 13 Dec 2006 00:43:33 -0000 1.58.2.11 *************** *** 539,542 **** --- 539,543 ---- 49DD85E707B59B9D00474746 /* TextBoxInfoPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49DD85E507B59B9D00474746 /* TextBoxInfoPanel.cpp */; }; 49DD85E807B59B9D00474746 /* TextBoxInfoPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 49DD85E607B59B9D00474746 /* TextBoxInfoPanel.h */; }; + 49DE7F730B2F7F3A00E03046 /* YAAF_FW.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 493D184209937B3700EE071C /* YAAF_FW.framework */; }; 49E11D2107EC72740003CDA5 /* PlanGroupAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49E11D1D07EC72740003CDA5 /* PlanGroupAction.cpp */; }; 49E11D2207EC72740003CDA5 /* PlanGroupAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E11D1E07EC72740003CDA5 /* PlanGroupAction.h */; }; *************** *** 1275,1278 **** --- 1276,1280 ---- files = ( 49C7E3430B2E423100755D16 /* CPlusTest.framework in Frameworks */, + 49DE7F730B2F7F3A00E03046 /* YAAF_FW.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 3078,3081 **** --- 3080,3087 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/GardenSketch.app/Contents/MacOS/GardenSketch"; COPY_PHASE_STRIP = NO; *************** *** 3121,3124 **** --- 3127,3134 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; *************** *** 3145,3148 **** --- 3155,3162 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_MODEL_TUNING = G5; *************** *** 3343,3346 **** --- 3357,3361 ---- "PM_USE_SESSION_APIS=0", ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_UNROLL_LOOPS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; *************** *** 3425,3428 **** --- 3440,3444 ---- "PM_USE_SESSION_APIS=0", ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_UNROLL_LOOPS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; *************** *** 3514,3517 **** --- 3530,3534 ---- "PM_USE_SESSION_APIS=0", ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_UNROLL_LOOPS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 23:23:24
|
Update of /cvsroot/igarden/Garden/UnitTest In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27856 Modified Files: Tag: Release_branch_v1 LayoutDBTests.cpp Log Message: Check in actual unit test (not stub to test the test harness) Index: LayoutDBTests.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/UnitTest/Attic/LayoutDBTests.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** LayoutDBTests.cpp 12 Dec 2006 03:50:30 -0000 1.1.2.1 --- LayoutDBTests.cpp 12 Dec 2006 23:23:21 -0000 1.1.2.2 *************** *** 29,50 **** BasicTests::testCase1() { ! #if 0 ! matCollItem_t items[6]; long n; ! items[0].sortName = "Viburnum lantana"; ! items[1].sortName = "Magnolia x soulangiana"; ! items[2].sortName = "Larix decidua"; ! items[3].sortName = "Tradescantia virginiana"; ! items[4].sortName = "Kochia scoparia"; ! items[5].sortName = "Monarda didyma"; // for(n = 0; n < 10; n++) // printf("Before A[%ld] = %ld\n", n, a[n]); ! MyQsort(items, 0, 5); ! for(n = 0; n < 5; n++) CPTAssert(items[n] <= items[n+1]); - #endif } --- 29,61 ---- BasicTests::testCase1() { ! XGDynArray items; ! matCollItem_t *oneItem; long n; ! oneItem = new matCollItem_t; ! oneItem->sortName = "Viburnum lantana"; ! items.push_back(oneItem); ! oneItem = new matCollItem_t; ! oneItem->sortName = "Magnolia x soulangiana"; ! items.push_back(oneItem); ! oneItem = new matCollItem_t; ! oneItem->sortName = "Larix decidua"; ! items.push_back(oneItem); ! oneItem = new matCollItem_t; ! oneItem->sortName = "Tradescantia virginiana"; ! items.push_back(oneItem); ! oneItem = new matCollItem_t; ! oneItem->sortName = "Kochia scoparia"; ! items.push_back(oneItem); ! oneItem = new matCollItem_t; ! oneItem->sortName = "Monarda didyma"; ! items.push_back(oneItem); // for(n = 0; n < 10; n++) // printf("Before A[%ld] = %ld\n", n, a[n]); ! QuicksortByName(items, 0, items.Length()-1); ! for(n = 0; n < items.Length()-1; n++) CPTAssert(items[n] <= items[n+1]); } *************** *** 52,56 **** BasicTests::testCase2() { ! CPTAssert(false); } --- 63,67 ---- BasicTests::testCase2() { ! // CPTAssert(false); } |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 23:23:17
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27818 Modified Files: Tag: Release_branch_v1 MaterialCollection.h Log Message: Check in actual unit test (not stub to test the test harness) Index: MaterialCollection.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialCollection.h,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -C2 -d -r1.5.2.2 -r1.5.2.3 *** MaterialCollection.h 9 Dec 2006 17:45:35 -0000 1.5.2.2 --- MaterialCollection.h 12 Dec 2006 23:23:15 -0000 1.5.2.3 *************** *** 84,87 **** --- 84,89 ---- }; + void QuicksortByName(XGDynArray<matCollItem_t*> &items, long left, long right); + #pragma warn_hidevirtual reset |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 03:57:48
|
Update of /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1111 Modified Files: Tag: Release_branch_v1 project.pbxproj Log Message: Enable unit test target Index: project.pbxproj =================================================================== RCS file: /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj/project.pbxproj,v retrieving revision 1.58.2.9 retrieving revision 1.58.2.10 diff -C2 -d -r1.58.2.9 -r1.58.2.10 *** project.pbxproj 5 Dec 2006 02:49:45 -0000 1.58.2.9 --- project.pbxproj 12 Dec 2006 03:57:47 -0000 1.58.2.10 *************** *** 480,483 **** --- 480,487 ---- 49C3C91D0AFE6BCC0022168F /* TestPattern1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49C3C91B0AFE6BCC0022168F /* TestPattern1.svg */; }; 49C3C91E0AFE6BCC0022168F /* TestPattern2.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49C3C91C0AFE6BCC0022168F /* TestPattern2.svg */; }; + 49C7E3130B2E3FC700755D16 /* UnitTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49C7E30C0B2E3FC000755D16 /* UnitTest.cpp */; }; + 49C7E3250B2E40A000755D16 /* LayoutDBTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49C7E3210B2E409C00755D16 /* LayoutDBTests.cpp */; }; + 49C7E3420B2E422F00755D16 /* CPlusTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49C7E3340B2E422F00755D16 /* CPlusTest.framework */; }; + 49C7E3430B2E423100755D16 /* CPlusTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49C7E3340B2E422F00755D16 /* CPlusTest.framework */; }; 49CA0AAE08B0176100FBA1F9 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49081028070CDE910044EEA3 /* OpenGL.framework */; }; 49CA0AAF08B0176200FBA1F9 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49080FFC070CDE170044EEA3 /* AGL.framework */; }; *************** *** 1182,1185 **** --- 1186,1194 ---- 49C3C91B0AFE6BCC0022168F /* TestPattern1.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = TestPattern1.svg; path = ../source/resources/2DSymbols/TestPattern1.svg; sourceTree = SOURCE_ROOT; }; 49C3C91C0AFE6BCC0022168F /* TestPattern2.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = TestPattern2.svg; path = ../source/resources/2DSymbols/TestPattern2.svg; sourceTree = SOURCE_ROOT; }; + 49C7E30C0B2E3FC000755D16 /* UnitTest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = UnitTest.cpp; path = ../UnitTest/UnitTest.cpp; sourceTree = SOURCE_ROOT; }; + 49C7E30D0B2E3FC000755D16 /* UnitTest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UnitTest.h; path = ../UnitTest/UnitTest.h; sourceTree = SOURCE_ROOT; }; + 49C7E3210B2E409C00755D16 /* LayoutDBTests.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = LayoutDBTests.cpp; path = ../UnitTest/LayoutDBTests.cpp; sourceTree = SOURCE_ROOT; }; + 49C7E3220B2E409D00755D16 /* LayoutDBTests.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LayoutDBTests.h; path = ../UnitTest/LayoutDBTests.h; sourceTree = SOURCE_ROOT; }; + 49C7E3340B2E422F00755D16 /* CPlusTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CPlusTest.framework; path = /System/Library/Frameworks/CPlusTest.framework; sourceTree = "<absolute>"; }; 49CA170508B17A4F00FBA1F9 /* YAAF_FW.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = YAAF_FW.framework; path = ../../../external/yaaf/build/Development/YAAF_FW.framework; sourceTree = SOURCE_ROOT; }; 49CA170E08B17C9F00FBA1F9 /* AppMain.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = AppMain.cpp; path = ../../../external/yaaf/Libraries/yaaf_gui/sources/AppMain.cpp; sourceTree = SOURCE_ROOT; }; *************** *** 1265,1268 **** --- 1274,1278 ---- buildActionMask = 2147483647; files = ( + 49C7E3430B2E423100755D16 /* CPlusTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 1312,1315 **** --- 1322,1326 ---- 4971AF410B1E855D004FC05F /* libz.dylib in Frameworks */, 4971B1FD0B1FD6F5004FC05F /* libZIP.a in Frameworks */, + 49C7E3420B2E422F00755D16 /* CPlusTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 1352,1355 **** --- 1363,1367 ---- 49B73E81064B11BC00C766D2 /* PlanView */, 49B73E29064B06D700C766D2 /* Document */, + 49C7E2FA0B2E3F1F00755D16 /* UnitTest */, 4971B1140B1FA207004FC05F /* ZIP.xcodeproj */, 4971B1170B1FA207004FC05F /* ZIP_Prefix.pch */, *************** *** 1426,1429 **** --- 1438,1442 ---- isa = PBXGroup; children = ( + 49C7E3340B2E422F00755D16 /* CPlusTest.framework */, 49080FFC070CDE170044EEA3 /* AGL.framework */, 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */, *************** *** 2080,2083 **** --- 2093,2107 ---- sourceTree = "<group>"; }; + 49C7E2FA0B2E3F1F00755D16 /* UnitTest */ = { + isa = PBXGroup; + children = ( + 49C7E3210B2E409C00755D16 /* LayoutDBTests.cpp */, + 49C7E3220B2E409D00755D16 /* LayoutDBTests.h */, + 49C7E30C0B2E3FC000755D16 /* UnitTest.cpp */, + 49C7E30D0B2E3FC000755D16 /* UnitTest.h */, + ); + name = UnitTest; + sourceTree = "<group>"; + }; 49E4BCC308BF37CE0039682B /* OpenGL */ = { isa = PBXGroup; *************** *** 2632,2635 **** --- 2656,2661 ---- buildActionMask = 2147483647; files = ( + 49C7E3130B2E3FC700755D16 /* UnitTest.cpp in Sources */, + 49C7E3250B2E40A000755D16 /* LayoutDBTests.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 3061,3064 **** --- 3087,3105 ---- GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; + GCC_PREPROCESSOR_DEFINITIONS = ( + __MACPB__, + YAAF_MACHO, + __powerc, + "PM_USE_SESSION_APIS=0", + ); + HEADER_SEARCH_PATHS = ( + /Developer/Headers/FlatCarbon, + "$(PROJECT_DIR)/../../../external/yaaf/Libraries/yaaf_core/headers", + "$(PROJECT_DIR)/../../../external/yaaf/Libraries/yaaf_GUI/headers", + "$(PROJECT_DIR)/../../CommonSource/Utilities", + "$(PROJECT_DIR)/../../../external/metakit/include", + "$(PROJECT_DIR)/../../CommonSource/YAAFExtensions", + "$(PROJECT_DIR)/../../../external/yaaf/Libraries/yaaf_HTTP/headers", + ); INFOPLIST_FILE = "UnitTest-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 03:57:11
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1028 Modified Files: Tag: Release_branch_v1 MaterialCollection.cpp Log Message: Change MaterialCollection sort to Quicksort Index: MaterialCollection.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialCollection.cpp,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** MaterialCollection.cpp 9 Dec 2006 17:45:35 -0000 1.6.2.2 --- MaterialCollection.cpp 12 Dec 2006 03:57:09 -0000 1.6.2.3 *************** *** 27,31 **** #include "SourceMaterialFile.h" ! enum matCollectProp_t { kFieldMatCollectName, --- 27,33 ---- #include "SourceMaterialFile.h" ! void QuicksortByName(XGDynArray<matCollItem_t*> &items, long left, long right); ! ! enum matCollectProp_t { kFieldMatCollectName, *************** *** 365,398 **** { numItems = _items.Length(); ! for(i = _items.Length()-1; i >= 0 && _items[i]->sortName.Length() == 0; i--) _items[i]->sortName = _items[i]->mat->GetDisplayName(namePref); ! // I know I know, but for a small number of items which should be already ! // be nearly sorted, this should be enough. ! for (i = 0; i < (numItems - 1); ++i) ! { ! NoSwaps = true; // Checks to see if any swaps happened ! ! for (unsigned int j = 1; j < (numItems - i); ++j) ! { ! if (_items[j - 1]->sortName > _items[j]->sortName) ! { ! intermediate = _items[j-1]; ! _items[j-1] = _items[j]; ! _items[j] = intermediate; ! ! // There was a swap, so set the flag false ! if (NoSwaps) ! NoSwaps = false; ! } ! } ! ! // If the sort didn't do anything (i.e. if the array is ! // sorted), then stop the algorithm. ! if (NoSwaps) ! break; ! } _needsSort = false; _sortType = namePref; } } --- 367,408 ---- { numItems = _items.Length(); ! for(i = numItems-1; i >= 0 && _items[i]->sortName.Length() == 0; i--) _items[i]->sortName = _items[i]->mat->GetDisplayName(namePref); ! if(numItems >= 1) ! QuicksortByName(_items, 0, _items.Length()-1); _needsSort = false; _sortType = namePref; } } + + // A simple recursive quicksort + void QuicksortByName(XGDynArray<matCollItem_t*> &items, long left, long right) + { + long i, j; + matCollItem_t *pivot, *tmp; + + i = left; + j = right; + pivot = items[(left+right)/2]; + do + { + while(items[i]->sortName < pivot->sortName) + i++; + while(pivot->sortName < items[j]->sortName) + j--; + if(i<=j) + { + tmp = items[i]; + items[i] = items[j]; + items[j] = tmp; + i++; + j--; + } + } while(i <= j); + if(left < j) + QuicksortByName(items, left,j); + if(i < right) + QuicksortByName(items, i,right); + } + |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 03:50:32
|
Update of /cvsroot/igarden/Garden/UnitTest In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30428/UnitTest Added Files: Tag: Release_branch_v1 LayoutDBTests.cpp LayoutDBTests.h UnitTest.cpp UnitTest.h Log Message: Added Files: Tag: Release_branch_v1 UnitTest/LayoutDBTests.cpp UnitTest/LayoutDBTests.h UnitTest/UnitTest.cpp UnitTest/UnitTest.h --- NEW FILE: UnitTest.h --- /* * UnitTest.h * qs * * Created by Jeffrey Bedell on 12/11/06. * Copyright 2006 __MyCompanyName__. All rights reserved. * */ #include <Carbon/Carbon.h> extern class RunTestsInTimer installTimer; class RunTestsInTimer { public: RunTestsInTimer(); virtual ~RunTestsInTimer(); EventLoopTimerUPP timerUPP; EventLoopTimerRef timerRef; static void firedTimerBridge( EventLoopTimerRef inTimer, void *inUserData ); void firedTimer( EventLoopTimerRef inTimer ); }; --- NEW FILE: LayoutDBTests.cpp --- /* * TestCase1.cpp * qs * * Created by Jeffrey Bedell on 12/11/06. * Copyright 2006 __MyCompanyName__. All rights reserved. * */ #include "LayoutDBTests.h" #include "MaterialCollection.h" BasicTests test1( TEST_INVOCATION(BasicTests, testCase1) ); BasicTests test2( TEST_INVOCATION(BasicTests, testCase2) ); extern void MyQsort(); BasicTests::BasicTests(TestInvocation *invocation) : TestCase(invocation) { } BasicTests::~BasicTests() { } void BasicTests::testCase1() { #if 0 matCollItem_t items[6]; long n; items[0].sortName = "Viburnum lantana"; items[1].sortName = "Magnolia x soulangiana"; items[2].sortName = "Larix decidua"; items[3].sortName = "Tradescantia virginiana"; items[4].sortName = "Kochia scoparia"; items[5].sortName = "Monarda didyma"; // for(n = 0; n < 10; n++) // printf("Before A[%ld] = %ld\n", n, a[n]); MyQsort(items, 0, 5); for(n = 0; n < 5; n++) CPTAssert(items[n] <= items[n+1]); #endif } void BasicTests::testCase2() { CPTAssert(false); } --- NEW FILE: LayoutDBTests.h --- /* * TestCase1.h * qs * * Created by Jeffrey Bedell on 12/11/06. * Copyright 2006 __MyCompanyName__. All rights reserved. * */ #include <CPlusTest/CPlusTest.h> class BasicTests : public TestCase { public: BasicTests(TestInvocation* invocation); virtual ~BasicTests(); public: void testCase1(); void testCase2(); }; #if 0 class TestCase1 : public TestCase { public: TestCase1(TestInvocation* invocation); virtual ~TestCase1(); virtual void setUp(); virtual void tearDown(); void MyFirstTest(); }; #endif --- NEW FILE: UnitTest.cpp --- /* * UnitTest.cpp * qs * * Created by Jeffrey Bedell on 12/11/06. * Copyright 2006 __MyCompanyName__. All rights reserved. * */ // RunTestsInTimer.cpp (almost straight copy and paste from Apple's suggestion) #include <CPlusTest/CPlusTest.h> #include "UnitTest.h" RunTestsInTimer installTimer; RunTestsInTimer::RunTestsInTimer() : timerUPP(0), timerRef(0) { printf("Got to RunTestsInTimer()!\n"); timerUPP = NewEventLoopTimerUPP(RunTestsInTimer::firedTimerBridge); InstallEventLoopTimer(GetMainEventLoop(), 0, 0, timerUPP, this, &timerRef); // RunTestsInTimer::firedTimer(timerRef); // No event loop in test app } RunTestsInTimer::~RunTestsInTimer() { if ( timerRef ) { RemoveEventLoopTimer(timerRef); timerRef = 0; } if ( timerUPP ) { DisposeEventLoopTimerUPP(timerUPP); timerUPP = 0; } } void RunTestsInTimer::firedTimerBridge( EventLoopTimerRef inTimer, void *inUserData ) { printf("Got to firedTimerBridge()!\n"); reinterpret_cast<RunTestsInTimer*>(inUserData)->firedTimer(inTimer); } void RunTestsInTimer::firedTimer( EventLoopTimerRef inTimer ) { if ( inTimer == timerRef ) { TestRun run; TestLog log(std::cerr); run.addObserver(&log); TestSuite& allTests = TestSuite::allTests(); allTests.run(run); std::cerr << "Ran " << run.runCount() << " tests, " << run.failureCount() << " failed." << std::endl; RemoveEventLoopTimer(timerRef); timerRef = 0; QuitApplicationEventLoop(); } } |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 03:48:32
|
Update of /cvsroot/igarden/Garden/UnitTest In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30023/UnitTest Log Message: Directory /cvsroot/igarden/Garden/UnitTest added to the repository --> Using per-directory sticky tag `Release_branch_v1' |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 01:15:43
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4466 Modified Files: Tag: Release_branch_v1 ClientDocument.cp ClientDocument.h Log Message: Set correct mod date for documents as well as sourceMaterials Index: ClientDocument.cp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/ClientDocument.cp,v retrieving revision 1.37.2.4 retrieving revision 1.37.2.5 diff -C2 -d -r1.37.2.4 -r1.37.2.5 *** ClientDocument.cp 12 Dec 2006 00:59:31 -0000 1.37.2.4 --- ClientDocument.cp 12 Dec 2006 01:15:40 -0000 1.37.2.5 *************** *** 385,389 **** --- 385,405 ---- const char * subFilePtr; bool more; + xmlReadContext_t context; + + #if OPT_MACOS + // On the main branch, move this into the fileSpecifier method + FSSpec macSpec = filename.GetFileName(); + FSRef ref; + FSCatalogInfo info; + DateTimeRec dtr; + FSpMakeFSRef(&macSpec, &ref); + FSGetCatalogInfo(&ref, kFSCatInfoContentMod, &info, NULL, NULL, NULL); + SecondsToDate (info.contentModDate.lowSeconds, &dtr); + context.modDate.SetYMD(dtr.year, dtr.month, dtr.day); + #else + #error TO_BE_PORTED + #endif + errLine = 0; _spec = filename; *************** *** 428,432 **** } inZipFile.LocateSubFile("content.xml"); ! ec = XMLDocumentOpen(&inZipFile, errLine); inZipFile.CloseSubFile(); --- 444,448 ---- } inZipFile.LocateSubFile("content.xml"); ! ec = XMLDocumentOpen(&inZipFile, errLine, context); inZipFile.CloseSubFile(); *************** *** 448,452 **** { inFile.SetFilePos(21); ! ec = XMLDocumentOpen(&inFile, errLine); } else --- 464,468 ---- { inFile.SetFilePos(21); ! ec = XMLDocumentOpen(&inFile, errLine, context); } else *************** *** 512,516 **** /// XMLDocumentOpen // ! ErrorCode ClientDocument::XMLDocumentOpen(XGFile *filePtr, long &errLine) { RGDOMParser parser(NULL, false); --- 528,532 ---- /// XMLDocumentOpen // ! ErrorCode ClientDocument::XMLDocumentOpen(XGFile *filePtr, long &errLine, xmlReadContext_t &context) { RGDOMParser parser(NULL, false); *************** *** 520,524 **** ErrorCode ec = 0; const char *val; - xmlReadContext_t context; parseTree = parser.RunDOMParser(filePtr); --- 536,539 ---- Index: ClientDocument.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/ClientDocument.h,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -C2 -d -r1.18.2.1 -r1.18.2.2 *** ClientDocument.h 3 Dec 2006 02:09:55 -0000 1.18.2.1 --- ClientDocument.h 12 Dec 2006 01:15:41 -0000 1.18.2.2 *************** *** 31,34 **** --- 31,35 ---- #include "YAAFStrategy.h" #include "ColumnSets.h" + #include "Persist.h" #include <XGDocument.h> class SiteData; *************** *** 105,109 **** // methods ErrorCode DBDocumentOpen(XGFileSpecifier& filename, OSType creator); ! ErrorCode XMLDocumentOpen(XGFile *filePtr, long &errLine); #if OPT_MACOS bool SynchronizeFile(XGWindow *win); --- 106,110 ---- // methods ErrorCode DBDocumentOpen(XGFileSpecifier& filename, OSType creator); ! ErrorCode XMLDocumentOpen(XGFile *filePtr, long &errLine, xmlReadContext_t &context); #if OPT_MACOS bool SynchronizeFile(XGWindow *win); |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:59:33
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30688 Modified Files: Tag: Release_branch_v1 ClientDocument.cp Log Message: Improve performance of startup by only merging source material when changed. Index: ClientDocument.cp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/ClientDocument.cp,v retrieving revision 1.37.2.3 retrieving revision 1.37.2.4 diff -C2 -d -r1.37.2.3 -r1.37.2.4 *** ClientDocument.cp 7 Dec 2006 01:22:46 -0000 1.37.2.3 --- ClientDocument.cp 12 Dec 2006 00:59:31 -0000 1.37.2.4 *************** *** 520,523 **** --- 520,524 ---- ErrorCode ec = 0; const char *val; + xmlReadContext_t context; parseTree = parser.RunDOMParser(filePtr); *************** *** 555,559 **** { mat = new Material(SourceMaterialFile::GetSourceDatabase()); ! mat->ParseXML(sub2); sub2 = sub2->GetSibling(); } --- 556,560 ---- { mat = new Material(SourceMaterialFile::GetSourceDatabase()); ! mat->ParseXML(sub2, context); sub2 = sub2->GetSibling(); } *************** *** 573,577 **** StringToUUID(val, uid); supplier = new InfoSupplier(SourceMaterialFile::GetSourceDatabase(), uid); ! supplier->ParseXML(sub2); sub2 = sub2->GetSibling(); --- 574,578 ---- StringToUUID(val, uid); supplier = new InfoSupplier(SourceMaterialFile::GetSourceDatabase(), uid); ! supplier->ParseXML(sub2, context); sub2 = sub2->GetSibling(); |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:58:43
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30300 Modified Files: Tag: Release_branch_v1 MaterialRef.cpp Log Message: Improve performance of startup by only merging source material when changed. Index: MaterialRef.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialRef.cpp,v retrieving revision 1.119.2.4 retrieving revision 1.119.2.5 diff -C2 -d -r1.119.2.4 -r1.119.2.5 *** MaterialRef.cpp 29 Nov 2006 12:19:25 -0000 1.119.2.4 --- MaterialRef.cpp 12 Dec 2006 00:58:41 -0000 1.119.2.5 *************** *** 775,783 **** else if(strcmp(dataObj->GetTag(), "Years") == 0) { instObj = dataObj->GetChild(); while(instObj != NULL) { inst = new InstanceData(nilID, this); ! inst->ParseObjectXML(instObj, true); _attributes.push_back(inst); instObj = instObj->GetSibling(); --- 775,785 ---- else if(strcmp(dataObj->GetTag(), "Years") == 0) { + xmlReadContext_t context; + instObj = dataObj->GetChild(); while(instObj != NULL) { inst = new InstanceData(nilID, this); ! inst->ParseObjectXML(instObj, true, context); _attributes.push_back(inst); instObj = instObj->GetSibling(); |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:57:32
|
Update of /cvsroot/igarden/Garden/source/resources In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29898 Modified Files: Tag: Release_branch_v1 SourceMaterialsStart.xml Garden2.rsrc Log Message: Improve performance of startup by only merging source material when changed. Index: SourceMaterialsStart.xml =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/SourceMaterialsStart.xml,v retrieving revision 1.24.2.6 retrieving revision 1.24.2.7 diff -C2 -d -r1.24.2.6 -r1.24.2.7 *** SourceMaterialsStart.xml 15 Nov 2006 04:04:53 -0000 1.24.2.6 --- SourceMaterialsStart.xml 12 Dec 2006 00:57:29 -0000 1.24.2.7 *************** *** 216,220 **** <Variant UID="DB1F3130-D6A0-11DA-AB89-C467FD397B7A" variantName="Snowbank" FlwrColor="white"/> </Material> ! <Material UID="0000BAE9-0000-A106-0000-00030000F59C" CanonicalName="Brassica oleracea" CommonName="Brocolli" materialType="Vegetable" usage=food Spread="45.70cm"> <Variant UID="0000BAE9-0000-A114-0000-00030000F8FA" variantName="Premium Crop"/> </Material> --- 216,220 ---- <Variant UID="DB1F3130-D6A0-11DA-AB89-C467FD397B7A" variantName="Snowbank" FlwrColor="white"/> </Material> ! <Material UID="0000BAE9-0000-A106-0000-00030000F59C" CanonicalName="Brassica oleracea" CommonName="Brocolli" materialType="Vegetable" usage=food Spread="45.70cm" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BAE9-0000-A114-0000-00030000F8FA" variantName="Premium Crop"/> </Material> *************** *** 256,260 **** </Material> <Material UID="76891E4E-D64F-11DA-AB89-C467FD397B7A" CanonicalName="Campanula poscharskyana" CommonName="Serbian bellflower" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="4a-10" Height="20.30cm" Spread="30.40cm" FlwrColor="blue"/> ! <Material UID="0000BADC-0000-1232-0000-000B0000BA49" CanonicalName="Capsicum annuum" CommonName="Pepper" Spread="60.90cm"> <Variant UID="0000BADD-0000-59B7-0000-003F0000435C" variantName="corno di toro rosso"/> </Material> --- 256,260 ---- </Material> <Material UID="76891E4E-D64F-11DA-AB89-C467FD397B7A" CanonicalName="Campanula poscharskyana" CommonName="Serbian bellflower" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="4a-10" Height="20.30cm" Spread="30.40cm" FlwrColor="blue"/> ! <Material UID="0000BADC-0000-1232-0000-000B0000BA49" CanonicalName="Capsicum annuum" CommonName="Pepper" Spread="60.90cm" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BADD-0000-59B7-0000-003F0000435C" variantName="corno di toro rosso"/> </Material> *************** *** 371,382 **** <Variant UID="DB1F447C-D6A0-11DA-AB89-C467FD397B7A" variantName="Clara Curtis"/> </Material> ! <Material UID="0000BAE1-0000-54A3-0000-0092000038AD" CanonicalName="Cucumis melo" CommonName="Cantaloupe" materialType="Vegetable" usage=food Spread="1.22m to 1.83m"> <Variant UID="0000BAE1-0000-53B9-0000-0092000001AB" CommonName="Muskmelon" variantName="Blenheim orange heirloom"/> <Variant UID="0000BAE1-0000-54AB-0000-009200003A5D" variantName="vine peach"/> </Material> ! <Material UID="0000BAE1-0000-528B-0000-00910000BAF7" CanonicalName="Cucumis sativus" CommonName="Cucumber" materialType="Vegetable" usage=food Spread="1.22m to 1.52m"> <Variant UID="0000BAE1-0000-5295-0000-00910000BD3A" variantName="Sweet success hyb"/> </Material> ! <Material UID="0000BAA9-0000-EDFF-0000-00980000CEA8" CanonicalName="Cucurbita pepo" CommonName="Bushel gourd" materialType="Vegetable" usage=food Spread="1.83m"> </Material> <Material UID="FA30490E-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Deschampsia caespitosa" CommonName="tufted hairgrass" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="91.40cm" Spread="60.90cm" PlantForm="upright oval" GrowthRate="moderate" LifeExp="long lived" SoilPh="strong acid-neutral" SoilTex="sand, sandy loam, loam, clay loam, clay" ShadeTol="full sun" FolTex="medium" FolCol="medium green" AutumnVis="low, none" FlwrColor="yellow" FlwrVis="very low" FruitCol="brown"/> --- 371,382 ---- <Variant UID="DB1F447C-D6A0-11DA-AB89-C467FD397B7A" variantName="Clara Curtis"/> </Material> ! <Material UID="0000BAE1-0000-54A3-0000-0092000038AD" CanonicalName="Cucumis melo" CommonName="Cantaloupe" materialType="Vegetable" usage=food Spread="1.22m to 1.83m" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BAE1-0000-53B9-0000-0092000001AB" CommonName="Muskmelon" variantName="Blenheim orange heirloom"/> <Variant UID="0000BAE1-0000-54AB-0000-009200003A5D" variantName="vine peach"/> </Material> ! <Material UID="0000BAE1-0000-528B-0000-00910000BAF7" CanonicalName="Cucumis sativus" CommonName="Cucumber" materialType="Vegetable" usage=food Spread="1.22m to 1.52m" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BAE1-0000-5295-0000-00910000BD3A" variantName="Sweet success hyb"/> </Material> ! <Material UID="0000BAA9-0000-EDFF-0000-00980000CEA8" CanonicalName="Cucurbita pepo" CommonName="Bushel gourd" materialType="Vegetable" usage=food Spread="1.83m" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> </Material> <Material UID="FA30490E-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Deschampsia caespitosa" CommonName="tufted hairgrass" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="91.40cm" Spread="60.90cm" PlantForm="upright oval" GrowthRate="moderate" LifeExp="long lived" SoilPh="strong acid-neutral" SoilTex="sand, sandy loam, loam, clay loam, clay" ShadeTol="full sun" FolTex="medium" FolCol="medium green" AutumnVis="low, none" FlwrColor="yellow" FlwrVis="very low" FruitCol="brown"/> *************** *** 697,701 **** <Variant UID="5D11B40E-D6A3-11DA-AB89-C467FD397B7A" variantName="Kobold" FlwrColor="lavander" FruitCol="brown"/> </Material> ! <Material UID="0000BAE7-0000-E95A-0000-004D0000D972" CanonicalName="Lagenaria siceraria" CommonName="gourd" materialType="Vegetable" usage=food Spread="1.83m"> <Variant UID="0000BAE7-0000-E966-0000-004D0000DC4A" variantName="birdhouse"/> </Material> --- 697,701 ---- <Variant UID="5D11B40E-D6A3-11DA-AB89-C467FD397B7A" variantName="Kobold" FlwrColor="lavander" FruitCol="brown"/> </Material> ! <Material UID="0000BAE7-0000-E95A-0000-004D0000D972" CanonicalName="Lagenaria siceraria" CommonName="gourd" materialType="Vegetable" usage=food Spread="1.83m" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BAE7-0000-E966-0000-004D0000DC4A" variantName="birdhouse"/> </Material> *************** *** 719,723 **** <Material UID="FA339B8A-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Lonicera tatarica" CommonName="Tatarian honeysuckle" materialType="DeciduousShrub" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="3.05m" Spread="3.05m" PlantForm="globular" GrowthRate="fast" LifeExp="medium lived" SoilPh="moderate acid-alkaline" SoilTex="sand, sandy loam, loam" FolTex="coarse" FolCol="medium green" AutumnVis="low, none" FruitCol="red"/> <Material UID="FA33A85E-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Lotus corniculatus" CommonName="birdfoot Trefoil" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="30.40cm" Spread="45.70cm" PlantForm="weeping" GrowthRate="moderate" LifeExp="medium lived" SoilPh="moderate acid-alkaline" SoilTex="sand, sandy loam, loam, clay loam, clay" ShadeTol="full sun" FolTex="fine" FolCol="medium green" AutumnVis="low, none" FlwrColor="yellow" FruitCol="brown"/> ! <Material UID="0000BAE7-0000-233C-0000-00110000FA35" CanonicalName="Luffa cylindrica" CommonName="gourd" materialType="Vegetable" usage=food Spread="1.22m"> <Variant UID="0000BAE7-0000-2368-0000-001200000470" variantName="luffa sponge"/> </Material> --- 719,723 ---- <Material UID="FA339B8A-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Lonicera tatarica" CommonName="Tatarian honeysuckle" materialType="DeciduousShrub" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="3.05m" Spread="3.05m" PlantForm="globular" GrowthRate="fast" LifeExp="medium lived" SoilPh="moderate acid-alkaline" SoilTex="sand, sandy loam, loam" FolTex="coarse" FolCol="medium green" AutumnVis="low, none" FruitCol="red"/> <Material UID="FA33A85E-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Lotus corniculatus" CommonName="birdfoot Trefoil" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="30.40cm" Spread="45.70cm" PlantForm="weeping" GrowthRate="moderate" LifeExp="medium lived" SoilPh="moderate acid-alkaline" SoilTex="sand, sandy loam, loam, clay loam, clay" ShadeTol="full sun" FolTex="fine" FolCol="medium green" AutumnVis="low, none" FlwrColor="yellow" FruitCol="brown"/> ! <Material UID="0000BAE7-0000-233C-0000-00110000FA35" CanonicalName="Luffa cylindrica" CommonName="gourd" materialType="Vegetable" usage=food Spread="1.22m" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BAE7-0000-2368-0000-001200000470" variantName="luffa sponge"/> </Material> *************** *** 1293,1300 **** <Material UID="F1FE0306-ED5B-488B-AB49-3539D57C3C0B" CommonName="Small Pool 1" materialType="Water" Height="1in" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="KidneyPool.svg"/> <Material UID="F1FE0306-ED5B-488B-AB49-3539D57C3C0B" CommonName="Sundial" materialType="Accent" Height="2ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Sundial.svg"/> ! <Material UID="01234683-0000-E73E-0000-0A00000065F1" CommonName="Turf" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="turf.png"/> ! <Material UID="01234684-0000-E73E-0000-0A00000065F1" CommonName="Asphalt" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="blacktop.png"/> ! <Material UID="01234685-0000-E73E-0000-0A00000065F1" CommonName="Tile" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="tilefloor.png"/> ! <Material UID="01234686-0000-E73E-0000-0A00000065F1" CommonName="Wood Chips" materialType="Mulch" Height="5cm" MaterialLength="40.60cm" MaterialWidth="40.60cm" Picture="dirt.png"/> </Materials> </iGardenSource> \ No newline at end of file --- 1293,1300 ---- <Material UID="F1FE0306-ED5B-488B-AB49-3539D57C3C0B" CommonName="Small Pool 1" materialType="Water" Height="1in" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="KidneyPool.svg"/> <Material UID="F1FE0306-ED5B-488B-AB49-3539D57C3C0B" CommonName="Sundial" materialType="Accent" Height="2ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Sundial.svg"/> ! <Material UID="01234683-0000-E73E-0000-0A00000065F1" CommonName="Turf" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="turf.png" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"/> ! <Material UID="01234684-0000-E73E-0000-0A00000065F1" CommonName="Asphalt" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="blacktop.png" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"/> ! <Material UID="01234685-0000-E73E-0000-0A00000065F1" CommonName="Tile" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="tilefloor.png" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"/> ! <Material UID="01234686-0000-E73E-0000-0A00000065F1" CommonName="Wood Chips" materialType="Mulch" Height="5cm" MaterialLength="40.60cm" MaterialWidth="40.60cm" Picture="dirt.png" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"/> </Materials> </iGardenSource> \ No newline at end of file Index: Garden2.rsrc =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/Garden2.rsrc,v retrieving revision 1.33.2.3 retrieving revision 1.33.2.4 diff -C2 -d -r1.33.2.3 -r1.33.2.4 Binary files /tmp/cvsfzS8dP and /tmp/cvsbUd0Mb differ |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:56:13
|
Update of /cvsroot/igarden/Garden/source/SourceMaterialDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29465 Modified Files: Tag: Release_branch_v1 SourceMaterialFile.h Log Message: Improve performance of startup by only merging source material when changed. Index: SourceMaterialFile.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/SourceMaterialFile.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** SourceMaterialFile.h 17 Jun 2006 16:00:39 -0000 1.9 --- SourceMaterialFile.h 12 Dec 2006 00:56:09 -0000 1.9.2.1 *************** *** 68,72 **** // attributes ! }; --- 68,73 ---- // attributes ! RGDateTime _fileModDate; ! XGUUID _startupFileUUID; }; |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:55:55
|
Update of /cvsroot/igarden/Garden/source/SourceMaterialDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29133 Modified Files: Tag: Release_branch_v1 SourceMaterialFile.cpp Log Message: Improve performance of startup by only merging source material when changed. Index: SourceMaterialFile.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/SourceMaterialFile.cpp,v retrieving revision 1.22.2.1 retrieving revision 1.22.2.2 diff -C2 -d -r1.22.2.1 -r1.22.2.2 *** SourceMaterialFile.cpp 2 Nov 2006 23:47:32 -0000 1.22.2.1 --- SourceMaterialFile.cpp 12 Dec 2006 00:55:54 -0000 1.22.2.2 *************** *** 36,39 **** --- 36,42 ---- #include "PluginUtils.h" #include "GardenColor.h" + #include "RGDateTime.h" + + // #define TEST_LOAD_BEHAVIOR 1 // --------------------------------------------------------------------------- *************** *** 61,64 **** --- 64,82 ---- { spec.SetFile(mkdir, sourceStartFile); + #if OPT_MACOS + // On the main branch, move this into the fileSpecifier method + FSSpec macSpec = spec.GetFileName(); + FSRef ref; + FSCatalogInfo info; + DateTimeRec dtr; + + FSpMakeFSRef(&macSpec, &ref); + FSGetCatalogInfo(&ref, kFSCatInfoContentMod, &info, NULL, NULL, NULL); + SecondsToDate (info.contentModDate.lowSeconds, &dtr); + _fileModDate.SetYMD(dtr.year, dtr.month, dtr.day); + #else + #error TO_BE_PORTED + #endif + ec = gSourceDB->ImportFromXML(spec); if(ec != KYAAFNoError) *************** *** 253,257 **** SourceMaterialFile::SourceMaterialFile() { ! } // --------------------------------------------------------------------------- --- 271,275 ---- SourceMaterialFile::SourceMaterialFile() { ! _startupFileUUID.ConvertFromString("436377F9-C915-489B-91F8-5339FAF0B054"); } // --------------------------------------------------------------------------- *************** *** 415,419 **** if(item != NULL) { ! item->MergeAttributesFrom(list, force ? kMergeForceAll : kMergeStd); changed = true; } --- 433,437 ---- if(item != NULL) { ! item->MergeAttributesFrom(list, _fileModDate, force ? kMergeForceAll : kMergeStd); changed = true; } *************** *** 536,540 **** --- 554,560 ---- XGUUID uid; InfoSupplier *supplier; + xmlReadContext_t context; + context.modDate = _fileModDate; data = dynamic_cast<XGXMLData*>(sub4); val = data->GetArgValue("UID"); *************** *** 544,548 **** { supplier = new InfoSupplier(this, uid); ! supplier->ParseXML(sub4); delete supplier; } --- 564,568 ---- { supplier = new InfoSupplier(this, uid); ! supplier->ParseXML(sub4, context); delete supplier; } *************** *** 552,556 **** { const char *val; ! bool done; XGUUID uid; XGXMLData *data2, *data3; --- 572,576 ---- { const char *val; ! bool done, refFound; XGUUID uid; XGXMLData *data2, *data3; *************** *** 558,594 **** Variant *variant; Material *mat; materialType_t oldType; done = false; data2 = dynamic_cast<XGXMLData*>(sub2); mat = FindMaterialFromXMLNames(sub2, false); if(mat != NULL) { ! if(mat->GetSpeciesObj()->NumItems(kFlowerColor) == 1) { ! GardenColor color; ! if(mat->GetSpeciesObj()->GetIndexedColor(kFlowerColor, 0, color)) { ! Int32 colorVal; ! attributeID_t attrID = kFlowerColor; ! color.GetStoredValue(attrID, colorVal); ! if(colorVal == kFlowerColorBlack) ! mat->GetSpeciesObj()->RemoveAllIndexedItems(attrID); } } ! oldType = mat->GetMaterialType(); ! if(oldType == kMaterialTypeHardscape) ! { ! mat->SetMaterialType(kMaterialTypeUnspecified); // Force to take new type ! if(!mat->CanAttributesBeMerged(sub2)) ! mat->SetMaterialType(oldType); // If still can't be merged, leave alone. ! } ! ! if(mat->CanAttributesBeMerged(sub2)) { ! mat->GetSpeciesObj()->MergeAttributesFrom(sub2, mergeType); done = true; } --- 578,639 ---- Variant *variant; Material *mat; + RGDateTime date; materialType_t oldType; + xmlReadContext_t context; done = false; data2 = dynamic_cast<XGXMLData*>(sub2); + context.modDate = _fileModDate; mat = FindMaterialFromXMLNames(sub2, false); if(mat != NULL) { ! refFound = mat->GetLatestDatedReference(kFieldSuppliers, date); ! if(!refFound || date.GetDouble() < _fileModDate.GetDouble()) { ! #if TEST_LOAD_BEHAVIOR ! String fileDateStr, objDateStr; ! _fileModDate.LongDateStr(shortDate, fileDateStr); ! date.LongDateStr(shortDate, objDateStr); ! ! printf("Material '%s' File is %s object is %s\n", ! mat->GetDisplayName(kUsePreferencesSetting).c_str(), ! fileDateStr.c_str(), (refFound ? objDateStr.c_str() : "<not found>")); ! #endif ! if(mat->GetSpeciesObj()->NumItems(kFlowerColor) == 1) { ! GardenColor color; ! if(mat->GetSpeciesObj()->GetIndexedColor(kFlowerColor, 0, color)) ! { ! Int32 colorVal; ! attributeID_t attrID = kFlowerColor; ! ! color.GetStoredValue(attrID, colorVal); ! if(colorVal == kFlowerColorBlack) ! mat->GetSpeciesObj()->RemoveAllIndexedItems(attrID); ! } ! } ! oldType = mat->GetMaterialType(); ! if(oldType == kMaterialTypeHardscape) ! { ! mat->SetMaterialType(kMaterialTypeUnspecified); // Force to take new type ! if(!mat->CanAttributesBeMerged(sub2)) ! mat->SetMaterialType(oldType); // If still can't be merged, leave alone. ! } ! ! if(mat->CanAttributesBeMerged(sub2)) ! { ! mat->GetSpeciesObj()->MergeAttributesFrom(sub2, _fileModDate, mergeType); ! ! done = true; } } ! else { ! #if TEST_LOAD_BEHAVIOR ! printf("Have valid material, skipping\n"); ! #endif done = true; } *************** *** 597,618 **** if(!done) { mat = new Material(this); ! mat->ParseXML(sub2); } char fileName[256]; ! mat->GetString(kOBSOLETEPlantVarietyPicture, sizeof(fileName), fileName); ! if(strlen(fileName) != 0) { ! OptCopyFileFromAppBundle(fileName); } ! mat->GetString(kOBSOLETEPlantSpeciesPicture, sizeof(fileName), fileName); ! if(strlen(fileName) != 0) { ! OptCopyFileFromAppBundle(fileName); } ! ! ! sub3 = data2->GetChild(); while(sub3 != NULL) // Has variants --- 642,683 ---- if(!done) { + uint32 i, numSuppliers; + InfoSupplier *sup; + XGUUID uid; + GardenDate lastModDate(_fileModDate); + mat = new Material(this); ! mat->ParseXML(sub2, context); ! ! // Mark the material is having come from this file on the file mod data. ! // This keeps from re-merging every time that GardenSketch is started. ! #if TEST_LOAD_BEHAVIOR ! printf("Loading material (No Merge)\n"); ! #endif ! numSuppliers = mat->GetNumSuppliers(); ! for(i=0; i < numSuppliers; i++) ! { ! sup = mat->GetIndexedSupplier(i); ! sup->GetSupplierID(uid); ! mat->SetLastModified(uid, lastModDate); ! } } char fileName[256]; ! if(mat->GetString(kOBSOLETEPlantVarietyPicture, sizeof(fileName), fileName)) { ! if(strlen(fileName) != 0) ! { ! OptCopyFileFromAppBundle(fileName); ! } } ! if(mat->GetString(kOBSOLETEPlantSpeciesPicture, sizeof(fileName), fileName)) { ! if(strlen(fileName) != 0) ! { ! OptCopyFileFromAppBundle(fileName); ! } } ! sub3 = data2->GetChild(); while(sub3 != NULL) // Has variants *************** *** 626,632 **** if(variant != NULL) { ! if(variant->CanAttributesBeMerged(sub3)) { ! variant->MergeAttributesFrom(sub3, mergeType); done = true; } --- 691,719 ---- if(variant != NULL) { ! variant->GetLatestDatedReference(kFieldSuppliers, date); ! if(date.GetDouble() < _fileModDate.GetDouble()) { ! #if TEST_LOAD_BEHAVIOR ! String fileDateStr, objDateStr; ! ! _fileModDate.LongDateStr(shortDate, fileDateStr); ! date.LongDateStr(shortDate, objDateStr); ! ! printf("Variant '%s' File is %s object is %s\n", ! mat->GetDisplayName(kUsePreferencesSetting).c_str(), ! fileDateStr.c_str(), (refFound ? objDateStr.c_str() : "<not found>")); ! #endif ! ! if(variant->CanAttributesBeMerged(sub3)) ! { ! variant->MergeAttributesFrom(sub3, _fileModDate, mergeType); ! done = true; ! } ! } ! else ! { ! #if TEST_LOAD_BEHAVIOR ! printf("Have valid material, skipping\n"); ! #endif done = true; } *************** *** 638,642 **** StringToUUID(val, uid); variant = new Variant(this, uid); ! variant->ParseXML(sub3); } sub3 = sub3->GetSibling(); --- 725,729 ---- StringToUUID(val, uid); variant = new Variant(this, uid); ! variant->ParseXML(sub3, context); } sub3 = sub3->GetSibling(); |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:54:41
|
Update of /cvsroot/igarden/Garden/source/SourceMaterialDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28728 Modified Files: Tag: Release_branch_v1 Material.h Material.cpp Log Message: Improve performance of startup by only merging source material when changed. Index: Material.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/Material.cpp,v retrieving revision 1.43 retrieving revision 1.43.2.1 diff -C2 -d -r1.43 -r1.43.2.1 *** Material.cpp 21 Jun 2006 12:19:31 -0000 1.43 --- Material.cpp 12 Dec 2006 00:54:39 -0000 1.43.2.1 *************** *** 1397,1401 **** /// ParseXML // ! void Material::ParseXML(XGXMLObject *obj ) { XGXMLData *dataObj; --- 1397,1401 ---- /// ParseXML // ! void Material::ParseXML(XGXMLObject *obj, xmlReadContext_t &context ) { XGXMLData *dataObj; *************** *** 1410,1414 **** // <Variant UID="0000B7B8-0000-3BEE-0000-001800006C45" variantName="Yellow" FlwrColor="yellow"/> // </Material> ! _species->ParseObjectXML(obj, true); subObj = dataObj->GetChild(); --- 1410,1414 ---- // <Variant UID="0000B7B8-0000-3BEE-0000-001800006C45" variantName="Yellow" FlwrColor="yellow"/> // </Material> ! _species->ParseObjectXML(obj, true, context); subObj = dataObj->GetChild(); *************** *** 1421,1425 **** _variant = new Variant(GetFile(), uid); _variant->SetParent(this); ! _variant->ParseXML(subObj); if(LookupVariant(uid) == NULL) { --- 1421,1425 ---- _variant = new Variant(GetFile(), uid); _variant->SetParent(this); ! _variant->ParseXML(subObj, context); if(LookupVariant(uid) == NULL) { *************** *** 1532,1538 **** /// ParseObjectXML // ! void Material::ParseObjectXML(XGXMLObject *obj, bool useAttributes) { ! _species->ParseObjectXML(obj, useAttributes); } --- 1532,1538 ---- /// ParseObjectXML // ! void Material::ParseObjectXML(XGXMLObject *obj, bool useAttributes, xmlReadContext_t context ) { ! _species->ParseObjectXML(obj, useAttributes, context ); } Index: Material.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/Material.h,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -C2 -d -r1.22 -r1.22.2.1 *** Material.h 7 Jun 2006 23:00:48 -0000 1.22 --- Material.h 12 Dec 2006 00:54:39 -0000 1.22.2.1 *************** *** 126,130 **** landscapeHeight_t GetOriginalHeight(); planLength_t GetOriginalSpread(); ! virtual void ParseXML(XGXMLObject *obj ); virtual void SaveAsXML(RGXMLWriter &writer); void SetVariant(Variant *var) { _variant = var; } --- 126,130 ---- landscapeHeight_t GetOriginalHeight(); planLength_t GetOriginalSpread(); ! virtual void ParseXML(XGXMLObject *obj, xmlReadContext_t &context ); virtual void SaveAsXML(RGXMLWriter &writer); void SetVariant(Variant *var) { _variant = var; } *************** *** 139,143 **** virtual bool GetFlexCount(propertyID_t propertyID, FlexCount &count); virtual void SetFlexCount(propertyID_t propertyID, FlexCount &count); ! virtual void ParseObjectXML(XGXMLObject *obj, bool useAttributes); virtual void SaveObjectAsXML(RGXMLWriter &writer, bool useAttributes); virtual bool GetValueInt32Range(propertyID_t propertyID, Int32& lowerLimit, Int32& upperLimit); --- 139,143 ---- virtual bool GetFlexCount(propertyID_t propertyID, FlexCount &count); virtual void SetFlexCount(propertyID_t propertyID, FlexCount &count); ! virtual void ParseObjectXML(XGXMLObject *obj, bool useAttributes, xmlReadContext_t context ); virtual void SaveObjectAsXML(RGXMLWriter &writer, bool useAttributes); virtual bool GetValueInt32Range(propertyID_t propertyID, Int32& lowerLimit, Int32& upperLimit); *************** *** 172,176 **** virtual bool CanAttributesBeMerged(XGXMLObject *obj) {return _species->CanAttributesBeMerged(obj); } ! virtual void MergeAttributesFrom(XGXMLObject *obj, mergeType_t mergeType) { _species->MergeAttributesFrom(obj, mergeType); } protected: --- 172,177 ---- virtual bool CanAttributesBeMerged(XGXMLObject *obj) {return _species->CanAttributesBeMerged(obj); } ! virtual void MergeAttributesFrom(XGXMLObject *obj, RGDateTime &fileDate, mergeType_t mergeType) { _species->MergeAttributesFrom(obj, fileDate, mergeType); } ! virtual bool GetLatestDatedReference(propertyID_t propertyID, RGDateTime& date) { return _species->GetLatestDatedReference(propertyID, date); } protected: |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:53:54
|
Update of /cvsroot/igarden/Garden/source/Database In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28333 Modified Files: Tag: Release_branch_v1 Persist.h Persist.cp Log Message: Improve performance of startup by only merging source material when changed. Index: Persist.cp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Database/Persist.cp,v retrieving revision 1.41.2.1 retrieving revision 1.41.2.2 diff -C2 -d -r1.41.2.1 -r1.41.2.2 *** Persist.cp 9 Dec 2006 21:33:43 -0000 1.41.2.1 --- Persist.cp 12 Dec 2006 00:53:52 -0000 1.41.2.2 *************** *** 1286,1290 **** /// ParseObjectXML // ! void DBPersist::ParseObjectXML(XGXMLObject *obj, bool useAttributes ) { XGXMLData *dataObj; --- 1286,1290 ---- /// ParseObjectXML // ! void DBPersist::ParseObjectXML(XGXMLObject *obj, bool useAttributes, xmlReadContext_t context ) { XGXMLData *dataObj; *************** *** 1355,1362 **** case kAttrDate: case kAttrURLSet: - case kAttrSuppliers: AttributeDictionary::ConvertXMLToValue(value, static_cast<attributeID_t>(propID), this); break; case kAttrInteger: SetInt32(propID, StringToInteger(value)); --- 1355,1365 ---- case kAttrDate: case kAttrURLSet: AttributeDictionary::ConvertXMLToValue(value, static_cast<attributeID_t>(propID), this); break; + case kAttrSuppliers: + AttributeDictionary::ConvertXMLToSupplierValue(value, static_cast<attributeID_t>(propID), context.modDate, this); + break; + case kAttrInteger: SetInt32(propID, StringToInteger(value)); *************** *** 1773,1777 **** /// MergeAttributesFrom // ! void DBPersist::MergeAttributesFrom( XGXMLObject *obj, mergeType_t mergeType ) { Int32 count, iter, srcVal, destVal; --- 1776,1780 ---- /// MergeAttributesFrom // ! void DBPersist::MergeAttributesFrom( XGXMLObject *obj, RGDateTime &fileDate, mergeType_t mergeType ) { Int32 count, iter, srcVal, destVal; *************** *** 1913,1916 **** --- 1916,1921 ---- case kAttrSuppliers: + AttributeDictionary::ConvertXMLToSupplierValue(src, (attributeID_t)propertyID, fileDate, this); + break; case kAttrColorSet: AttributeDictionary::ConvertXMLToValue(src, (attributeID_t)propertyID, this); *************** *** 2072,2073 **** --- 2077,2103 ---- return found; } + + // --------------------------------------------------------------------------- + /// GetDatedReference + // + bool DBPersist::GetLatestDatedReference( propertyID_t propertyID, RGDateTime& date ) + { + UInt32 n, numItems; + XGUUID id; + RGDateTime theDate; + + numItems = NumItems(propertyID); + for(n = 0; n < numItems; n++) + { + if(GetIndexedDatedReference(propertyID, n, id, theDate)) + { + if(n == 0 || theDate.GetDouble() > date.GetDouble()) + { + date = theDate; + } + } + } + + return numItems > 0; + } + Index: Persist.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Database/Persist.h,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -C2 -d -r1.20 -r1.20.2.1 *** Persist.h 17 Jun 2006 14:27:57 -0000 1.20 --- Persist.h 12 Dec 2006 00:53:52 -0000 1.20.2.1 *************** *** 42,45 **** --- 42,50 ---- } mergeType_t; + typedef struct + { + RGDateTime modDate; + } xmlReadContext_t; + using yaaf::XGXMLObject; *************** *** 52,56 **** virtual bool GetFlexCount(propertyID_t propertyID, FlexCount &count) = 0; virtual void SetFlexCount(propertyID_t propertyID, FlexCount &count) = 0; ! virtual void ParseObjectXML(XGXMLObject *obj, bool useAttributes) = 0; virtual void SaveObjectAsXML(RGXMLWriter &writer, bool useAttributes) = 0; virtual bool GetValueInt32Range(propertyID_t propertyID, Int32& lowerLimit, Int32& upperLimit) = 0; --- 57,61 ---- virtual bool GetFlexCount(propertyID_t propertyID, FlexCount &count) = 0; virtual void SetFlexCount(propertyID_t propertyID, FlexCount &count) = 0; ! virtual void ParseObjectXML(XGXMLObject *obj, bool useAttributes, xmlReadContext_t context ) = 0; virtual void SaveObjectAsXML(RGXMLWriter &writer, bool useAttributes) = 0; virtual bool GetValueInt32Range(propertyID_t propertyID, Int32& lowerLimit, Int32& upperLimit) = 0; *************** *** 152,162 **** DatabaseFile *GetFile() const { POSTCONDITION(_rsView->GetFile() != NULL); return _rsView->GetFile(); } void GetViewName(String &result) { result = _rsView->GetViewName(); } ! virtual void ParseObjectXML(XGXMLObject *obj, bool useAttributes); virtual void SaveObjectAsXML(RGXMLWriter &writer, bool useAttributes); bool CanAttributesBeMerged(XGXMLObject *obj); ! void MergeAttributesFrom(XGXMLObject *obj, mergeType_t mergeType); bool GetIndexedDatedReference( propertyID_t propertyID, Int32 index, XGUUID& resultID, RGDateTime& resultDate ); void SetDatedReference( propertyID_t propertyID, XGUUID& supplierID, RGDateTime& dtr ); bool GetDatedReference( propertyID_t propertyID, XGUUID& supplierID, RGDateTime& date ); View *_rsView; --- 157,168 ---- DatabaseFile *GetFile() const { POSTCONDITION(_rsView->GetFile() != NULL); return _rsView->GetFile(); } void GetViewName(String &result) { result = _rsView->GetViewName(); } ! virtual void ParseObjectXML(XGXMLObject *obj, bool useAttributes, xmlReadContext_t context ); virtual void SaveObjectAsXML(RGXMLWriter &writer, bool useAttributes); bool CanAttributesBeMerged(XGXMLObject *obj); ! void MergeAttributesFrom(XGXMLObject *obj, RGDateTime &fileDate, mergeType_t mergeType); bool GetIndexedDatedReference( propertyID_t propertyID, Int32 index, XGUUID& resultID, RGDateTime& resultDate ); void SetDatedReference( propertyID_t propertyID, XGUUID& supplierID, RGDateTime& dtr ); bool GetDatedReference( propertyID_t propertyID, XGUUID& supplierID, RGDateTime& date ); + bool GetLatestDatedReference( propertyID_t propertyID, RGDateTime& date ); View *_rsView; |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:52:57
|
Update of /cvsroot/igarden/Garden/source/SourceMaterialDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27910 Modified Files: Tag: Release_branch_v1 Variant.h Variant.cpp Log Message: Improve performance of startup by only merging source material when changed. Index: Variant.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/Variant.h,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** Variant.h 27 May 2006 00:21:39 -0000 1.8 --- Variant.h 12 Dec 2006 00:52:54 -0000 1.8.2.1 *************** *** 49,53 **** Int16 PercentMatchInRecord(Persist * record); void SetParent(Material* parent); ! virtual void ParseXML(XGXMLObject *obj ); virtual void SaveAsXML(RGXMLWriter &writer); --- 49,53 ---- Int16 PercentMatchInRecord(Persist * record); void SetParent(Material* parent); ! virtual void ParseXML(XGXMLObject *obj, xmlReadContext_t &context ); virtual void SaveAsXML(RGXMLWriter &writer); Index: Variant.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/Variant.cpp,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** Variant.cpp 27 May 2006 00:21:39 -0000 1.12 --- Variant.cpp 12 Dec 2006 00:52:54 -0000 1.12.2.1 *************** *** 124,128 **** /// ParseXML // ! void Variant::ParseXML(XGXMLObject *obj ) { XGXMLData *dataObj; --- 124,128 ---- /// ParseXML // ! void Variant::ParseXML(XGXMLObject *obj, xmlReadContext_t &context ) { XGXMLData *dataObj; *************** *** 132,136 **** PRECONDITION(strcmp(dataObj->GetTag(), kVariantTag) == 0); ! IDPersist::ParseObjectXML(obj, true); } --- 132,136 ---- PRECONDITION(strcmp(dataObj->GetTag(), kVariantTag) == 0); ! IDPersist::ParseObjectXML(obj, true, context ); } |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:52:09
|
Update of /cvsroot/igarden/Garden/source/SourceMaterialDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27819 Modified Files: Tag: Release_branch_v1 InfoSupplier.cpp InfoSupplier.h Log Message: Improve performance of startup by only merging source material when changed. Index: InfoSupplier.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/InfoSupplier.h,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** InfoSupplier.h 2 Feb 2006 00:06:10 -0000 1.8 --- InfoSupplier.h 12 Dec 2006 00:52:08 -0000 1.8.2.1 *************** *** 54,58 **** void SetSupplierTag(String URL); String GetSupplierTag(); ! void ParseXML(XGXMLObject *obj); void SaveAsXML(RGXMLWriter &writer); --- 54,58 ---- void SetSupplierTag(String URL); String GetSupplierTag(); ! void ParseXML(XGXMLObject *obj, xmlReadContext_t &context); void SaveAsXML(RGXMLWriter &writer); Index: InfoSupplier.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/InfoSupplier.cpp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** InfoSupplier.cpp 2 Feb 2006 00:06:10 -0000 1.9 --- InfoSupplier.cpp 12 Dec 2006 00:52:08 -0000 1.9.2.1 *************** *** 526,532 **** } ! void InfoSupplier::ParseXML(XGXMLObject *obj) { ! DBPersist::ParseObjectXML(obj, false); } --- 526,532 ---- } ! void InfoSupplier::ParseXML(XGXMLObject *obj, xmlReadContext_t &context) { ! DBPersist::ParseObjectXML(obj, false, context); } |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:52:04
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27486 Modified Files: Tag: Release_branch_v1 InstanceData.h InstanceData.cpp Log Message: Improve performance of startup by only merging source material when changed. Index: InstanceData.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/InstanceData.h,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -d -r1.16 -r1.16.2.1 *** InstanceData.h 7 Jun 2006 23:02:14 -0000 1.16 --- InstanceData.h 12 Dec 2006 00:52:02 -0000 1.16.2.1 *************** *** 77,81 **** virtual bool GetFlexCount(propertyID_t propertyID, FlexCount &count); virtual void SetFlexCount(propertyID_t propertyID, FlexCount &count); ! virtual void ParseObjectXML(XGXMLObject *obj, bool useAttributes); virtual void SaveObjectAsXML(RGXMLWriter &writer, bool useAttributes); virtual bool GetValueInt32Range(propertyID_t propertyID, Int32& lowerLimit, Int32& upperLimit); --- 77,81 ---- virtual bool GetFlexCount(propertyID_t propertyID, FlexCount &count); virtual void SetFlexCount(propertyID_t propertyID, FlexCount &count); ! virtual void ParseObjectXML(XGXMLObject *obj, bool useAttributes, xmlReadContext_t context ); virtual void SaveObjectAsXML(RGXMLWriter &writer, bool useAttributes); virtual bool GetValueInt32Range(propertyID_t propertyID, Int32& lowerLimit, Int32& upperLimit); Index: InstanceData.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/InstanceData.cpp,v retrieving revision 1.27 retrieving revision 1.27.2.1 diff -C2 -d -r1.27 -r1.27.2.1 *** InstanceData.cpp 17 Jun 2006 02:35:40 -0000 1.27 --- InstanceData.cpp 12 Dec 2006 00:52:02 -0000 1.27.2.1 *************** *** 531,535 **** } ! void InstanceData::ParseObjectXML(XGXMLObject *obj, bool useAttributes ) { long n, count; --- 531,535 ---- } ! void InstanceData::ParseObjectXML(XGXMLObject *obj, bool useAttributes, xmlReadContext_t context ) { long n, count; |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:50:51
|
Update of /cvsroot/igarden/Garden/source/SourceMaterialDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27064 Modified Files: Tag: Release_branch_v1 AttributeDictionary.cpp AttributeDictionary.h Log Message: Improve performance of startup by only merging source material when changed. Index: AttributeDictionary.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/AttributeDictionary.cpp,v retrieving revision 1.41.2.1 retrieving revision 1.41.2.2 diff -C2 -d -r1.41.2.1 -r1.41.2.2 *** AttributeDictionary.cpp 2 Nov 2006 23:47:32 -0000 1.41.2.1 --- AttributeDictionary.cpp 12 Dec 2006 00:50:46 -0000 1.41.2.2 *************** *** 903,935 **** case kAttrSuppliers: { - const char *ptr2, *ptrNext; - char uidStr[64]; - RGDateTime dateObj; - XGUUID uid; - - dateObj.Now(); - for(ptr2 = txt; ptr2 != NULL; ) - { - ptrNext = strchr(ptr2, ','); - if(ptrNext != NULL) - { - strncpy(uidStr, ptr2, ptrNext-ptr2); - uidStr[ptrNext-ptr2] = 0; - } - else - strcpy(uidStr, ptr2); - StringToUUID(uidStr, uid); - if(SourceMaterialFile::GetSourceDatabase()->LookupSupplier(uid) != NULL) - persist->SetDatedReference(attrID, uid, dateObj); - ptr2 = ptrNext; - if(ptr2 != NULL) - { - ptr2++; - while(*ptr2 == ' ') - ptr2++; - if(*ptr2 == '\0') - ptr2 = NULL; - } - } } break; --- 903,906 ---- *************** *** 938,941 **** --- 909,946 ---- } } + + void AttributeDictionary::ConvertXMLToSupplierValue(const char *txt, attributeID_t attrID, RGDateTime &date, Persist* persist) + { + attributeType_t type = _infoValues[attrID].typeVal; + MyAssert(type == kAttrSuppliers); + const char *ptr2, *ptrNext; + char uidStr[64]; + XGUUID uid; + + for(ptr2 = txt; ptr2 != NULL; ) + { + ptrNext = strchr(ptr2, ','); + if(ptrNext != NULL) + { + strncpy(uidStr, ptr2, ptrNext-ptr2); + uidStr[ptrNext-ptr2] = 0; + } + else + strcpy(uidStr, ptr2); + StringToUUID(uidStr, uid); + if(SourceMaterialFile::GetSourceDatabase()->LookupSupplier(uid) != NULL) + persist->SetDatedReference(attrID, uid, date); + ptr2 = ptrNext; + if(ptr2 != NULL) + { + ptr2++; + while(*ptr2 == ' ') + ptr2++; + if(*ptr2 == '\0') + ptr2 = NULL; + } + } + } + #endif *************** *** 1066,1070 **** ViewClass* vc4 = ViewClass::GetViewClass(kVariantsCID); vc4->AddProperty(kFieldVariantName, kTagFieldVariantName, kStringField); ! ViewClass* vc6 = ViewClass::GetViewClass(kInstanceAttributesCID); --- 1071,1075 ---- ViewClass* vc4 = ViewClass::GetViewClass(kVariantsCID); vc4->AddProperty(kFieldVariantName, kTagFieldVariantName, kStringField); ! vc4->AddProperty(kFieldSuppliers, "suppliers", kIndexedField); ViewClass* vc6 = ViewClass::GetViewClass(kInstanceAttributesCID); Index: AttributeDictionary.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/AttributeDictionary.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** AttributeDictionary.h 1 Feb 2006 23:54:32 -0000 1.9 --- AttributeDictionary.h 12 Dec 2006 00:50:46 -0000 1.9.2.1 *************** *** 76,79 **** --- 76,80 ---- static long ConvertXMLToBitfield(const char *txt, attributeID_t attrID); static long ConvertXMLToBitfieldRange(const char *txt, attributeID_t attrID); + static void ConvertXMLToSupplierValue(const char *txt, attributeID_t attrID, RGDateTime &date, Persist* persist); // attributes |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-09 21:33:45
|
Update of /cvsroot/igarden/Garden/source/Database In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23207 Modified Files: Tag: Release_branch_v1 Persist.cp Log Message: Experiment with using view.Find() instead of searching fields. Index: Persist.cp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Database/Persist.cp,v retrieving revision 1.41 retrieving revision 1.41.2.1 diff -C2 -d -r1.41 -r1.41.2.1 *** Persist.cp 21 Jun 2006 02:14:26 -0000 1.41 --- Persist.cp 9 Dec 2006 21:33:43 -0000 1.41.2.1 *************** *** 36,39 **** --- 36,40 ---- #include "SourceMaterialFile.h" #include "RGDateTime.h" + #include "XGTimer.h" typedef struct *************** *** 61,64 **** --- 62,67 ---- #define DATED_REF_SIZE (DATED_REF_UID_SIZE+DATED_REF_DATE_SIZE) + using yaaf::XGTimer; + // --------------------------------------------------------------------------- /// SetFlexCount *************** *** 1570,1583 **** { Int32 n, count; - Persist *result = NULL; c4_View view = *(viewPtr->Get_c4View()); View::Release(file->GetStorage(), viewName); c4_BytesProp bytes(vc->FieldName(pid)); - c4_Row row; c4_Bytes buf; ! XGUUID testUID; ! count = view.GetSize(); ! for(n = 0; n < count && result == NULL; n++) { // !!!!How to handle seeing if a property is there? --- 1573,1591 ---- { Int32 n, count; c4_View view = *(viewPtr->Get_c4View()); View::Release(file->GetStorage(), viewName); c4_BytesProp bytes(vc->FieldName(pid)); c4_Bytes buf; ! ! // As of December 9 2006, Searching an unsorted view with metakit was faster than ! // using find(). ! #if TIME_FIND ! TTIME start1, end1, end2; ! static double total1 = 0.0, total2 = 0.0, numTotals = 0.0; ! ! start1 = XGTimer::Ticks(); ! #endif count = view.GetSize(); ! for(n = 0; n < count && !found; n++) { // !!!!How to handle seeing if a property is there? *************** *** 1585,1596 **** if(CIstrcmp(reinterpret_cast<const char*>(buf.Contents()), txt) == 0) { ! String str; ! resultRow = n; - // if(GetString(pid, str)) - // viewPtr->RemoveKeyString(pid, str.c_str()) viewPtr->AddKeyString(pid, txt, n); } } } --- 1593,1617 ---- if(CIstrcmp(reinterpret_cast<const char*>(buf.Contents()), txt) == 0) { ! found = true; resultRow = n; viewPtr->AddKeyString(pid, txt, n); } } + #if TIME_FIND + end1 = XGTimer::Ticks(); + long resultRow2 = -1; + + c4_StringProp indexStr(vc->FieldName(pid)); + indexStr(row)=txt; + resultRow2 = view.Find(row,0); + end2 = XGTimer::Ticks(); + total2 += end2-end1; + + total1 += end1-start1; + numTotals += 1.0; + printf("Ticks 1=%lf 2=%lf\n", total1/numTotals, total2/numTotals); + if(resultRow != resultRow2) + printf("***** Rows are not equal ***** (%ld vs. %ld)\n", resultRow, resultRow2); + #endif } |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-09 17:47:37
|
Update of /cvsroot/igarden/Garden/source/resources In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3470 Modified Files: Tag: Release_branch_v1 Garden.cin Garden.r Garden2.rsrc Log Message: Change icons in palette to be 32x32 Index: Garden.r =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/Garden.r,v retrieving revision 1.61.2.4 retrieving revision 1.61.2.5 diff -C2 -d -r1.61.2.4 -r1.61.2.5 *** Garden.r 3 Dec 2006 02:04:20 -0000 1.61.2.4 --- Garden.r 9 Dec 2006 17:47:30 -0000 1.61.2.5 *************** *** 1 **** ! /* generated from Garden.cin * * This file was automatically generated by YAAF * Constructor. */ /* 'VRes' 128 * * "AboutBox" */ data 'VRes' (128,"AboutBox") { $"000000000000006A" /* .......j */ $"0000005A646C6F67" /* ...Zdlog */ $"0000000200000002" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000001C20000" /* ........ */ $"0118000001C20000" /* ........ */ $"0118000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"00001241626F7574" /* ...About */ $"2047617264656E53" /* GardenS */ $"6B65746368000000" /* ketch... */ $"0000000000010000" /* ........ */ $"0000000000000000" /* ........ */ $"003A0000002A636F" /* .:...*co */ $"6C72000000000000" /* lr...... */ $"0000FFFFFFFFFFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000FFFFFFFF0000" /* ........ */ $"FFFFFFFF00000042" /* .......B */ $"0000000000000032" /* .......2 */ $"7069637400000000" /* pict.... */ $"00000000FFFFFFFF" /* ........ */ $"00000000000000D2" /* ........ */ $"0000000400000196" /* ........ */ $"00000024FFFFFFFF" /* ...$.... */ $"0000000004030000" /* ........ */ $"0000000000000000" /* ........ */ $"0042000000000000" /* .B...... */ $"0032706963740000" /* .2pict.. */ $"000000000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0024000000140000" /* .$...... */ $"007F0000007EFFFF" /* ....~.. */ $"FFFF000000000402" /* ........ */ $"0000005B0000006A" /* ...[...j */ $"0000005400000000" /* ...T.... */ $"000000447062746E" /* ...Dpbtn */ $"0000000400000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"000000D700000050" /* .......P */ $"000001A100000071" /* .......q */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000001477" /* .......w */ $"77772E4761726465" /* ww.Garde */ $"6E536B657463682E" /* nSketch. */ $"636F6D0000000042" /* com....B */ $"0000000000000032" /* .......2 */ $"7062746E00000001" /* pbtn.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000178" /* .......x */ $"000000F3000001B8" /* ........ */ $"00000113FFFFFFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000024F4B740000" /* ...OKt.. */ $"003E000000000000" /* .>...... */ $"002E487970720000" /* ..Hypr.. */ $"000A00000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0026000000840000" /* .&...... */ $"01A4000000ECFFFF" /* ........ */ $"FFFF000000000082" /* ........ */ $"FFFFFFFF00000060" /* .......` */ $"0000000000000050" /* .......P */ $"7465787400000000" /* text.... */ $"00000000FFFFFFFF" /* ........ */ $"00000000000000CF" /* ........ */ $"00000038000001BE" /* ...8.... */ $"0000004AFFFFFFFF" /* ...J.... */ $"000024436F707972" /* ..$Copyr */ $"6967687420286329" /* ight (c) */ $"2032303035205265" /* 2005 Re */ $"6473746172742053" /* dstart S */ $"6F66747761726500" /* oftware. */ $"0000000000000000" /* ........ */ $"000000000000003C" /* .......< */ $"7465787400000003" /* text.... */ $"00000000FFFFFFFF" /* ........ */ $"00000000000000CF" /* ........ */ $"00000024000001AF" /* ...$.... */ $"00000034FFFFFFFF" /* ...4.... */ $"0000103C76657273" /* ...<vers */ $"696F6E2073747269" /* ion stri */ $"6E673E0000000000" /* ng>..... */ }; /* 'VRes' 130 * * "PrefsMeasurement" */ data 'VRes' (130,"PrefsMeasurement") { $"0000000000000036" /* .......6 */ $"0000002676696577" /* ...&view */ $"0000000000000000" /* ........ */ $"FFFFFFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0000015800000104" /* ...X.... */ $"FFFFFFFF00000000" /* ........ */ $"00000000003A0000" /* .....:.. */ $"002A636F6C720000" /* .*colr.. */ $"000000000000FFFF" /* ........ */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000000" /* ........ */ $"000000000000FFFF" /* ........ */ $"FFFF0000FFFFFFFF" /* ........ */ $"0000003A00000000" /* ...:.... */ $"0000002A706F706D" /* ...*popm */ $"0000000300000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000005C00000058" /* ...\...X */ $"0000010400000072" /* .......r */ $"FFFFFFFF00000000" /* ........ */ $"0000000000440000" /* .....D.. */ $"0000000000347465" /* .....4te */ $"7874000000040000" /* xt...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000140000" /* ........ */ $"0058000000540000" /* .X...T.. */ $"0068FFFFFFFF0000" /* .h...... */ $"08526F756E64696E" /* .Roundin */ $"6700000000000000" /* g....... */ $"003A000000000000" /* .:...... */ $"002A706F706D0000" /* .*popm.. */ $"000200000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"005C000000300000" /* .\...0.. */ $"01020000004AFFFF" /* .....J.. */ $"FFFF000000000000" /* ........ */ $"0000004000000000" /* ...@.... */ $"0000003074657874" /* ...0text */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000001400000034" /* .......4 */ $"0000004000000044" /* ...@...D */ $"FFFFFFFF00000553" /* .......S */ $"63616C6500000000" /* cale.... */ $"0000003A00000000" /* ...:.... */ $"0000002A706F706D" /* ...*popm */ $"0000000100000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000005C0000000C" /* ...\.... */ $"0000010200000026" /* .......& */ $"FFFFFFFF00000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000307465" /* .....0te */ $"7874000000000000" /* xt...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000140000" /* ........ */ $"0010000000400000" /* .....@.. */ $"0020FFFFFFFF0000" /* . ...... */ $"05556E6974730000" /* .Units.. */ $"0000" /* .. */ }; /* 'VRes' 131 * * "PrefsPrinting" */ data 'VRes' (131,"PrefsPrinting") { $"0000000000000036" /* .......6 */ $"0000002676696577" /* ...&view */ $"0000000000000000" /* ........ */ $"FFFFFFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0000015800000104" /* ...X.... */ $"FFFFFFFF00000000" /* ........ */ $"00000000003A0000" /* .....:.. */ $"002A636F6C720000" /* .*colr.. */ $"000000000000FFFF" /* ........ */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000000" /* ........ */ $"000000000000FFFF" /* ........ */ $"FFFF0000FFFFFFFF" /* ........ */ $"0000004A00000000" /* ...J.... */ $"0000003A63686B62" /* ...:chkb */ $"0000000200000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"000000140000002C" /* ......., */ $"0000008C0000003C" /* .......< */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000A50" /* .......P */ $"72696E7420477269" /* rint Gri */ $"6400000000000000" /* d....... */ $"00000000003C6368" /* .....<ch */ $"6B62000000010000" /* kb...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000140000" /* ........ */ $"00180000008C0000" /* ........ */ $"0028FFFFFFFFFFFF" /* .(...... */ $"0000000000000000" /* ........ */ $"0D5072696E742042" /* .Print B */ $"6F7264657273" /* orders */ }; /* 'VRes' 129 * * "PrefsDialog" */ data 'VRes' (129,"PrefsDialog") { $"0000000000000062" /* .......b */ $"00000052646C6F67" /* ...Rdlog */ $"0000001200000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"00000000015E0000" /* .....^.. */ $"01400000015E0000" /* .@...^.. */ $"0140000000000000" /* .@...... */ $"0000000000000000" /* ........ */ $"00000B5072656665" /* ...Prefe */ $"72656E6365730000" /* rences.. */ $"000000007D010000" /* ....}... */ $"7D02000000000000" /* }....... */ $"003A0000002A636F" /* .:...*co */ $"6C72000000000000" /* lr...... */ $"0000FFFFFFFFFFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000FFFFFFFF0000" /* ........ */ $"FFFFFFFF00000042" /* .......B */ $"0000000000000032" /* .......2 */ $"7069637400000000" /* pict.... */ $"00000000FFFFFFFF" /* ........ */ $"00000000000000F0" /* ........ */ $"0000000400000146" /* .......F */ $"00000060FFFFFFFF" /* ...`.... */ $"0000000004020000" /* ........ */ $"0000000000000000" /* ........ */ $"0046000000000000" /* .F...... */ $"00367062746E0000" /* .6pbtn.. */ $"7D0200000000FFFF" /* }....... */ $"FFFF000000000000" /* ........ */ $"0102000001200000" /* ..... .. */ $"014C0000013AFFFF" /* .L...:.. */ $"FFFFFFFF00000000" /* ........ */ $"000000000643616E" /* .....Can */ $"63656C6500000042" /* cele...B */ $"0000000000000032" /* .......2 */ $"7062746E00007D01" /* pbtn..}. */ $"00000000FFFFFFFF" /* ........ */ $"00000000000000B0" /* ........ */ $"00000120000000FA" /* ... .... */ $"0000013AFFFFFFFF" /* ...:.... */ $"FFFF000000000000" /* ........ */ $"0000024F4B740000" /* ...OKt.. */ $"003C000000000000" /* .<...... */ $"002C706E6C730000" /* .,pnls.. */ $"7D0300000000FFFF" /* }....... */ $"FFFF000000000000" /* ........ */ $"0008000000740000" /* .....t.. */ $"015400000118FFFF" /* .T...... */ $"FFFF0000FFFF0000" /* ........ */ $"0001000000000000" /* ........ */ $"00000000002A706F" /* .....*po */ $"706D00007D040000" /* pm..}... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000080000" /* ........ */ $"0058000000940000" /* .X...... */ $"006EFFFFFFFF0000" /* .n...... */ $"00000000" /* .... */ }; /* 'VRes' 135 * * "PlanPanel" */ data 'VRes' (135,"PlanPanel") { $"0000000000000036" /* .......6 */ $"0000002676696577" /* ...&view */ $"0000000000000000" /* ........ */ $"FFFFFFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"00000000003A0000" /* .....:.. */ $"002A6261636B0000" /* .*back.. */ $"000000000000FFFF" /* ........ */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000000" /* ........ */ $"000000000000FFFF" /* ........ */ $"FFFF000000000001" /* ........ */ $"0000004000000000" /* ...@.... */ $"0000003072756C72" /* ...0rulr */ $"0000000400000001" /* ........ */ $"FFFFFFFF0000FFFF" /* ........ */ $"0000000200000028" /* .......( */ $"0000002C00000000" /* ...,.... */ $"FFFFFFFF00000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000004000000000" /* ...@.... */ $"0000003072756C72" /* ...0rulr */ $"0000000300000001" /* ........ */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000002C00000000" /* ...,.... */ $"0000000000000028" /* .......( */ $"FFFFFFFF0000FFFF" /* ........ */ $"0000000000000000" /* ........ */ $"000000000000003C" /* .......< */ $"0000002C73637276" /* ...,scrv */ $"0000000100000001" /* ........ */ $"FFFFFFFFFFFFFFFF" /* ........ */ $"0000002C00000028" /* ...,...( */ $"0000000000000000" /* ........ */ $"FFFFFFFF0000FFFF" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"000000000000002E" /* ........ */ $"7772505600000002" /* wrPV.... */ $"00000001FFFFFFFF" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000000000000000" /* ........ */ $"00000000FFFFFFFF" /* ........ */ $"0000000000030000" /* ........ */ $"0004" /* .. */ }; /* 'VRes' 132 * * "MainDocument" */ data 'VRes' (132,"MainDocument") { $"0000000000000058" /* .......X */ $"0000004877696E64" /* ...Hwind */ $"0000000000000000" /* ........ */ $"FFFF000000AA0000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000500000" /* .....P.. */ $"0050000000000000" /* .P...... */ $"0000000002BE0000" /* ........ */ $"01FD000000000000" /* ........ */ $"000008756E746974" /* ...untit */ $"6C65640000000000" /* led..... */ $"000000BE0000003A" /* .......: */ $"0000002A6261636B" /* ...*back */ $"0000000000000000" /* ........ */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000031" /* .......1 */ $"FFFFFFFF00000000" /* ........ */ $"00010000003C0000" /* .....<.. */ $"00000000002C7465" /* .....,te */ $"7874000075330000" /* xt..u3.. */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000BB0000" /* ........ */ $"0014FFFFFFFF0000" /* ........ */ $"0075000000000000" /* .u...... */ $"0000000000000000" /* ........ */ $"0038746162620000" /* .8tabb.. */ $"753400000000FFFF" /* u4...... */ $"FFFFFFFF00000000" /* ........ */ $"0000000000180000" /* ........ */ $"000000000030FFFF" /* .....0.. */ $"FFFF000000000000" /* ........ */ $"0000000008546573" /* .....Tes */ $"7420546162000000" /* t Tab... */ $"0000000000000000" /* ........ */ $"002C706E6C730000" /* .,pnls.. */ $"753200000000FFFF" /* u2...... */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000320000" /* .....2.. */ $"000000000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000" /* .. */ }; /* 'VRes' 146 * * "Material Info PICT Popup" */ data 'VRes' (146,"Material Info PICT Popup") { $"0000000000000036" /* .......6 */ $"0000002676696577" /* ...&view */ $"0000000000000000" /* ........ */ $"FFFFFFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"000000BE00000088" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000000000000000" /* ........ */ $"0034746578740000" /* .4text.. */ $"000100000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0004000000040000" /* ........ */ $"00BA0000002AFFFF" /* .....*.. */ $"FFFF000008756E74" /* .....unt */ $"69746C6564000000" /* itled... */ $"0000" /* .. */ }; /* 'VRes' 133 * * "DatabasePanel" */ data 'VRes' (133,"DatabasePanel") { $"0000000000000036" /* .......6 */ $"0000002676696577" /* ...&view */ $"0000000000000000" /* ........ */ $"FFFFFFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"00B60000003A0000" /* .....:.. */ $"002A6261636B0000" /* .*back.. */ $"000000000000FFFF" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000000000030000" /* ........ */ $"000000000020FFFF" /* ..... .. */ $"FFFF000000000001" /* ........ */ $"0000004200000000" /* ...B.... */ $"000000326269636E" /* ...2bicn */ $"0000000500000000" /* ........ */ $"0000FFFFFFFF0000" /* ........ */ $"FFFFFFE500000001" /* ........ */ $"FFFFFFFF0000001C" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0002000003FCFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"00000000002A706F" /* .....*po */ $"706D000000040000" /* pm...... */ $"0000FFFFFFFF0000" /* ........ */ $"00000000000B0000" /* ........ */ $"0003000000A10000" /* ........ */ $"0019FFFFFFFF0000" /* ........ */ $"0000000000000000" /* ........ */ $"0000003C0000002C" /* ...<..., */ $"7363727600000001" /* scrv.... */ $"00000000FFFFFFFF" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000002000000000" /* ... .... */ $"00000000FFFFFFFF" /* ........ */ $"0000FFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0000002E4D546162" /* ....MTab */ $"0000000200000000" /* ........ */ $"FFFFFFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000FFFF0000" /* ...... */ }; /* 'VRes' 134 * * "BitfieldCheckDialog" */ data 'VRes' (134,"BitfieldCheckDialog") { $"0000000000000060" /* .......` */ $"00000050646C6F67" /* ...Pdlog */ $"0000001200000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000001180000" /* ........ */ $"0078000001180000" /* .x...... */ $"0078000000000000" /* .x...... */ $"000008756E746974" /* ...untit */ $"6C65640000000000" /* led..... */ $"0000000100000002" /* ........ */ $"0000004600000000" /* ...F.... */ $"000000367062746E" /* ...6pbtn */ $"0000000200000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000009000000054" /* .......T */ $"000001000000006E" /* .......n */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000643" /* .......C */ $"616E63656C650000" /* ancele.. */ $"004C000000000000" /* .L...... */ $"003C7062746E0000" /* .<pbtn.. */ $"000100000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0090000000340000" /* .....4.. */ $"01000000004EFFFF" /* .....N.. */ $"FFFFFFFF00000000" /* ........ */ $"000000000C416464" /* .....Add */ $"20746F2056616C75" /* to Valu */ $"65000000004C0000" /* e....L.. */ $"00000000003C7062" /* .....<pb */ $"746E000000030000" /* tn...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000140000" /* ........ */ $"0034000000840000" /* .4...... */ $"004EFFFFFFFFFFFF" /* .N...... */ $"0000000000000000" /* ........ */ $"0D5265706C616365" /* .Replace */ $"2056616C75650000" /* Value.. */ $"0000000000000000" /* ........ */ $"0060746578740000" /* .`text.. */ $"000000000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"001C000000080000" /* ........ */ $"00F000000034FFFF" /* .....4.. */ $"FFFF000034446F20" /* ....4Do */ $"796F752077616E74" /* you want */ $"20746F207265706C" /* to repl */ $"616365206F722061" /* ace or a */ $"646420746F207468" /* dd to th */ $"6520657869737469" /* e existi */ $"6E672076616C7565" /* ng value */ $"3F0000000000" /* ?..... */ }; /* 'VRes' 138 * * "DatePicker" */ data 'VRes' (138,"DatePicker") { $"0000000000000060" /* .......` */ $"00000050646C6F67" /* ...Pdlog */ $"0000001200000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"00000000012C0000" /* .....,.. */ $"00E60000012C0000" /* .....,.. */ $"00E6000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"000008756E746974" /* ...untit */ $"6C65640000000000" /* led..... */ $"0000000100000002" /* ........ */ $"0000004A00000000" /* ...J.... */ $"0000003A7062746E" /* ...:pbtn */ $"0000000500000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000000C000000C8" /* ........ */ $"00000078000000E2" /* ...x.... */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000A43" /* .......C */ $"6C65617220446174" /* lear Dat */ $"6500000000440000" /* e....D.. */ $"0000000000347465" /* .....4te */ $"7874000000040000" /* xt...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000080000" /* ........ */ $"0004000001240000" /* .....$.. */ $"0014FFFFFFFF0000" /* ........ */ $"08756E7469746C65" /* .untitle */ $"6400000000000000" /* d....... */ $"0046000000000000" /* .F...... */ $"00367062746E0000" /* .6pbtn.. */ $"000200000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"00DC000000C80000" /* ........ */ $"0126000000E2FFFF" /* .&...... */ $"FFFFFFFF00000000" /* ........ */ $"000000000643616E" /* .....Can */ $"63656C6500000042" /* cele...B */ $"0000000000000032" /* .......2 */ $"7062746E00000001" /* pbtn.... */ $"00000000FFFFFFFF" /* ........ */ $"000000000000008A" /* ........ */ $"000000C8000000D4" /* ........ */ $"000000E2FFFFFFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000024F4B740000" /* ...OKt.. */ $"0000000000000000" /* ........ */ $"003A434452500000" /* .:CDRP.. */ $"000300000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0008000000180000" /* ........ */ $"0128000000C4FFFF" /* .(...... */ $"FFFF000000000080" /* ........ */ $"0000008000000080" /* ........ */ $"0000008000000080" /* ........ */ }; /* 'VRes' 136 * * "SubSelector" */ data 'VRes' (136,"SubSelector") { $"0000000000000060" /* .......` */ $"00000050646C6F67" /* ...Pdlog */ $"0000001200000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"00000000017C0000" /* .....|.. */ $"00A0000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"000008756E746974" /* ...untit */ $"6C65640000000000" /* led..... */ $"0000000100000002" /* ........ */ $"0000003A00000000" /* ...:.... */ $"0000002A706F706D" /* ...*popm */ $"0000000400000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000001800000054" /* .......T */ $"000001540000006A" /* ...T...j */ $"FFFFFFFF00000000" /* ........ */ $"0000000000420000" /* .....B.. */ $"0000000000327062" /* .....2pb */ $"746E000000010000" /* tn...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000DC0000" /* ........ */ $"00740000011C0000" /* .t...... */ $"008EFFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0359657300000042" /* .Yes...B */ $"0000000000000032" /* .......2 */ $"7062746E00000002" /* pbtn.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000090" /* ........ */ $"00000074000000D0" /* ...t.... */ $"0000008EFFFFFFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000024E6F740000" /* ...Not.. */ $"003A000000000000" /* .:...... */ $"002A706F706D0000" /* .*popm.. */ $"000300000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0018000000380000" /* .....8.. */ $"01540000004EFFFF" /* .T...N.. */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000005874657874" /* ...Xtext */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000001400000010" /* ........ */ $"000000F000000034" /* .......4 */ $"FFFFFFFF00002C41" /* ......,A */ $"726520796F752061" /* re you a */ $"6464696E67206F6E" /* dding on */ $"65206F6620746865" /* e of the */ $"20666F6C6C6F7769" /* followi */ $"6E6720656E747269" /* ng entri */ $"65733F0000000000" /* es?..... */ }; /* 'VRes' 137 * * "Site Data Dialog" */ data 'VRes' (137,"Site Data Dialog") { $"0000000000000060" /* .......` */ $"00000050646C6F67" /* ...Pdlog */ $"0000001200000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000001540000" /* .....T.. */ $"010E000001540000" /* .....T.. */ $"010E000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000095369746520" /* ...Site */ $"4461746100000000" /* Data.... */ $"0000000100000002" /* ........ */ $"0000003A00000000" /* ...:.... */ $"0000002A64697672" /* ...*divr */ $"0000000000000000" /* ........ */ $"FFFFFFFFFFFF0000" /* ........ */ $"00000004000000BC" /* ........ */ $"FFFFFFFC000000BF" /* ........ */ $"FFFFFFFF0000FFFF" /* ........ */ $"FFFF000000880000" /* ........ */ $"0044000000346772" /* .D...4gr */ $"6F75000000000000" /* ou...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000080000" /* ........ */ $"00080000014C0000" /* .....L.. */ $"007CFFFFFFFF0000" /* .|...... */ $"0955534441205A6F" /* .USDA Zo */ $"6E65000000000000" /* ne...... */ $"0000000000000000" /* ........ */ $"0034746578740000" /* .4text.. */ $"000A00000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"00400000005C0000" /* .@...\.. */ $"012C0000006CFFFF" /* .,...l.. */ $"FFFF000008756E74" /* .....unt */ $"69746C6564000000" /* itled... */ $"00000000004C0000" /* .....L.. */ $"00000000003C7062" /* .....<pb */ $"746E000000090000" /* tn...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000CC0000" /* ........ */ $"0044000001440000" /* .D...D.. */ $"005EFFFFFFFFFFFF" /* .^...... */ $"0000000000000000" /* ........ */ $"0C4C6F6F6B207570" /* .Look up */ $"205A6F6E65000000" /* Zone... */ $"0052000000000000" /* .R...... */ $"0042656469740000" /* .Bedit.. */ $"000800000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0078000000480000" /* .x...H.. */ $"00C000000060FFFF" /* .....`.. */ $"FFFFFFFF00750000" /* .....u.. */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000004600000000" /* ...F.... */ $"0000003674657874" /* ...6text */ $"0000001600000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000000C0000004C" /* .......L */ $"000000680000005C" /* ...h...\ */ $"FFFFFFFF00000B55" /* .......U */ $"53205A697020436F" /* S Zip Co */ $"6465000000000000" /* de...... */ $"0040000000000000" /* .@...... */ $"0030746578740000" /* .0text.. */ $"001500000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"008C000000340000" /* .....4.. */ $"00D700000044FFFF" /* .....D.. */ $"FFFF0000056F722E" /* .....or. */ $"2E2E000000000000" /* ........ */ $"003A000000000000" /* .:...... */ $"002A706F706D0000" /* .*popm.. */ $"000300000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"00380000001C0000" /* .8...... */ $"00EB00000032FFFF" /* .....2.. */ $"FFFF000000000000" /* ........ */ $"0000004600000000" /* ...F.... */ $"000000367062746E" /* ...6pbtn */ $"0000000200000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"000000EE000000E8" /* ........ */ $"0000014000000102" /* ...@.... */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000643" /* .......C */ $"616E63656C650000" /* ancele.. */ $"0042000000000000" /* .B...... */ $"00327062746E0000" /* .2pbtn.. */ $"000100000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0096000000E80000" /* ........ */ $"00E800000102FFFF" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"00000000024F4B74" /* .....OKt */ $"0000004200000000" /* ...B.... */ $"000000327062746E" /* ...2pbtn */ $"0000000700000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"00000100000000A0" /* ........ */ $"00000138000000BA" /* ...8.... */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000353" /* .......S */ $"6574000000420000" /* et...B.. */ $"0000000000327062" /* .....2pb */ $"746E000000050000" /* tn...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000001000000" /* ........ */ $"0080000001380000" /* .....8.. */ $"009AFFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"035365740000003C" /* .Set...< */ $"000000000000002C" /* ......., */ $"7465787400000006" /* text.... */ $"00000000FFFFFFFF" /* ........ */ $"00000000000000A0" /* ........ */ $"000000A4000000EB" /* ........ */ $"000000B4FFFFFFFF" /* ........ */ $"0000007500000000" /* ...u.... */ $"0000003C00000000" /* ...<.... */ $"0000002C74657874" /* ...,text */ $"0000000400000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000009800000088" /* ........ */ $"000000E300000098" /* ........ */ $"FFFFFFFF00000075" /* .......u */ $"000000000000004C" /* .......L */ $"000000000000003C" /* .......< */ $"7465787400000000" /* text.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000010" /* ........ */ $"000000A400000094" /* ........ */ $"000000B4FFFFFFFF" /* ........ */ $"0000104669727374" /* ...First */ $"2046616C6C204672" /* Fall Fr */ $"6F73740000000000" /* ost..... */ $"0000000000000000" /* ........ */ $"0000003C74657874" /* ...<text */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000001000000088" /* ........ */ $"0000008400000098" /* ........ */ $"FFFFFFFF0000114C" /* .......L */ $"6173742053707269" /* ast Spri */ $"6E672046726F7374" /* ng Frost */ $"00000000" /* .... */ }; /* 'VRes' 139 * * "Registration Dialog" */ data 'VRes' (139,"Registration Dialog") { $"0000000000000072" /* .......r */ $"00000062646C6F67" /* ...bdlog */ $"0000001200000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"00000000015E0000" /* .....^.. */ $"00DC0000015E0000" /* .....^.. */ $"00DC0000015E0000" /* .....^.. */ $"00DC000000000000" /* ........ */ $"00001B5265676973" /* ...Regis */ $"746572696E672052" /* tering R */ $"6564737461727420" /* edstart */ $"47617264656E0000" /* Garden.. */ $"0000000000010000" /* ........ */ $"0000000000E60000" /* ........ */ $"0048000000386772" /* .H...8gr */ $"6F75000000000000" /* ou...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000060000" /* ........ */ $"0006000001540000" /* .....T.. */ $"003CFFFFFFFF0000" /* .<...... */ $"0D57687920526567" /* .Why Reg */ $"69737465723F0000" /* ister?.. */ $"0000000000000000" /* ........ */ $"00000000008E7465" /* ......te */ $"7874000000000000" /* xt...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000080000" /* ........ */ $"0014000001480000" /* .....H.. */ $"0030FFFFFFFF0000" /* .0...... */ $"6252656769737465" /* bRegiste */ $"72696E6720526564" /* ring Red */ $"7374617274204761" /* start Ga */ $"7264656E2077696C" /* rden wil */ $"6C20676574207269" /* l get ri */ $"64206F6620746865" /* d of the */ $"736520616E6E6F79" /* se annoy */ $"696E67206469616C" /* ing dial */ $"6F67732C20616E64" /* ogs, and */ $"2068656C70206675" /* help fu */ $"6E64206675747572" /* nd futur */ $"6520666561747572" /* e featur */ $"65732E7500000084" /* es.u.... */ $"000002840000004E" /* .......N */ $"0000003E67726F75" /* ...>grou */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000000600000040" /* .......@ */ $"00000154000000B4" /* ...T.... */ $"FFFFFFFF00001248" /* .......H */ $"6F7720446F204920" /* ow Do I */ $"5265676973746572" /* Register */ $"3F00000000000000" /* ?....... */ $"0082000000000000" /* ........ */ $"0072746578740000" /* .rtext.. */ $"000000000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0008000000400000" /* .....@.. */ $"01450000004CFFFF" /* .E...L.. */ $"FFFF000046332920" /* ....F3) */ $"456E746572207468" /* Enter th */ $"6520726567697374" /* e regist */ $"726174696F6E2063" /* ration c */ $"6F646520696E2062" /* ode in b */ $"656C6F7720616E64" /* elow and */ $"20636C69636B2074" /* click t */ $"6865207265676973" /* he regis */ $"7465722062757474" /* ter butt */ $"6F6E2E0000000084" /* on...... */ $"0000008000000000" /* ........ */ $"0000007074657874" /* ...ptext */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"000000070000002B" /* .......+ */ $"0000013C00000037" /* ...<...7 */ $"FFFFFFFFFFFF4532" /* ......E2 */ $"29204F7264657220" /* ) Order */ $"5265647374617274" /* Redstart */ $"2047617264656E2E" /* Garden. */ $"2020412072656769" /* A regi */ $"7374726174696F6E" /* stration */ $"20636F6465207769" /* code wi */ $"6C6C206265206D61" /* ll be ma */ $"696C656420746F20" /* iled to */ $"796F752E00000084" /* you..... */ $"0000005400000000" /* ...T.... */ $"0000004474657874" /* ...Dtext */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000000700000016" /* ........ */ $"000000CC00000026" /* .......& */ $"FFFFFFFF00001831" /* .......1 */ $"2920476F20746F20" /* ) Go to */ $"6F726465722E6B61" /* order.ka */ $"67692E636F6D3A28" /* gi.com:( */ $"0000008400000040" /* .......@ */ $"0000000000000030" /* .......0 */ $"7465787400000000" /* text.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000008" /* ........ */ $"0000005400000044" /* ...T...D */ $"00000064FFFFFFFF" /* ...d.... */ $"000005436F64653A" /* ...Code: */ $"0000000000000052" /* .......R */ $"0000000000000042" /* .......B */ $"6564697400000004" /* edit.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000030" /* .......0 */ $"000000530000013C" /* ...S...< */ $"00000067FFFFFFFF" /* ...g.... */ $"FFFF007500000000" /* ...u.... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"003E7062746E0000" /* .>pbtn.. */ $"000300000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"007C000000100000" /* .|...... */ $"00EC0000002AFFFF" /* .....*.. */ $"FFFFFFFF00000000" /* ........ */ $"000000000E6F7264" /* .....ord */ $"65722E6B6167692E" /* er.kagi. */ $"636F6D0000000046" /* com....F */ $"0000000000000036" /* .......6 */ $"7062746E00000002" /* pbtn.... */ $"00000000FFFFFFFF" /* ........ */ $"00000000000000F0" /* ........ */ $"000000B800000154" /* .......T */ $"000000D2FFFFFFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"00000643616E6365" /* ...Cance */ $"6C65000000000000" /* le...... */ $"0000000000387062" /* .....8pb */ $"746E000000010000" /* tn...... */ $"0000FFFFFFFF0000" /* ........ */ $"00000000008C0000" /* ........ */ $"00B8000000F00000" /* ........ */ $"00D2FFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0852656769737465" /* .Registe */ $"7200" /* r. */ }; /* 'VRes' 140 * * "GerminationDialog" */ data 'VRes' (140,"GerminationDialog") { $"0000000000000062" /* .......b */ $"00000052646C6F67" /* ...Rdlog */ $"0000001000000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000001900000" /* ........ */ $"012C000001900000" /* .,...... */ $"012C000001900000" /* .,...... */ $"012C000000000000" /* .,...... */ $"00000B4765726D69" /* ...Germi */ $"6E6174696F6E0000" /* nation.. */ $"0000000000010000" /* ........ */ $"0002000000000000" /* ........ */ $"003A0000002A636F" /* .:...*co */ $"6C72000000000000" /* lr...... */ $"0000FFFFFFFFFFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000FFFFFFFF0000" /* ........ */ $"000000010000004A" /* .......J */ $"000000000000003A" /* .......: */ $"7062746E0000000C" /* pbtn.... */ $"00000000FFFFFFFF" /* ........ */ $"000000000000006C" /* .......l */ $"000000F8000000CC" /* ........ */ $"00000112FFFFFFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"00000A44656C6574" /* ...Delet */ $"6520526F77000000" /* e Row... */ $"0046000000000000" /* .F...... */ $"00367062746E0000" /* .6pbtn.. */ $"000B00000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0008000000F80000" /* ........ */ $"006800000112FFFF" /* .h...... */ $"FFFFFFFF00000000" /* ........ */ $"00000000074E6577" /* .....New */ $"20526F7700000046" /* Row...F */ $"0000000000000036" /* .......6 */ $"7062746E00000002" /* pbtn.... */ $"00000000FFFFFFFF" /* ........ */ $"00000000000000D0" /* ........ */ $"000000F800000118" /* ........ */ $"00000112FFFFFFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"00000643616E6365" /* ...Cance */ $"6C65000000420000" /* le...B.. */ $"0000000000327062" /* .....2pb */ $"746E000000010000" /* tn...... */ $"0000FFFFFFFF0000" /* ........ */ $"00000000012C0000" /* .....,.. */ $"00F8000001740000" /* .....t.. */ $"0112FFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"024F4B7400000000" /* .OKt.... */ $"000000000000002C" /* ......., */ $"475461620000000A" /* GTab.... */ $"00000000FFFFFFFF" /* ........ */ $"000000000000000C" /* ........ */ $"0000001400000178" /* .......x */ $"000000E4FFFFFFFF" /* ........ */ $"000000000000FFFF" /* ........ */ }; /* 'VRes' 141 * * "Text Entry Dialog" */ data 'VRes' (141,"Text Entry Dialog") { $"0000000000000060" /* .......` */ $"00000050646C6F67" /* ...Pdlog */ $"0000001200000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"00000000012C0000" /* .....,.. */ $"00E60000012C0000" /* .....,.. */ $"00E6000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"000008756E746974" /* ...untit */ $"6C65640000000000" /* led..... */ $"0000000000000002" /* ........ */ $"0000005200000000" /* ...R.... */ $"0000004265646974" /* ...Bedit */ $"0000000300000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000000800000008" /* ........ */ $"00000124000000C0" /* ...$.... */ $"FFFFFFFFFFFF0075" /* .......u */ $"0000000000000000" /* ........ */ $"000000000000FFFF" /* ........ */ $"FFFF000000000004" /* ........ */ $"FFFF000000460000" /* .....F.. */ $"0000000000367062" /* .....6pb */ $"746E000000020000" /* tn...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000D60000" /* ........ */ $"00C8000001200000" /* ..... .. */ $"00E2FFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0643616E63656C65" /* .Cancele */ $"0000000000000000" /* ........ */ $"000000327062746E" /* ...2pbtn */ $"0000000100000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"00000086000000C8" /* ........ */ $"000000D0000000E2" /* ........ */ $"FFFFFFFFFFFF0000" /* ........ */ $"000000000000024F" /* .......O */ $"4B74" /* Kt */ }; /* 'VRes' 142 * * "InfoSupplier" */ data 'VRes' (142,"InfoSupplier") { $"000000000000006A" /* .......j */ $"0000005A646C6F67" /* ...Zdlog */ $"0000001200000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"00000000015E0000" /* .....^.. */ $"01770000015E0000" /* .w...^.. */ $"01770000015E0000" /* .w...^.. */ $"0177000000000000" /* .w...... */ $"00001256656E646F" /* ...Vendo */ $"7220496E666F726D" /* r Inform */ $"6174696F6E6F0000" /* ationo.. */ $"0000000000010000" /* ........ */ $"0002000000440000" /* .....D.. */ $"0000000000346368" /* .....4ch */ $"6B62000000150000" /* kb...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000001200000" /* ..... .. */ $"000C000001540000" /* .....T.. */ $"001CFFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0448696465740000" /* .Hidet.. */ $"005A000000000000" /* .Z...... */ $"004A656469740000" /* .Jedit.. */ $"000D00000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"00480000013C0000" /* .H...<.. */ $"015400000153FFFF" /* .T...S.. */ $"FFFFFFFF08756E74" /* .....unt */ $"69746C6564000000" /* itled... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000004200000000" /* ...B.... */ $"0000003274657874" /* ...2text */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000000400000138" /* .......8 */ $"0000004000000148" /* ...@...H */ $"FFFFFFFF00000645" /* .......E */ $"2D4D61696C650000" /* -Maile.. */ $"00000000005A0000" /* .....Z.. */ $"00000000004A6564" /* .....Jed */ $"69740000000C0000" /* it...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000540000" /* .....T.. */ $"0040000000A90000" /* .@...... */ $"0057FFFFFFFFFFFF" /* .W...... */ $"08756E7469746C65" /* .untitle */ $"6400000000000000" /* d....... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000046" /* .......F */ $"0000000000000036" /* .......6 */ $"7465787400000000" /* text.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000004" /* ........ */ $"000000440000004F" /* ...D...O */ $"00000054FFFFFFFF" /* ...T.... */ $"00000A53686F7274" /* ...Short */ $"204E616D65000000" /* Name... */ $"00000000005A0000" /* .....Z.. */ $"00000000004A6564" /* .....Jed */ $"69740000000B0000" /* it...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000480000" /* .....H.. */ $"0120000000E00000" /* . ...... */ $"0137FFFFFFFFFFFF" /* .7...... */ $"08756E7469746C65" /* .untitle */ $"6400000000000000" /* d....... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"000000000000003E" /* .......> */ $"000000000000002E" /* ........ */ $"7465787400000000" /* text.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000004" /* ........ */ $"0000011C0000003C" /* .......< */ $"0000012CFFFFFFFF" /* ...,.... */ $"0000034661780000" /* ...Fax.. */ $"00000000005A0000" /* .....Z.. */ $"00000000004A6564" /* .....Jed */ $"69740000000A0000" /* it...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000480000" /* .....H.. */ $"0104000000E00000" /* ........ */ $"011BFFFFFFFFFFFF" /* ........ */ $"08756E7469746C65" /* .untitle */ $"6400000000000000" /* d....... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000040" /* .......@ */ $"0000000000000030" /* .......0 */ $"7465787400000000" /* text.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000004" /* ........ */ $"0000010000000040" /* .......@ */ $"00000110FFFFFFFF" /* ........ */ $"00000550686F6E65" /* ...Phone */ $"000000000000003A" /* .......: */ $"000000000000002A" /* .......* */ $"706F706D00000014" /* popm.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000008" /* ........ */ $"00000008000000E0" /* ........ */ $"0000001EFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0046000000000000" /* .F...... */ $"00367062746E0000" /* .6pbtn.. */ $"000200000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"00B6000001580000" /* .....X.. */ $"010000000172FFFF" /* .....r.. */ $"FFFFFFFF00000000" /* ........ */ $"000000000643616E" /* .....Can */ $"63656C6500000042" /* cele...B */ $"0000000000000032" /* .......2 */ $"7062746E00000001" /* pbtn.... */ $"00000000FFFFFFFF" /* ........ */ $"000000000000010A" /* ........ */ $"0000015800000154" /* ...X...T */ $"00000172FFFFFFFF" /* ...r.... */ $"FFFF000000000000" /* ........ */ $"0000024F4B740000" /* ...OKt.. */ $"005A000000000000" /* .Z...... */ $"004A656469740000" /* .Jedit.. */ $"000900000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0048000000E80000" /* .H...... */ $"0154000000FFFFFF" /* .T...... */ $"FFFFFFFF08756E74" /* .....unt */ $"69746C6564000000" /* itled... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000004200000000" /* ...B.... */ $"0000003274657874" /* ...2text */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"00000004000000E4" /* ........ */ $"00000040000000F4" /* ...@.... */ $"FFFFFFFF00000743" /* .......C */ $"6F756E7472790000" /* ountry.. */ $"00000000005A0000" /* .....Z.. */ $"00000000004A6564" /* .....Jed */ $"6974000000080000" /* it...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000880000" /* ........ */ $"00CC000001180000" /* ........ */ $"00E3FFFFFFFFFFFF" /* ........ */ $"08756E7469746C65" /* .untitle */ $"6400000000000000" /* d....... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"000000000000004E" /* .......N */ $"000000000000003E" /* .......> */ $"7465787400000000" /* text.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000004" /* ........ */ $"000000CC00000080" /* ........ */ $"000000DCFFFFFFFF" /* ........ */ $"0000125A6970206F" /* ...Zip o */ $"7220506F7374616C" /* r Postal */ $"20436F6465000000" /* Code... */ $"00000000005A0000" /* .....Z.. */ $"00000000004A6564" /* .....Jed */ $"6974000000070000" /* it...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000880000" /* ........ */ $"00B0000001180000" /* ........ */ $"00C7FFFFFFFFFFFF" /* ........ */ $"08756E7469746C65" /* .untitle */ $"6400000000000000" /* d....... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000040" /* .......@ */ $"0000000000000030" /* .......0 */ $"7465787400000000" /* text.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000004" /* ........ */ $"000000B400000038" /* .......8 */ $"000000C4FFFFFFFF" /* ........ */ $"0000055374617465" /* ...State */ $"000000000000005A" /* .......Z */ $"000000000000004A" /* .......J */ $"6564697400000006" /* edit.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000048" /* .......H */ $"0000009400000154" /* .......T */ $"000000ABFFFFFFFF" /* ........ */ $"FFFF08756E746974" /* ...untit */ $"6C65640000000000" /* led..... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0040000000000000" /* .@...... */ $"0030746578740000" /* .0text.. */ $"000000000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0004000000980000" /* ........ */ $"0034000000A8FFFF" /* .4...... */ $"FFFF000004436974" /* .....Cit */ $"7974000000000000" /* yt...... */ $"005A000000000000" /* .Z...... */ $"004A656469740000" /* .Jedit.. */ $"000500000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0048000000780000" /* .H...x.. */ $"01540000008FFFFF" /* .T...... */ $"FFFFFFFF08756E74" /* .....unt */ $"69746C6564000000" /* itled... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000004200000000" /* ...B.... */ $"0000003274657874" /* ...2text */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000000400000028" /* .......( */ $"0000004F00000038" /* ...O...8 */ $"FFFFFFFF00000743" /* .......C */ $"6F6D70616E790000" /* ompany.. */ $"0000000000420000" /* .....B.. */ $"0000000000327465" /* .....2te */ $"7874000000000000" /* xt...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000040000" /* ........ */ $"005C0000004F0000" /* .\...O.. */ $"006CFFFFFFFF0000" /* .l...... */ $"0741646472657373" /* .Address */ $"000000000000005A" /* .......Z */ $"000000000000004A" /* .......J */ $"6564697400000004" /* edit.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000048" /* .......H */ $"0000005C00000154" /* ...\...T */ $"00000073FFFFFFFF" /* ...s.... */ $"FFFF08756E746974" /* ...untit */ $"6C65640000000000" /* led..... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"004A656469740000" /* .Jedit.. */ $"000300000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0054000000250000" /* .T...%.. */ $"01540000003CFFFF" /* .T...<.. */ $"FFFFFFFF08756E74" /* .....unt */ $"69746C6564000000" /* itled... */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ }; /* 'VRes' 143 * * "ColumnSetDialog" */ data 'VRes' (143,"ColumnSetDialog") { $"000000000000006A" /* .......j */ $"0000005A646C6F67" /* ...Zdlog */ $"0000010000000000" /* ........ */ $"FFFF000000960000" /* ........ */ $"001E000000000000" /* ........ */ $"0000000001680000" /* .....h.. */ $"0118000001680000" /* .....h.. */ $"0118000001680000" /* .....h.. */ $"0118000000000000" /* ........ */ $"0000124564697420" /* ...Edit */ $"4461746162617365" /* Database */ $"2056696577000000" /* View... */ $"0000000000010000" /* ........ */ $"0002000000460000" /* .....F.. */ $"0000000000367062" /* .....6pb */ $"746E000000020000" /* tn...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000C30000" /* ........ */ $"00FC000001080000" /* ........ */ $"0116FFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0643616E63656C65" /* .Cancele */ $"0000004200000000" /* ...B.... */ $"000000327062746E" /* ...2pbtn */ $"0000000100000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"00000110000000FC" /* ........ */ $"0000015500000116" /* ...U.... */ $"FFFFFFFFFFFF0000" /* ........ */ $"000000000000024F" /* .......O */ $"4B74000000760000" /* Kt...v.. */ $"003C0000002C7363" /* .<...,sc */ $"7276000000000000" /* rv...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000040000" /* ........ */ $"0034000001640000" /* .4...d.. */ $"00F8FFFFFFFF0000" /* ........ */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000000" /* ........ */ $"002A475461620000" /* .*GTab.. */ $"000600000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"014F000000B3FFFF" /* .O...... */ $"FFFF000000000000" /* ........ */ $"0000004400000000" /* ...D.... */ $"0000003474657874" /* ...4text */ $"0000000500000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000002C00000004" /* ...,.... */ $"0000016000000030" /* ...`...0 */ $"FFFFFFFF00000875" /* .......u */ $"6E7469746C656400" /* ntitled. */ $"0000000000000000" /* ........ */ $"0000000000000032" /* .......2 */ $"69636F6E00000007" /* icon.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000008" /* ........ */ $"0000000400000028" /* .......( */ $"00000024FFFFFFFF" /* ...$.... */ $"0000000000020000" /* ........ */ $"002000000020" /* . ... */ }; /* 'VRes' 144 * * "SetNameDialog" */ data 'VRes' (144,"SetNameDialog") { $"0000000000000060" /* .......` */ $"00000050646C6F67" /* ...Pdlog */ $"0000001200000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"00000000012C0000" /* .....,.. */ $"00640000012C0000" /* .d...,.. */ $"00640000012C0000" /* .d...,.. */ $"00C8000000000000" /* ........ */ $"0000094E616D6520" /* ...Name */ $"5669657700000000" /* View.... */ $"0000000100000002" /* ........ */ $"0000004200000000" /* ...B.... */ $"000000327062746E" /* ...2pbtn */ $"0000000100000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"000000E000000040" /* .......@ */ $"000001280000005A" /* ...(...Z */ $"FFFFFFFFFFFF0000" /* ........ */ $"000000000000024F" /* .......O */ $"4B74000000460000" /* Kt...F.. */ $"0000000000367062" /* .....6pb */ $"746E000000020000" /* tn...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000900000" /* ........ */ $"0040000000D80000" /* .@...... */ $"005AFFFFFFFFFFFF" /* .Z...... */ $"0000000000000000" /* ........ */ $"0643616E63656C65" /* .Cancele */ $"0000005200000000" /* ...R.... */ $"0000004265646974" /* ...Bedit */ $"0000000300000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000001400000020" /* ....... */ $"0000011400000038" /* .......8 */ $"FFFFFFFFFFFF004E" /* .......N */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"0000000000427465" /* .....Bte */ $"7874000000000000" /* xt...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000140000" /* ........ */ $"000C0000010C0000" /* ........ */ $"001CFFFFFFFF0000" /* ........ */ $"16506C6561736520" /* .Please */ $"6E616D6520746869" /* name thi */ $"7320766965772E6E" /* s view.n */ $"00000000" /* .... */ }; /* 'VRes' 148 * * "Plugin Selector" */ data 'VRes' (148,"Plugin Selector") { $"0000000000000060" /* .......` */ $"00000050646C6F67" /* ...Pdlog */ $"0000001200000000" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000000000000000" /* ........ */ $"00000000017C0000" /* .....|.. */ $"01040000017C0000" /* .....|.. */ $"01040000017C0000" /* .....|.. */ $"0104000000000000" /* ........ */ $"000008756E746974" /* ...untit */ $"6C65640000000000" /* led..... */ $"0000000000000000" /* ........ */ $"000000760000003C" /* ...v...< */ $"0000002C73637276" /* ...,scrv */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000005800000030" /* ...X...0 */ $"00000178000000DC" /* ...x.... */ $"FFFFFFFF0000FFFF" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"000000000000002A" /* .......* */ $"4754616200000000" /* GTab.... */ $"00000000FFFFFFFF" /* ........ */ $"00000000FFFFFFFF" /* ........ */ $"FFFFFFFF0000010F" /* ........ */ $"0000009BFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"0046000000000000" /* .F...... */ $"00367062746E0000" /* .6pbtn.. */ $"000200000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"00E4000000E40000" /* ........ */ $"0124000000FEFFFF" /* .$...... */ $"FFFFFFFF00000000" /* ........ */ $"000000000643616E" /* .....Can */ $"63656C6500000042" /* cele...B */ $"0000000000000032" /* .......2 */ $"7062746E00000001" /* pbtn.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000130" /* .......0 */ $"000000E400000170" /* .......p */ $"000000FEFFFFFFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000024F4B740000" /* ...OKt.. */ $"0042000000000000" /* .B...... */ $"0032746578740000" /* .2text.. */ $"000000000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0004000000300000" /* .....0.. */ $"004F000000CCFFFF" /* .O...... */ $"FFFF000006416374" /* .....Act */ $"696F6E6500000000" /* ione.... */ $"0000004000000000" /* ...@.... */ $"0000003074657874" /* ...0text */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"000000840000000C" /* ........ */ $"000000AE0000001C" /* ........ */ $"FFFFFFFF0000044E" /* .......N */ $"616D657400000000" /* amet.... */ $"0000000000000000" /* ........ */ $"0000003274657874" /* ...2text */ $"0000000000000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"000000500000000B" /* ...P.... */ $"0000007A0000001C" /* ...z.... */ $"FFFFFFFF00000641" /* .......A */ $"6374697665650000" /* ctivee.. */ $"0000" /* .. */ }; /* 'VRes' 150 * * "Default Search Panel" */ data 'VRes' (150,"Default Search Panel") { $"0000000000000036" /* .......6 */ $"0000002676696577" /* ...&view */ $"0000009600000000" /* ........ */ $"FFFFFFFFFFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"FFFFFFFFFFFFFFFF" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"00000000003A0000" /* .....:.. */ $"002A6261636B0000" /* .*back.. */ $"000000000000FFFF" /* ........ */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000000" /* ........ */ $"000000000000FFFF" /* ........ */ $"FFFF000000000001" /* ........ */ $"0000004A00000000" /* ...J.... */ $"0000003A7062746E" /* ...:pbtn */ $"0000000800000000" /* ........ */ $"FFFFFFFF00000000" /* ........ */ $"0000017800000014" /* ...x.... */ $"000002000000004C" /* .......L */ $"FFFFFFFFFFFF0000" /* ........ */ $"0000000000000A53" /* .......S */ $"6974652044617461" /* ite Data */ $"C9000000003A0000" /* .....:.. */ $"00000000002A706F" /* .....*po */ $"706D000000070000" /* pm...... */ $"0000FFFFFFFF0000" /* ........ */ $"0000000000840000" /* ........ */ $"00A8000000FC0000" /* ........ */ $"00BEFFFFFFFF0000" /* ........ */ $"0000000000000040" /* .......@ */ $"0000000000000030" /* .......0 */ $"7465787400000069" /* text...i */ $"00000000FFFFFFFF" /* ........ */ $"000000000000000C" /* ........ */ $"000000AC00000057" /* .......W */ $"000000BCFFFFFFFF" /* ........ */ $"000004466F726D74" /* ...Formt */ $"000000000000003A" /* .......: */ $"000000000000002A" /* .......* */ $"706F706D00000006" /* popm.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000118" /* ........ */ $"0000008C00000190" /* ........ */ $"000000A2FFFFFFFF" /* ........ */ $"0000000000000000" /* ........ */ $"003A000000000000" /* .:...... */ $"002A706F706D0000" /* .*popm.. */ $"000400000000FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0118000000700000" /* .....p.. */ $"019000000086FFFF" /* ........ */ $"FFFF000000000000" /* ........ */ $"0000003E00000000" /* ...>.... */ $"0000002E74657874" /* ....text */ $"0000006B00000000" /* ...k.... */ $"FFFFFFFF00000000" /* ........ */ $"0000010400000090" /* ........ */ $"00000118000000A0" /* ........ */ $"FFFFFFFF00000274" /* .......t */ $"6F74000000000000" /* ot...... */ $"003E000000000000" /* .>...... */ $"002E746578740000" /* ..text.. */ $"006A00000000FFFF" /* .j...... */ $"FFFF000000000000" /* ........ */ $"0104000000740000" /* .....t.. */ $"011800000084FFFF" /* ........ */ $"FFFF000002746F74" /* .....tot */ $"000000000000003A" /* .......: */ $"000000000000002A" /* .......* */ $"706F706D00000005" /* popm.... */ $"00000000FFFFFFFF" /* ........ */ $"0000000000000084" /* ........ */ $"0000008C000000FC" /* ........ */ $"000000A2FFFFFFFF" /* ........ */ $"0000000000000000" /* ........ [truncated message content] |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-09 17:47:14
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3458 Modified Files: Tag: Release_branch_v1 RGPaletteView.cpp Log Message: Change icons in palette to be 32x32 Index: RGPaletteView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGPaletteView.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** RGPaletteView.cpp 26 Nov 2006 01:17:43 -0000 1.3.2.1 --- RGPaletteView.cpp 9 Dec 2006 17:47:12 -0000 1.3.2.2 *************** *** 44,49 **** //namespace yaaf { ! const int kButtonWidth = 30; ! const int kButtonHeight = 30; const int kButtonBorder = 2; --- 44,49 ---- //namespace yaaf { ! const int kButtonWidth = 36; ! const int kButtonHeight = 36; const int kButtonBorder = 2; *************** *** 556,561 **** void XGPaletteView::DrawButton(XGDraw &draw, Rect where, long index, unsigned char mode) { ! bool down; ! short icon; icon = GetItemIcon(index); --- 556,560 ---- void XGPaletteView::DrawButton(XGDraw &draw, Rect where, long index, unsigned char mode) { ! short icon; icon = GetItemIcon(index); *************** *** 565,635 **** */ ! if (0 == (mode & kEnable) || (GetItemEnabled(index) == 0)) { draw.Draw3DRect(where,yaaf::KXGEBackground); InsetRect(&where,3,3); ! down = false; ! } else { ! if (mode & (kCheck | kDown)) { /* * Draw the outer frame down */ ! ! draw.Draw3DRect(where,yaaf::KXGEInset); ! InsetRect(&where,1,1); ! draw.Draw3DRect(where,yaaf::KXGEBackFrame); ! InsetRect(&where,1,1); ! down = true; ! } else { ! if (index == fHilightTool) { ! draw.Draw3DRect(where,yaaf::KXGEOutset); ! } else { ! draw.Draw3DRect(where,yaaf::KXGEBackFrame); ! } ! InsetRect(&where,1,1); ! draw.Draw3DRect(where,yaaf::KXGEBackFrame); ! InsetRect(&where,1,1); ! down = false; } ! ! /* ! * Draw the button outline ! */ ! ! // if ((mode & kCheck) && (0 == (mode & kDown))) { ! /* ! * Draw the light background ! */ ! ! short r,g,b; ! Color back,light; ! ! back = draw.ColorFromPalette(KXGColorBtnFace); ! light= draw.ColorFromPalette(KXGColorBtnHilite); ! ! r = GetRValue(back); ! r = (r + GetRValue(light))/2; ! g = GetRValue(back); ! g = (g + GetRValue(light))/2; ! b = GetRValue(back); ! b = (b + GetRValue(light))/2; ! ! draw.FillRect(where,RGB(r,g,b)); ! } ! // else ! // { ! // draw.Draw3DRect(where,KXGEBackground); ! // } ! InsetRect(&where,1,1); ! } ! ! if (mode & kEnable) { ! if (down) { ! draw.DrawIcon(icon,where.left+1,where.top+1); ! } else { draw.DrawIcon(icon,where.left,where.top); } - } else { - draw.DrawIcon(icon,where.left,where.top,false); } } --- 564,611 ---- */ ! if (0 == (mode & kEnable) || (GetItemEnabled(index) == 0)) ! { draw.Draw3DRect(where,yaaf::KXGEBackground); InsetRect(&where,3,3); ! draw.DrawIcon(icon,where.left,where.top,false); ! } ! else ! { ! if (mode & (kCheck | kDown)) ! { /* * Draw the outer frame down */ ! draw.SetForeColor(KXGColorBtnShadow); ! draw.MoveTo(where.right-1, where.top); ! draw.LineTo(where.left, where.top); ! draw.LineTo(where.left, where.bottom-1); ! draw.MoveTo(where.right-2, where.top+1); ! draw.LineTo(where.left+1, where.top+1); ! draw.LineTo(where.left+1, where.bottom-2); ! //*** ! draw.SetForeColor(KXGColorBtnHilite); ! draw.MoveTo(where.right-1, where.top+1); ! draw.LineTo(where.right-2, where.bottom-1); ! draw.LineTo(where.left+1, where.bottom-1); ! draw.MoveTo(where.right-2, where.top+2); ! draw.LineTo(where.right-2, where.bottom-2); ! draw.LineTo(where.left+2, where.bottom-2); ! ! InsetRect(&where,2,2); ! draw.ClipRect(&where); ! draw.DrawIcon(1069,where.left,where.top); ! draw.DrawIcon(icon,where.left,where.top); ! draw.ClipRect(NULL); } ! else { ! draw.Draw3DRect(where,yaaf::KXGEBackground); ! InsetRect(&where,2,2); ! draw.ClipRect(&where); ! draw.DrawIcon(1069,where.left,where.top); draw.DrawIcon(icon,where.left,where.top); + draw.ClipRect(NULL); } } } |
|
From: Jeffrey B. <jlb...@us...> - 2006-12-09 17:45:38
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2695 Modified Files: Tag: Release_branch_v1 MaterialCollection.cpp MaterialCollection.h Log Message: Cache material names to speed up sort Index: MaterialCollection.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialCollection.cpp,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** MaterialCollection.cpp 26 Nov 2006 01:22:52 -0000 1.6.2.1 --- MaterialCollection.cpp 9 Dec 2006 17:45:35 -0000 1.6.2.2 *************** *** 60,63 **** --- 60,70 ---- MaterialCollection::~MaterialCollection() { + uint32 i, count; + + count = _items.Length(); + for(i = 0; i < count; i++) + { + delete _items[i]; + } } *************** *** 70,79 **** /// and causes an immediate update to the region where it is placed. */ // ! void MaterialCollection::AddMaterial( Material * item ) { materialID_t uid; ! item->GetObjectID(uid.species); ! item->GetVariantID(uid.variant); SetModified(); _items.push_back(item); --- 77,89 ---- /// and causes an immediate update to the region where it is placed. */ // ! void MaterialCollection::AddMaterial( Material * mat ) { materialID_t uid; + matCollItem_t *item; ! mat->GetObjectID(uid.species); ! mat->GetVariantID(uid.variant); ! item = new matCollItem_t; ! item->mat = mat; // item.name is only used by sort, and will be set by sort. SetModified(); _items.push_back(item); *************** *** 103,107 **** for(n = 0; n < count; n++) { ! mat = _items[n]; mat->GetObjectID(testUID.species); mat->GetVariantID(testUID.variant); --- 113,117 ---- for(n = 0; n < count; n++) { ! mat = _items[n]->mat; mat->GetObjectID(testUID.species); mat->GetVariantID(testUID.variant); *************** *** 170,174 **** PRECONDITION(index >= 0); ! itemPtr = _items[index]; return(itemPtr); --- 180,184 ---- PRECONDITION(index >= 0); ! itemPtr = _items[index]->mat; return(itemPtr); *************** *** 239,243 **** for(n = 0, result = false; n < numMaterials; n++) { ! mat = _items[n]; mat->GetObjectID(testID.species); mat->GetVariantID(testID.variant); --- 249,253 ---- for(n = 0, result = false; n < numMaterials; n++) { ! mat = _items[n]->mat; mat->GetObjectID(testID.species); mat->GetVariantID(testID.variant); *************** *** 267,272 **** for(n = 0; n < numMaterials; n++) { ! _items[n]->GetObjectID(testID.species); ! _items[n]->GetVariantID(testID.variant); if((testID.species == oldID.species) && --- 277,282 ---- for(n = 0; n < numMaterials; n++) { ! _items[n]->mat->GetObjectID(testID.species); ! _items[n]->mat->GetVariantID(testID.variant); if((testID.species == oldID.species) && *************** *** 348,360 **** { UInt32 numItems; ! Material *intermediate; bool NoSwaps; if(_needsSort || _sortType != namePref) { - // I know I know, but for a small number of items which should be already - // be sorted or nearly sorted, this should be enough. numItems = _items.Length(); ! for (unsigned int i = 0; i < (numItems - 1); ++i) { NoSwaps = true; // Checks to see if any swaps happened --- 358,374 ---- { UInt32 numItems; ! matCollItem_t *intermediate; bool NoSwaps; + int i; if(_needsSort || _sortType != namePref) { numItems = _items.Length(); ! for(i = _items.Length()-1; i >= 0 && _items[i]->sortName.Length() == 0; i--) ! _items[i]->sortName = _items[i]->mat->GetDisplayName(namePref); ! ! // I know I know, but for a small number of items which should be already ! // be nearly sorted, this should be enough. ! for (i = 0; i < (numItems - 1); ++i) { NoSwaps = true; // Checks to see if any swaps happened *************** *** 362,366 **** for (unsigned int j = 1; j < (numItems - i); ++j) { ! if (_items[j - 1]->GetDisplayName(namePref) > _items[j]->GetDisplayName(namePref)) { intermediate = _items[j-1]; --- 376,380 ---- for (unsigned int j = 1; j < (numItems - i); ++j) { ! if (_items[j - 1]->sortName > _items[j]->sortName) { intermediate = _items[j-1]; *************** *** 380,383 **** --- 394,398 ---- } _needsSort = false; + _sortType = namePref; } } Index: MaterialCollection.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialCollection.h,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** MaterialCollection.h 26 Nov 2006 01:22:52 -0000 1.5.2.1 --- MaterialCollection.h 9 Dec 2006 17:45:35 -0000 1.5.2.2 *************** *** 31,34 **** --- 31,40 ---- using yaaf::XGDynArray; + typedef struct + { + Material *mat; + String sortName; // Not set until sort,as it depends upon preferences + } matCollItem_t; + class MaterialCollection { *************** *** 75,79 **** DBPersist* _compat; String _name; ! XGDynArray<Material*> _items; }; --- 81,85 ---- DBPersist* _compat; String _name; ! XGDynArray<matCollItem_t*> _items; }; |