igarden-commit Mailing List for GardenSketch (Page 79)
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-11-15 04:04:56
|
Update of /cvsroot/igarden/Garden/source/resources In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8326 Modified Files: Tag: Release_branch_v1 SourceMaterialsStart.xml Log Message: Add sundial, pool, birdbath Index: SourceMaterialsStart.xml =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/SourceMaterialsStart.xml,v retrieving revision 1.24.2.5 retrieving revision 1.24.2.6 diff -C2 -d -r1.24.2.5 -r1.24.2.6 *** SourceMaterialsStart.xml 11 Nov 2006 15:03:05 -0000 1.24.2.5 --- SourceMaterialsStart.xml 15 Nov 2006 04:04:53 -0000 1.24.2.6 *************** *** 1290,1293 **** --- 1290,1296 ---- <Material UID="979C0E6F-E90A-4712-B8A1-BDEA9D314956" CommonName="Test Pattern" materialType="Hardscape" Height="1ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="TestPattern1.svg"/> <Material UID="3E842083-6358-459B-8813-48F4F1A91498" CommonName="Test Pattern 2" materialType="Hardscape" Height="1ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="TestPattern2.svg"/> + <Material UID="350457E8-7167-4290-B13C-C8F91D107D06" CommonName="Birdbath" materialType="Accent" Height="3ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Birdbath.svg"/> + <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"/> |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 04:03:58
|
Update of /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7947 Modified Files: Tag: Release_branch_v1 project.pbxproj Log Message: Add PurchaseReport Index: project.pbxproj =================================================================== RCS file: /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj/project.pbxproj,v retrieving revision 1.58.2.4 retrieving revision 1.58.2.5 diff -C2 -d -r1.58.2.4 -r1.58.2.5 *** project.pbxproj 11 Nov 2006 15:03:25 -0000 1.58.2.4 --- project.pbxproj 15 Nov 2006 04:03:56 -0000 1.58.2.5 *************** *** 246,249 **** --- 246,255 ---- 4973E08A06F6877C00E3ED15 /* RGXMLUtils.h in Sources */ = {isa = PBXBuildFile; fileRef = 4973E08806F6877C00E3ED15 /* RGXMLUtils.h */; }; 497650B606545FE4007AFB6C /* RGCompression.h in Headers */ = {isa = PBXBuildFile; fileRef = 497650B406545FE4007AFB6C /* RGCompression.h */; }; + 497940870B0620C60011D499 /* Birdbath.svg in Resources */ = {isa = PBXBuildFile; fileRef = 497940840B0620C60011D499 /* Birdbath.svg */; }; + 497940880B0620C60011D499 /* KidneyPool.svg in Resources */ = {isa = PBXBuildFile; fileRef = 497940850B0620C60011D499 /* KidneyPool.svg */; }; + 497940890B0620C60011D499 /* Sundial.svg in Resources */ = {isa = PBXBuildFile; fileRef = 497940860B0620C60011D499 /* Sundial.svg */; }; + 497944C20B06D3360011D499 /* PurchaseReport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 497944C00B06D3360011D499 /* PurchaseReport.cpp */; }; + 497944C30B06D3360011D499 /* PurchaseReport.h in Headers */ = {isa = PBXBuildFile; fileRef = 497944C10B06D3360011D499 /* PurchaseReport.h */; }; + 497946A70B08AA370011D499 /* ShopList1.html in Resources */ = {isa = PBXBuildFile; fileRef = 497946A60B08AA370011D499 /* ShopList1.html */; }; 4979A82608A4D51B00AB8671 /* PlanCanvasView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4979A82408A4D51B00AB8671 /* PlanCanvasView.h */; }; 4979A82708A4D51B00AB8671 /* PlanCanvasView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4979A82508A4D51B00AB8671 /* PlanCanvasView.cpp */; }; *************** *** 907,910 **** --- 913,922 ---- 4973E08806F6877C00E3ED15 /* RGXMLUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RGXMLUtils.h; path = ../source/Database/RGXMLUtils.h; sourceTree = SOURCE_ROOT; }; 497650B406545FE4007AFB6C /* RGCompression.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RGCompression.h; path = ../../CommonSource/YAAFExtensions/RGCompression.h; sourceTree = SOURCE_ROOT; }; + 497940840B0620C60011D499 /* Birdbath.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = Birdbath.svg; path = ../source/resources/2DSymbols/Birdbath.svg; sourceTree = SOURCE_ROOT; }; + 497940850B0620C60011D499 /* KidneyPool.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = KidneyPool.svg; path = ../source/resources/2DSymbols/KidneyPool.svg; sourceTree = SOURCE_ROOT; }; + 497940860B0620C60011D499 /* Sundial.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = Sundial.svg; path = ../source/resources/2DSymbols/Sundial.svg; sourceTree = SOURCE_ROOT; }; + 497944C00B06D3360011D499 /* PurchaseReport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = PurchaseReport.cpp; path = Reports/PurchaseReport.cpp; sourceTree = "<group>"; }; + 497944C10B06D3360011D499 /* PurchaseReport.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PurchaseReport.h; path = Reports/PurchaseReport.h; sourceTree = "<group>"; }; + 497946A60B08AA370011D499 /* ShopList1.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; name = ShopList1.html; path = Reports/ReportFormats/ShopList1.html; sourceTree = "<group>"; }; 4979A82408A4D51B00AB8671 /* PlanCanvasView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlanCanvasView.h; path = PlanTool/PlanCanvasView.h; sourceTree = "<group>"; }; 4979A82508A4D51B00AB8671 /* PlanCanvasView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PlanCanvasView.cpp; path = PlanTool/PlanCanvasView.cpp; sourceTree = "<group>"; }; *************** *** 1395,1398 **** --- 1407,1411 ---- children = ( 49040A380735C7F6009B97F1 /* Label_Borders1.html */, + 497946A60B08AA370011D499 /* ShopList1.html */, 49040A390735C7F6009B97F1 /* Label_Borders2.html */, ); *************** *** 1496,1499 **** --- 1509,1515 ---- isa = PBXGroup; children = ( + 497940840B0620C60011D499 /* Birdbath.svg */, + 497940850B0620C60011D499 /* KidneyPool.svg */, + 497940860B0620C60011D499 /* Sundial.svg */, 49C3C91B0AFE6BCC0022168F /* TestPattern1.svg */, 49C3C91C0AFE6BCC0022168F /* TestPattern2.svg */, *************** *** 1627,1630 **** --- 1643,1648 ---- isa = PBXGroup; children = ( + 497944C00B06D3360011D499 /* PurchaseReport.cpp */, + 497944C10B06D3360011D499 /* PurchaseReport.h */, 49040A370735C7DD009B97F1 /* New Group */, 49074A6706488EF200C334E8 /* PlantLabelReport.h */, *************** *** 2240,2243 **** --- 2258,2262 ---- 4940802109D5ADEE006F7F71 /* AgingWindow.h in Headers */, 4950A95E0AAFA8250048DAF9 /* ImportPlugin.h in Headers */, + 497944C30B06D3360011D499 /* PurchaseReport.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 2476,2479 **** --- 2495,2502 ---- 49C3C91D0AFE6BCC0022168F /* TestPattern1.svg in Resources */, 49C3C91E0AFE6BCC0022168F /* TestPattern2.svg in Resources */, + 497940870B0620C60011D499 /* Birdbath.svg in Resources */, + 497940880B0620C60011D499 /* KidneyPool.svg in Resources */, + 497940890B0620C60011D499 /* Sundial.svg in Resources */, + 497946A70B08AA370011D499 /* ShopList1.html in Resources */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 2795,2798 **** --- 2818,2822 ---- 4940802009D5ADEE006F7F71 /* AgingWindow.cpp in Sources */, 49DB5A100A116EBD0024D8F6 /* PrintingPrefsPanel.cpp in Sources */, + 497944C20B06D3360011D499 /* PurchaseReport.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 04:03:33
|
Update of /cvsroot/igarden/Garden/source In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7930 Modified Files: Tag: Release_branch_v1 Resources.h Log Message: Add PurchaseReport Index: Resources.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Resources.h,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** Resources.h 26 May 2006 10:39:09 -0000 1.10 --- Resources.h 15 Nov 2006 04:03:31 -0000 1.10.2.1 *************** *** 57,60 **** --- 57,61 ---- const int kViewPlantLabelReport = 1200; + const int kViewPurchaseReport = 1201; const int kViewYearMenu = 1600; |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 04:02:54
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7548 Modified Files: Tag: Release_branch_v1 CGardenForm.cp Log Message: Add PurchaseReport Index: CGardenForm.cp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CGardenForm.cp,v retrieving revision 1.36 retrieving revision 1.36.2.1 diff -C2 -d -r1.36 -r1.36.2.1 *** CGardenForm.cp 1 Jul 2006 23:13:58 -0000 1.36 --- CGardenForm.cp 15 Nov 2006 04:02:53 -0000 1.36.2.1 *************** *** 40,43 **** --- 40,44 ---- #include "RGTabButton.h" #include "PlantLabelReport.h" + #include "PurchaseReport.h" #include "AerialImportDialog.h" #include "WritablePlanView.h" *************** *** 509,512 **** --- 510,514 ---- case kViewPlantLabelReport: + case kViewPurchaseReport: m->enable = true; break; *************** *** 607,610 **** --- 609,616 ---- PlantLabelReport::CreatePlantLabelReport(GetFile()); break; + + case kViewPurchaseReport: + PurchaseReport::CreatePurchaseReport(GetFile()); + break; case kMonthMenuAll: |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 04:00:25
|
Update of /cvsroot/igarden/CommonSource/Utilities In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6738 Modified Files: Tag: Release_branch_v1 RGString.h Log Message: Add PurchaseReport Index: RGString.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/Utilities/RGString.h,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** RGString.h 17 May 2006 00:03:55 -0000 1.11 --- RGString.h 15 Nov 2006 04:00:23 -0000 1.11.2.1 *************** *** 99,102 **** --- 99,104 ---- bool operator<(String s) { return (bool) (CIwcscmp(_sptr,s._sptr) < 0); } + bool operator<(const String s) const + { return (bool) (CIwcscmp(_sptr,s._sptr) < 0); } bool operator<=(String s) { return (bool) (!(*this > s)); } |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 04:00:02
|
Update of /cvsroot/igarden/Garden/source/Reports In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6380 Modified Files: Tag: Release_branch_v1 PlantLabelReport.h PlantLabelReport.cpp Log Message: Add PurchaseReport Index: PlantLabelReport.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Reports/PlantLabelReport.cpp,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** PlantLabelReport.cpp 2 Feb 2006 01:20:59 -0000 1.12 --- PlantLabelReport.cpp 15 Nov 2006 03:59:56 -0000 1.12.2.1 *************** *** 144,148 **** plot = layout->GetCurrentPlot(); ! layout->GetUnusedLayer()->AddToMaterialRefArray(&_list, nilID); numLayers = plot->GetNumLayers(); --- 144,148 ---- plot = layout->GetCurrentPlot(); ! layout->GetUnusedLayer()->AddToPathELementArray(&_list, nilID); numLayers = plot->GetNumLayers(); *************** *** 150,154 **** { layer = plot->GetIndexedLayer(n); ! layer->AddToMaterialRefArray(&_list, nilID); } XGCommandButton *printBtn = dynamic_cast<XGCommandButton*>(dlog->FindViewByID(10001)); --- 150,154 ---- { layer = plot->GetIndexedLayer(n); ! layer->AddToPathELementArray(&_list, nilID); } XGCommandButton *printBtn = dynamic_cast<XGCommandButton*>(dlog->FindViewByID(10001)); *************** *** 282,301 **** for(n = 0; n < numRows && !allow; n++) { ! ref = _list[n]; ! mat = ref->GetMaterial(ifMissingNULL); ! if(mat != NULL) { ! instance = ref->LatestInstanceData(kSowLocation); ! if(instance != NULL) ! sow = instance->GetSowLocation(); ! else ! sow = kSowLocationUnspecified; ! ! ! if(((sow == kSowLocationIndoors) && _indoors) || ! ((sow == kSowLocationOutdoors) && _outdoors) || ! ((sow == kSowLocationColdFrame) && _coldFrame)) { ! allow = true; } } --- 282,304 ---- for(n = 0; n < numRows && !allow; n++) { ! ref = dynamic_cast<MaterialRef*>(_list[n]); ! if(ref != NULL) { ! mat = ref->GetMaterial(ifMissingNULL); ! if(mat != NULL) { ! instance = ref->LatestInstanceData(kSowLocation); ! if(instance != NULL) ! sow = instance->GetSowLocation(); ! else ! sow = kSowLocationUnspecified; ! ! ! if(((sow == kSowLocationIndoors) && _indoors) || ! ((sow == kSowLocationOutdoors) && _outdoors) || ! ((sow == kSowLocationColdFrame) && _coldFrame)) ! { ! allow = true; ! } } } *************** *** 344,445 **** for(n = 0; n < numRows; n++) { ! ref = _list[n]; ! mat = ref->GetMaterial(ifMissingNULL); ! if(mat != NULL) { ! name = mat->GetDisplayName(kUsePreferencesSetting); ! ! instance = ref->LatestInstanceData(kSowLocation); ! if(instance != NULL) ! sow = instance->GetSowLocation(); ! else ! sow = kSowLocationUnspecified; ! ! ! if((sow == kSowLocationIndoors && _indoors) || ! (sow == kSowLocationOutdoors && _outdoors) || ! (sow == kSowLocationColdFrame && _coldFrame)) { ! namePtr = name.c_str(); ! strcpy(seedBuf, "???"); ! if(mat->GetDate(kExpSeedStartDate, date)) ! { ! sprintf(seedBuf, "%d/%d", date.month(), date.day()); ! } else { ! instance = ref->LatestInstanceData(kActualSeedStartDate); ! if(instance != NULL) { ! if(instance->GetActualSeedStart(date)) { ! sprintf(seedBuf, "%d/%d", date.month(), date.day()); } } - } ! strcpy(plantBuf, "???"); ! if(mat->GetDate(kExpPlantOutDate, date)) ! { ! sprintf(plantBuf, "%d/%d", date.month(), date.day()); ! } ! else ! { ! instance = ref->LatestInstanceData(kActualPlantOutDate); ! if(instance != NULL) { ! if(instance->GetActualPlantOut(date)) { ! sprintf(plantBuf, "%d/%d", date.month(), date.day()); } } - } ! String objComments; ! ! comments = "(none)"; ! instance = ref->LatestInstanceData(kUserComments); ! if(instance != NULL) ! instance->GetUserComments(objComments); ! else ! objComments = L""; ! comments = objComments.c_str(); ! ! AttributeDictionary::GetAttributeValueStr(mat, kShadeTolerance, kMetricUnits, shadeObj); ! shadePtr = shadeObj.c_str(); ! instance = ref->LatestInstanceData(kSowLocation); ! if(instance != NULL) ! { ! String str; ! AttributeDictionary::GetIndexedEnumValue(kSowLocation, instance->GetSowLocation(), str); ! sowObj = str.c_str(); ! } ! else ! sowObj = L""; ! sowPtr = sowObj.c_str(); ! ! /*****/ ! ref->GetPlotID(plotID); ! numPlots = layout->NumPlots(); ! plotNameObj = L""; ! for(index = 0; index < numPlots; index++) ! { ! plot = layout->GetIndexedPlot(index); ! plot->getPlotID(testPlotID); ! if(plotID == testPlotID) { ! plot->GetName(plotNameObj); ! break; } - } - - FormatBuffer(output, format.vfmt, namePtr, seedBuf, shadePtr, comments, plantBuf, sowPtr, plotNameObj.c_str()); ! cell = new RGReportHypertextCell(this, _ht, cellSize, output); ! cell->SetUseBorder(format.hasBorder); ! _cells.push_back(cell); } } --- 347,451 ---- for(n = 0; n < numRows; n++) { ! ref = dynamic_cast<MaterialRef*>(_list[n]); ! if(ref != NULL) { ! mat = ref->GetMaterial(ifMissingNULL); ! if(mat != NULL) { ! name = mat->GetDisplayName(kUsePreferencesSetting); ! instance = ref->LatestInstanceData(kSowLocation); ! if(instance != NULL) ! sow = instance->GetSowLocation(); else + sow = kSowLocationUnspecified; + + + if((sow == kSowLocationIndoors && _indoors) || + (sow == kSowLocationOutdoors && _outdoors) || + (sow == kSowLocationColdFrame && _coldFrame)) { ! namePtr = name.c_str(); ! ! strcpy(seedBuf, "???"); ! if(mat->GetDate(kExpSeedStartDate, date)) { ! sprintf(seedBuf, "%d/%d", date.month(), date.day()); ! } ! else ! { ! instance = ref->LatestInstanceData(kActualSeedStartDate); ! if(instance != NULL) { ! if(instance->GetActualSeedStart(date)) ! { ! sprintf(seedBuf, "%d/%d", date.month(), date.day()); ! } } } ! strcpy(plantBuf, "???"); ! if(mat->GetDate(kExpPlantOutDate, date)) { ! sprintf(plantBuf, "%d/%d", date.month(), date.day()); ! } ! else ! { ! instance = ref->LatestInstanceData(kActualPlantOutDate); ! if(instance != NULL) { ! if(instance->GetActualPlantOut(date)) ! { ! sprintf(plantBuf, "%d/%d", date.month(), date.day()); ! } } } ! String objComments; ! ! comments = "(none)"; ! instance = ref->LatestInstanceData(kUserComments); ! if(instance != NULL) ! instance->GetUserComments(objComments); ! else ! objComments = L""; ! comments = objComments.c_str(); ! ! AttributeDictionary::GetAttributeValueStr(mat, kShadeTolerance, kMetricUnits, shadeObj); ! shadePtr = shadeObj.c_str(); ! instance = ref->LatestInstanceData(kSowLocation); ! if(instance != NULL) ! { ! String str; ! ! AttributeDictionary::GetIndexedEnumValue(kSowLocation, instance->GetSowLocation(), str); ! sowObj = str.c_str(); ! } ! else ! sowObj = L""; ! sowPtr = sowObj.c_str(); ! /*****/ ! ref->GetPlotID(plotID); ! numPlots = layout->NumPlots(); ! plotNameObj = L""; ! for(index = 0; index < numPlots; index++) { ! plot = layout->GetIndexedPlot(index); ! plot->getPlotID(testPlotID); ! if(plotID == testPlotID) ! { ! plot->GetName(plotNameObj); ! break; ! } } ! FormatBuffer(output, format.vfmt, namePtr, seedBuf, shadePtr, comments, plantBuf, sowPtr, plotNameObj.c_str()); ! ! cell = new RGReportHypertextCell(this, _ht, cellSize, output); ! cell->SetUseBorder(format.hasBorder); ! _cells.push_back(cell); ! } } } Index: PlantLabelReport.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Reports/PlantLabelReport.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** PlantLabelReport.h 13 Jan 2006 23:26:10 -0000 1.4 --- PlantLabelReport.h 15 Nov 2006 03:59:56 -0000 1.4.2.1 *************** *** 75,79 **** long _currentItem; XGSDynArray<LabelTemplate_t> _templates; ! materialRefArray_t _list; }; --- 75,79 ---- long _currentItem; XGSDynArray<LabelTemplate_t> _templates; ! pathELementArray_t _list; }; |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 03:59:08
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6112 Modified Files: Tag: Release_branch_v1 Layer.cpp Layer.h Layout.h Log Message: Add PurchaseReport Index: Layout.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Layout.h,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -d -r1.18 -r1.18.2.1 *** Layout.h 18 Sep 2005 12:43:49 -0000 1.18 --- Layout.h 15 Nov 2006 03:59:06 -0000 1.18.2.1 *************** *** 41,44 **** --- 41,45 ---- class Material; class MaterialRef; + class PathElement; class RGXMLWriter; *************** *** 55,59 **** typedef XGSDynArray<Material*> materialArray_t; ! typedef XGSDynArray<MaterialRef*> materialRefArray_t; typedef void (*elementCB_t)(Element *element, void *ref); --- 56,60 ---- typedef XGSDynArray<Material*> materialArray_t; ! typedef XGSDynArray<PathElement*> pathELementArray_t; typedef void (*elementCB_t)(Element *element, void *ref); Index: Layer.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Layer.cpp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -C2 -d -r1.21 -r1.21.2.1 *** Layer.cpp 2 Feb 2006 01:23:26 -0000 1.21 --- Layer.cpp 15 Nov 2006 03:59:06 -0000 1.21.2.1 *************** *** 59,63 **** } ! void Layer::AddToMaterialRefArray(materialRefArray_t* list, XGUUID& uid) { PRECONDITION(this != NULL); --- 59,63 ---- } ! void Layer::AddToPathELementArray(pathELementArray_t* list, XGUUID& uid) { PRECONDITION(this != NULL); Index: Layer.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Layer.h,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** Layer.h 13 Jan 2006 22:58:47 -0000 1.17 --- Layer.h 15 Nov 2006 03:59:06 -0000 1.17.2.1 *************** *** 94,98 **** void SetDimensions(planLength_t width, planLength_t height); void AddToMaterialArray(materialArray_t* list, XGUUID& uid); ! void AddToMaterialRefArray(materialRefArray_t* list, XGUUID& uid); void CopyTo(Layer *toLayer); void ExtractMaterialReferences(ClientDocument *doc); --- 94,98 ---- void SetDimensions(planLength_t width, planLength_t height); void AddToMaterialArray(materialArray_t* list, XGUUID& uid); ! void AddToPathELementArray(pathELementArray_t* list, XGUUID& uid); void CopyTo(Layer *toLayer); void ExtractMaterialReferences(ClientDocument *doc); |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 03:56:34
|
Update of /cvsroot/igarden/Garden/source/Reports In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5216 Added Files: Tag: Release_branch_v1 PurchaseReport.h PurchaseReport.cpp Log Message: Add PurchaseReport --- NEW FILE: PurchaseReport.cpp --- //*********************************************************************************************** // // The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at // http://www.mozilla.org/MPL/ // // Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF // ANY KIND, either express or implied. See the License for the specific language governing rights and // limitations under the License. // // The Original Code is iGarden xxxxxx. // // The Initial Developer of the Original Code is Redstart Software. // Portions created by Initial Developer are Copyright (C) 2004 Redstart Software. All Rights Reserved. // // Contributor(s): // Jeffrey Bedell(je...@re...) // /// 2) Plant Labels // Options: 3 popups: // Included Plots // Included Vendors // Sort By // 1 checkbox // Include pictures // No options interactions // Cell: full page across // Contains: // Canonical name (Common Name) #include "Persist.h" #include "PurchaseReport.h" #include "RGHypertextView.h" #include "RGReportHypertextCell.h" #include "ClientDocument.h" #include "Material.h" #include "MaterialRef.h" #include "InstanceData.h" #include "Layout.h" #include "Layer.h" #include "AttributeDictionary.h" #include "SourceMaterialFile.h" #include "GardenPlot.h" #include "Path.h" #include "DocumentTags.h" #include <XGCheckButton.h> #include <XGPopControl.h> #include <XGStaticText.h> #include <XGCommandButton.h> #include <XErrorDialogs.h> const short kPurchasePane = 191; const short kIncludedPlots = 10; const short kIncludedVendors = 11; const short kSortBy = 12; const short kFormat = 13; using yaaf::XGCheckButton; using yaaf::XGPopControl; using namespace std; class StringSet { map<String, bool> _strings; public: void AddString(const String& str); void AddStringSet(StringSet& str); void GetStringRepresentation(String& buf); }; class SiftedData { public: String _name; StringSet _suppliers; StringSet _locations; uint32 _count; double _volume; measureUnits_t _units; SiftedData(); SiftedData(String& name, StringSet &suppliers, String& locations, long count); SiftedData(String& name, StringSet &suppliers, String& locations, double volume, measureUnits_t units); void AddSuppliers(StringSet &suppliers); void AddPlot(String &plot); bool operator<(const SiftedData s1) const; }; typedef map<SiftedData, SiftedData> siftedList_t; #pragma mark *** PurchaseReport *** // --------------------------------------------------------------------------- /// PurchaseReport // PurchaseReport::PurchaseReport(ClientDocument *document) : RGHyperReport(document) { _AllPlots = true; _AllVendors = true; _showPictures = false; } // --------------------------------------------------------------------------- /// ~PurchaseReport // PurchaseReport::~PurchaseReport() { } const long kPlotMenuOffset = 2; const long kVendorMenuOffset = 2; // --------------------------------------------------------------------------- /// Setup // void PurchaseReport::Setup(RGDialog *dialog, XGDialog *dlog) { XGPopControl *pop; long count, n, numLayers; XGCheckButton *btn; XGUUID nilID; GardenPlot *plot; Layout *layout; Layer *layer; SourceMaterialFile *sourceDB = SourceMaterialFile::GetSourceDatabase(); layout = _doc->GetLayout(); //*** pop = dynamic_cast<XGPopControl*>(dlog->FindViewByID(kIncludedPlots)); AssertValidView(pop); pop->DeleteAll(); pop->Insert(0, "All Plots"); pop->Insert(1, "-"); count = layout->NumPlots(); for(n = 0; n < count; n++) { String plotName; plot = layout->GetIndexedPlot(n); MyAssert(plot != 0); plot->GetName(plotName); pop->Insert(n+kPlotMenuOffset, plotName.c_str()); } pop = dynamic_cast<XGPopControl*>(dlog->FindViewByID(kIncludedVendors)); AssertValidView(pop); pop->DeleteAll(); pop->Insert(0, "All Vendors"); pop->Insert(1, "-"); count = sourceDB->NumVendors(inDocumentOnly, showHiddenItems); for(n = 0; n < count; n++) { InfoSupplier *vendor; String vendorName; vendor = sourceDB->GetIndexedVendor(n, inDocumentOnly, showHiddenItems); MyAssert(vendor != 0); pop->Insert(n+kPlotMenuOffset, vendor->GetCompanyName().c_str()); } pop = dynamic_cast<XGPopControl*>(dlog->FindViewByID(kSortBy)); AssertValidView(pop); pop->DeleteAll(); pop->Insert(0, "Name"); pop->Insert(1, "Vendor"); pop->Insert(2, "Garden Plot"); pop->EnableView(); RebuildTemplates(); pop = dynamic_cast<XGPopControl*>(dlog->FindViewByID(kFormat)); count = _templates.Length(); for(n = 0; n < count; n++) { pop->Insert(n, _templates[n].name->c_str()); } _currentItem = 0; // Include unused? // layout->GetUnusedLayer()->AddToMaterialRefArray(&_list, nilID); count = layout->NumPlots(); for(n = 0; n < count; n++) { plot = layout->GetIndexedPlot(n); MyAssert(plot != 0); numLayers = plot->GetNumLayers(); for(n = 0; n < numLayers; n++) { layer = plot->GetIndexedLayer(n); if(_AllPlots) layer->AddToPathELementArray(&_list, nilID); else layer->AddToPathELementArray(&_list, _plotID); } } XGCommandButton *printBtn = dynamic_cast<XGCommandButton*>(dlog->FindViewByID(10001)); MyAssert(printBtn != NULL); if(AllowPrint()) printBtn->EnableView(); else printBtn->DisableView(); } // --------------------------------------------------------------------------- /// OKClicked // void PurchaseReport::OKClicked(RGDialog *dialog, XGDialog *dlog) { } // --------------------------------------------------------------------------- /// ControlClick // void PurchaseReport::ControlClick(RGDialog *dialog, XGDialog *dlog, long viewID) { } // --------------------------------------------------------------------------- /// PopupValue // void PurchaseReport::PopupValue(RGDialog *dialog, XGDialog *dlog, long viewID) { XGPopControl *btn; long val; btn = dynamic_cast<XGPopControl*>(dlog->FindViewByID(viewID)); AssertValidView(btn); val = btn->GetValue(); switch(viewID) { case kIncludedPlots: if(val == 0) _AllPlots = true; else { GardenPlot *plot; Layout *layout; layout = _doc->GetLayout(); _AllPlots = false; plot = layout->GetIndexedPlot(val-kPlotMenuOffset); MyAssert(plot != NULL); plot->getPlotID(_plotID); } break; case kIncludedVendors: if(val == 0) _AllVendors = true; else { InfoSupplier *supplier; _AllVendors = false; supplier = SourceMaterialFile::GetSourceDatabase()->GetIndexedVendor(val-kVendorMenuOffset, inDocumentOnly, showHiddenItems); MyAssert(supplier != NULL); supplier->GetSupplierID(_vendorID); } break; case kFormat: _currentItem = val; break; case kSortBy: break; } XGPopControl *sortCtl = dynamic_cast<XGPopControl*>(dlog->FindViewByID(kSortBy)); AssertValidView(sortCtl); if(_AllPlots && _AllVendors) sortCtl->EnableView(); else { sortCtl->SetValue(_AllPlots ? 1 : 0); sortCtl->DisableView(); } XGCommandButton *printBtn = dynamic_cast<XGCommandButton*>(dlog->FindViewByID(10001)); MyAssert(printBtn != NULL); if(AllowPrint()) printBtn->EnableView(); else printBtn->DisableView(); } // --------------------------------------------------------------------------- /// HeaderHeight // UInt32 PurchaseReport::HeaderHeight(XGDraw &draw) { #pragma unused(draw) return 30; } // --------------------------------------------------------------------------- /// PrintHeader // void PurchaseReport::PrintHeader(XGDraw &draw, UInt32 page) { #pragma unused(draw, page) } // --------------------------------------------------------------------------- /// ReportName // String PurchaseReport::ReportName() { return String("Shopping List"); } // --------------------------------------------------------------------------- /// BodyFontID // long PurchaseReport::BodyFontID() { return 140; } // --------------------------------------------------------------------------- /// AllowPrint // bool PurchaseReport::AllowPrint() { bool found = false; UInt32 n, numRows; Material *mat; MaterialRef *ref; InstanceData *instance; XGUUID plotID; numRows = _list.Length(); for(n = 0; n < numRows && !found; n++) { ref = dynamic_cast<MaterialRef*>(_list[n]); if(ref != NULL) { mat = ref->GetMaterial(ifMissingNULL); if(mat != NULL) { if(_AllPlots) found = true; else { instance = ref->LatestInstanceData(kInstanceSupplierIDs); if(instance != NULL) { uint32 supplier, supplierCount; XGUUID testID; supplierCount = instance->GetNumSuppliers(); for(supplier = 0; supplier < supplierCount && !found; supplier++) { instance->GetIndexedSupplier(supplier, testID); if(testID == _vendorID) found = true; } if(!found) { ref->GetPlotID(plotID); if(_plotID == plotID) found = true; } } else found = true; } } } } return found; } // --------------------------------------------------------------------------- /// ComputeReport // void PurchaseReport::ComputeReport() { RGReportHypertextCell *cell; Point cellSize; UInt32 n, numRows, index, numPlots, count, numLayers; Material *mat; String text; GardenDate date; char output[1024]; const char *comments, *namePtr; ShopTemplate_t format; Layout *layout; MaterialRef *ref; GardenPlot *plot; XGUUID nilID, plotID; siftedList_t siftedList; Path *path; StringSet supplierSet; String plotName, name; InstanceData *instance; SourceMaterialFile *sourceDB = SourceMaterialFile::GetSourceDatabase(); XGUUID testPlotID; PathElement *elem; bool show; format = _templates[_currentItem]; cellSize = InchesToPixels(8, 1); layout = _doc->GetLayout(); text = String(""); numRows = _list.Length(); for(n = 0; n < numRows; n++) { elem = _list[n]; elem->GetPlot()->getPlotID(plotID); if(_plotID != plotID && !_AllPlots) continue; ref = dynamic_cast<MaterialRef*>(elem); if(ref != NULL) { mat = ref->GetMaterial(ifMissingNULL); if(mat != NULL) { name = mat->GetDisplayName(kUsePreferencesSetting); // printf("Item [%ld] = '%s'\n", n, name.c_str()); instance = ref->LatestInstanceData(kInstanceSupplierIDs); if(instance != NULL) { uint32 supplierIndex, supplierCount; XGUUID testID; if(_AllVendors) { supplierCount = instance->GetNumSuppliers(); for(supplierIndex = 0; supplierIndex < supplierCount; supplierIndex++) { String companyName; InfoSupplier *supplier; instance->GetIndexedSupplier(supplierIndex, testID); supplier = sourceDB->LookupSupplier(testID); companyName = supplier->GetCompanyName(); supplierSet.AddString(companyName); } show = true; } else { show = false; supplierCount = instance->GetNumSuppliers(); for(supplierIndex = 0; supplierIndex < supplierCount; supplierIndex++) { InfoSupplier *supplier; instance->GetIndexedSupplier(supplierIndex, testID); if(testID == _vendorID) { String str; supplier = sourceDB->LookupSupplier(testID); str = supplier->GetCompanyName(); supplierSet.AddString(str); show = true; break; } } } } ref->GetPlotID(plotID); numPlots = layout->NumPlots(); plotName = L""; for(index = 0; index < numPlots; index++) { plot = layout->GetIndexedPlot(index); plot->getPlotID(testPlotID); if(plotID == testPlotID) { plot->GetName(plotName); break; } } if(show) { siftedList_t::iterator cur; SiftedData data(name, supplierSet, plotName, ref->GetNumItems()); cur = siftedList.find(data); if(cur == siftedList.end()) { siftedList[data] = data; // printf("Setting value for '%s' to %ld\n", namePtr, data.count); } else { (*cur).second._count += ref->GetNumItems(); (*cur).second.AddSuppliers(supplierSet); (*cur).second.AddPlot(plotName); // printf("Changing value for '%s' to %ld\n", namePtr, (*cur).second.count); } } } } path = elem->GetPathIfPresent(); if(path != NULL) { mat = path->GetBackdrop(); if(mat != 0) { if(mat->GetMaterialType() == kMaterialTypeMulch) { if(path->IsPathFillPossible()) { measureUnits_t units = (measureUnits_t)_doc->GetPrefsDB()->GetInt32Pref(kUnitsPref); double cubicMM, volume; StringSet mulchSuppliers; cubicMM = path->ComputeArea() * path->GetBackdropDepth(); // mulch sold as cubic yard in US, cubic metre in metric. if(units == kEnglishUnits) { volume = cubicMM / 764554857.984; } else { volume = cubicMM / 1000000000; } siftedList_t::iterator cur; name = mat->GetDisplayName(kUsePreferencesSetting); SiftedData data(name, mulchSuppliers, plotName, volume, units); cur = siftedList.find(data); if(cur == siftedList.end()) { siftedList[data] = data; // printf("Setting value for '%s' to %ld\n", namePtr, data.count); } else { (*cur).second._volume += volume; (*cur).second.AddPlot(plotName); // printf("Changing value for '%s' to %ld\n", namePtr, (*cur).second.count); } } } } } } siftedList_t::iterator iter; for(iter = siftedList.begin(); iter != siftedList.end(); iter++) { String supplierNames, plotNames; char numBuf[64]; namePtr = (*iter).first._name.c_str(); (*iter).second._suppliers.GetStringRepresentation(supplierNames); (*iter).second._locations.GetStringRepresentation(plotNames); if((*iter).second._count == 0) sprintf(numBuf, "%6.2lf %s", (*iter).second._volume, (*iter).second._units == kMetricUnits ? "Cubic Meters" : "Cubic Yards"); else sprintf(numBuf, "%ld", (*iter).second._count); FormatBuffer(output, format.vfmt, namePtr, supplierNames.c_str(), plotNames.c_str(), numBuf, ""); cell = new RGReportHypertextCell(this, _ht, cellSize, output); cell->SetUseBorder(true); _cells.push_back(cell); } } // --------------------------------------------------------------------------- /// FormatBuffer // void PurchaseReport::FormatBuffer(char *out, const char *format, const char *name, const char *vendors, const char *where, const char *countStr, const char *picture) { yformat(out, format, name, vendors, where, countStr, picture); } // --------------------------------------------------------------------------- /// CreatePurchaseReport // void PurchaseReport::CreatePurchaseReport(ClientDocument *doc) { PurchaseReport *report; report = new PurchaseReport(doc); report->Run(kPurchasePane); } // --------------------------------------------------------------------------- /// IsMyFile // bool PurchaseReport::IsMyFile(char *nameBuf) { return (CIstrncmp(nameBuf, "ShopList", 5) == 0); } // --------------------------------------------------------------------------- /// RebuildOneTemplate // void PurchaseReport::RebuildOneTemplate(XGFile &file) { long fileLen; char *fileData; ShopTemplate_t templ; String str; fileLen = file.GetEOF(); if(fileLen < 100000) { fileData = new char[fileLen+1]; fileData[fileLen] = '\0'; file.Read(fileLen, fileData); ExtractTitle(fileData, str); templ.name = new String(str); /****/ ExtractTag(fileData, "Border", str); templ.hasBorder = (CIstrcmp(str.c_str(), "true") == 0); /****/ ExtractTag(fileData, "Picture", str); templ.hasBorder = (CIstrcmp(str.c_str(), "true") == 0); /****/ templ.vfmt = fileData; _templates.push_back(templ); } } // --------------------------------------------------------------------------- /// DeleteTemplates // void PurchaseReport::DeleteTemplates() { long n, count; count = _templates.Length(); for(n = 0; n < count; n++) { delete _templates[n].name; delete [] _templates[n].vfmt; } _templates.DeleteAll(); } #pragma mark *** StringSet (PRIVATE) *** // --------------------------------------------------------------------------- /// StringSet::AddString // void StringSet::AddString(const String& str) { _strings[str] = true; } // --------------------------------------------------------------------------- /// StringSet::AddStringSet // void StringSet::AddStringSet(StringSet& str) { map<String, bool>::iterator iter; for(iter = str._strings.begin(); iter != str._strings.end(); iter++) { _strings[(*iter).first] = true; } } // --------------------------------------------------------------------------- /// StringSet::GetStringRepresentation // void StringSet::GetStringRepresentation(String& buf) { bool doComma = false; map<String, bool>::iterator iter; String str; for(iter = _strings.begin(); iter != _strings.end(); iter++) { str = (*iter).first; if(doComma) buf += L", "; buf += str; doComma = true; } } #pragma mark *** SiftedData (PRIVATE) *** // --------------------------------------------------------------------------- /// SiftedData::SiftedData // SiftedData::SiftedData() { _count = 0; _volume = 0.0; _units = kMetricUnits; } // --------------------------------------------------------------------------- /// SiftedData::SiftedData // SiftedData::SiftedData(String& name, StringSet &suppliers, String& locations, double volume, measureUnits_t units) { _name = name; AddSuppliers(suppliers); AddPlot(locations); _count = 0; _volume = volume; _units = units; } // --------------------------------------------------------------------------- /// SiftedData::SiftedData // SiftedData::SiftedData(String& name, StringSet &suppliers, String& locations, long count) { _name = name; AddSuppliers(suppliers); AddPlot(locations); _count = count; _volume = 0.0; _units = kMetricUnits; } // --------------------------------------------------------------------------- /// SiftedData::AddSuppliers // void SiftedData::AddSuppliers(StringSet &suppliers) { _suppliers.AddStringSet(suppliers); } // --------------------------------------------------------------------------- /// SiftedData::AddPlot // void SiftedData::AddPlot(String &plot) { _locations.AddString(plot); } // --------------------------------------------------------------------------- /// SiftedData::operator< // bool SiftedData::operator<(const SiftedData s1) const { return _name < s1._name; } --- NEW FILE: PurchaseReport.h --- //*********************************************************************************************** // // The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at // http://www.mozilla.org/MPL/ // // Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF // ANY KIND, either express or implied. See the License for the specific language governing rights and // limitations under the License. // // The Original Code is iGarden xxxxxx. // // The Initial Developer of the Original Code is Redstart Software. // Portions created by Initial Developer are Copyright (C) 2004 Redstart Software. All Rights Reserved. // // Contributor(s): // Jeffrey Bedell(je...@re...) // #ifndef PURCHASE_REPORT_H #define PURCHASE_REPORT_H #include "RGHyperReport.h" #include "Layout.h" #include <XGSDynArray.h> #include <map> #include "RGString.h" using yaaf::XGSDynArray; typedef struct { String *name; bool hasBorder; bool hasPicture; char *vfmt; } ShopTemplate_t; class PurchaseReport : public RGHyperReport { public: PurchaseReport(ClientDocument *document); virtual ~PurchaseReport(); virtual void Setup(RGDialog *dialog, XGDialog *dlog); virtual void OKClicked(RGDialog *dialog, XGDialog *dlog); virtual void ControlClick(RGDialog *dialog, XGDialog *dlog, long viewID); virtual void PopupValue(RGDialog *dialog, XGDialog *dlog, long viewID); virtual UInt32 HeaderHeight(XGDraw &draw); virtual void PrintHeader(XGDraw &draw, UInt32 page); // The report name is displayed at the top of the dialogs, and by default // Centered in the header virtual String ReportName(); // Compute all of the cells, and fill in the array virtual void ComputeReport(); static void CreatePurchaseReport(ClientDocument *doc); virtual long BodyFontID(); virtual bool IsMyFile(char *nameBuf); virtual void RebuildOneTemplate(XGFile &file); virtual void DeleteTemplates(); private: void FormatBuffer(char *out, const char *format, const char *name, const char *vendors, const char *where, const char *countStr, const char *picture); bool AllowPrint(); bool _AllPlots; bool _AllVendors; XGUUID _plotID; XGUUID _vendorID; bool _showPictures; long _currentItem; XGSDynArray<ShopTemplate_t> _templates; pathELementArray_t _list; }; #endif // PURCHASE_REPORT_H |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 03:55:59
|
Update of /cvsroot/igarden/Garden/source/resources In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4711 Modified Files: Tag: Release_branch_v1 Garden.cin Garden.r Garden2.rsrc Log Message: Add PurchaseReport Index: Garden.r =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/Garden.r,v retrieving revision 1.61 retrieving revision 1.61.2.1 diff -C2 -d -r1.61 -r1.61.2.1 *** Garden.r 18 Jul 2006 02:06:17 -0000 1.61 --- Garden.r 15 Nov 2006 03:55:52 -0000 1.61.2.1 *************** *** 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" /* ........ */ $"003A0000000000... [truncated message content] |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 03:54:58
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4320 Modified Files: Tag: Release_branch_v1 BSPNode.cpp BSPNode.h Log Message: Add PurchaseReport Index: BSPNode.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/BSPNode.h,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** BSPNode.h 20 Sep 2005 23:23:17 -0000 1.15 --- BSPNode.h 15 Nov 2006 03:54:56 -0000 1.15.2.1 *************** *** 39,43 **** public: void AddToMaterialArray(materialArray_t *list, XGUUID& uid); ! void AddToReferenceArray(materialRefArray_t* list, XGUUID& uid); // methods BSPNode(planRectangle_t bounds, bool splitHoriz = true, BSPNode* parent = NULL); --- 39,43 ---- public: void AddToMaterialArray(materialArray_t *list, XGUUID& uid); ! void AddToReferenceArray(pathELementArray_t* list, XGUUID& uid); // methods BSPNode(planRectangle_t bounds, bool splitHoriz = true, BSPNode* parent = NULL); Index: BSPNode.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/BSPNode.cpp,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.2 diff -C2 -d -r1.28.2.1 -r1.28.2.2 *** BSPNode.cpp 1 Nov 2006 03:09:47 -0000 1.28.2.1 --- BSPNode.cpp 15 Nov 2006 03:54:56 -0000 1.28.2.2 *************** *** 27,30 **** --- 27,31 ---- #include "Material.h" #include "Path.h" + #include "GardenPlot.h" #define MAX_NODE_ELEMENTS 50 *************** *** 1039,1061 **** // --------------------------------------------------------------------------- // ! void BSPNode::AddToReferenceArray(materialRefArray_t* list, XGUUID& uid) { ! Element *elem; MaterialRef *ref; Int32 n, count; materialID_t myID, testID; XGUUID plotID, nilID; count = _elements.Length(); for(n = 0; n < count; n++) { ! elem = _elements[n]; ! ref = dynamic_cast<MaterialRef*>(elem); ! if(ref != NULL) { ! ref->GetPlotID(plotID); ! if(plotID == uid || uid == nilID) { ! list->push_back(ref); } } --- 1040,1066 ---- // --------------------------------------------------------------------------- // ! void BSPNode::AddToReferenceArray(pathELementArray_t* list, XGUUID& uid) { ! PathElement *elem; MaterialRef *ref; Int32 n, count; materialID_t myID, testID; XGUUID plotID, nilID; + GardenPlot *plot; count = _elements.Length(); for(n = 0; n < count; n++) { ! elem = dynamic_cast<PathElement*>(_elements[n]); ! if(elem != NULL) { ! plot = elem->GetPlot(); ! if(plot != NULL) { ! plot->getPlotID(plotID); ! if(plotID == uid || uid == nilID) ! { ! list->push_back(elem); ! } } } |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 03:35:53
|
Update of /cvsroot/igarden/Garden/source/resources/2DSymbols In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29647 Added Files: Tag: Release_branch_v1 Sundial.svg KidneyPool.svg Birdbath.svg Log Message: Initial checkin --- NEW FILE: Birdbath.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg2" rgminx="2ft" rgminy="2ft" rgmaxx="2ft" rgmaxy="2ft" startxsize="2ft" startysize="2ft" sodipodi:version="0.32" inkscape:version="0.44.1" sodipodi:docbase="/Volumes/Bedell" sodipodi:docname="Birdbath.svg"> <defs id="defs4" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="375" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="823" inkscape:window-height="577" inkscape:window-x="20" inkscape:window-y="42" /> <metadata id="metadata7"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> <path sodipodi:type="arc" style="fill:#90806d;fill-opacity:1;stroke:#5d5d5d;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path1872" sodipodi:cx="340" sodipodi:cy="443.79074" sodipodi:rx="162.85715" sodipodi:ry="157.14285" d="M 502.85715 443.79074 A 162.85715 157.14285 0 1 1 177.14285,443.79074 A 162.85715 157.14285 0 1 1 502.85715 443.79074 z" /> <path d="M 502.85715 443.79074 A 162.85715 157.14285 0 1 1 177.14285,443.79074 A 162.85715 157.14285 0 1 1 502.85715 443.79074 z" sodipodi:ry="157.14285" sodipodi:rx="162.85715" sodipodi:cy="443.79074" sodipodi:cx="340" id="path3733" style="fill:#c9ffff;fill-opacity:1;stroke:#5d5d5d;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc" transform="matrix(0.94525,0,0,0.94525,18.615,24.29754)" /> </g> </svg> --- NEW FILE: Sundial.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg2" rgminx="12in" rgminy="12in" rgmaxx="12in" rgmaxy="12in" startxsize="12in" startysize="12in" sodipodi:version="0.32" inkscape:version="0.44.1" sodipodi:docbase="/Volumes/Bedell" sodipodi:docname="Sundial.svg"> <defs id="defs4" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="375" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="823" inkscape:window-height="577" inkscape:window-x="20" inkscape:window-y="42" /> <metadata id="metadata7"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> <path d="M 431.42857 336.64789 A 118.57143 121.42857 0 1 1 194.28572,336.64789 A 118.57143 121.42857 0 1 1 431.42857 336.64789 z" sodipodi:ry="121.42857" sodipodi:rx="118.57143" sodipodi:cy="336.64789" sodipodi:cx="312.85715" id="path4556" style="fill:#ffc500;fill-opacity:1;stroke:#5d5d5d;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc" transform="matrix(1.0609,0,0,1.0609,-19.053,-20.50186)" /> <path sodipodi:type="arc" style="fill:#9ad893;fill-opacity:1;stroke:#5d5d5d;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path1872" sodipodi:cx="312.85715" sodipodi:cy="336.64789" sodipodi:rx="118.57143" sodipodi:ry="121.42857" d="M 431.42857 336.64789 A 118.57143 121.42857 0 1 1 194.28572,336.64789 A 118.57143 121.42857 0 1 1 431.42857 336.64789 z" transform="matrix(1.03,0,0,1.03,-9.385714,-10.09944)" /> <rect style="fill:#ffc500;fill-opacity:1;stroke:#5d5d5d;stroke-width:1.64752924;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2760" width="14.138185" height="174.13818" x="305.78809" y="215.29308" /> </g> </svg> --- NEW FILE: KidneyPool.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg4638" rgminx="3ft" rgminy="2ft" rgmaxx="5ft" rgmaxy="3ft" startxsize="3ft" startysize="2ft" sodipodi:version="0.32" inkscape:version="0.44.1" sodipodi:docbase="/Volumes/Bedell" sodipodi:docname="KidneyPool.svg"> <defs id="defs4640" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="375" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="823" inkscape:window-height="577" inkscape:window-x="40" inkscape:window-y="62" /> <metadata id="metadata4643"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="GROWXY" inkscape:groupmode="layer" id="layer1"> <path sodipodi:nodetypes="csssc" id="path4657" d="M 632.18445,525.22355 C 491.18445,615.99154 507.96045,516.22354 369.68444,516.22354 C 231.40845,516.22354 197.18446,612.99154 122.18446,531.22354 C 62.857689,466.54313 237.40846,306.22354 375.68445,306.22354 C 513.96045,306.22354 686.18445,389.45554 632.18445,525.22355 z " style="fill:#040404;fill-opacity:1;stroke:#5d5d5d;stroke-width:1.57500005;stroke-miterlimit:4;stroke-opacity:1" /> <path style="fill:#c9ffff;fill-opacity:1;stroke:#5d5d5d;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1" d="M 622.85715,520.9336 C 491.42857,607.37931 504.54857,509.50502 372.85714,509.50502 C 241.16572,509.50502 197.14287,607.37931 125.7143,529.50502 C 69.212614,467.90463 244.02287,312.36217 375.71429,312.36217 C 507.40572,312.36217 694.28571,411.63074 622.85715,520.9336 z " id="path4654" sodipodi:nodetypes="csssc" /> </g> </svg> |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-11 15:05:16
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26242 Modified Files: Tag: Release_branch_v1 RGGLSVGDraw.cpp Log Message: Get transforms and tessellated area fills working. Index: RGGLSVGDraw.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLSVGDraw.cpp,v retrieving revision 1.26.2.4 retrieving revision 1.26.2.5 diff -C2 -d -r1.26.2.4 -r1.26.2.5 *** RGGLSVGDraw.cpp 5 Nov 2006 03:42:08 -0000 1.26.2.4 --- RGGLSVGDraw.cpp 11 Nov 2006 15:05:14 -0000 1.26.2.5 *************** *** 49,52 **** --- 49,56 ---- typedef struct { + bool doTranslate; + bool doScale; + bool doRotate; + //*** double translateX; double translateY; *************** [...1489 lines suppressed...] ! resultX = x; ! resultY = y; #endif + } + else + { + tx = xfm.translateX; + if(xfm.scaleX >= 0) + resultX = x + tx; + else + resultX = tx - x; + + ty = xfm.translateY; + if(xfm.scaleY >= 0) + resultY = y + ty; + else + resultY = ty - y; + } + } + |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-11 15:03:27
|
Update of /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25459 Modified Files: Tag: Release_branch_v1 project.pbxproj Log Message: Add more non-plant objects (including test pattern) Index: project.pbxproj =================================================================== RCS file: /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj/project.pbxproj,v retrieving revision 1.58.2.3 retrieving revision 1.58.2.4 diff -C2 -d -r1.58.2.3 -r1.58.2.4 *** project.pbxproj 5 Nov 2006 02:31:35 -0000 1.58.2.3 --- project.pbxproj 11 Nov 2006 15:03:25 -0000 1.58.2.4 *************** *** 464,467 **** --- 464,469 ---- 49C1C0F306E3FB6E0021D1F5 /* LayerSelectForm.h in Headers */ = {isa = PBXBuildFile; fileRef = 49C1C0F106E3FB6E0021D1F5 /* LayerSelectForm.h */; }; 49C1C0F406E3FB6E0021D1F5 /* LayerSelectForm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49C1C0F206E3FB6E0021D1F5 /* LayerSelectForm.cpp */; }; + 49C3C91D0AFE6BCC0022168F /* TestPattern1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49C3C91B0AFE6BCC0022168F /* TestPattern1.svg */; }; + 49C3C91E0AFE6BCC0022168F /* TestPattern2.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49C3C91C0AFE6BCC0022168F /* TestPattern2.svg */; }; 49CA0AAE08B0176100FBA1F9 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49081028070CDE910044EEA3 /* OpenGL.framework */; }; 49CA0AAF08B0176200FBA1F9 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49080FFC070CDE170044EEA3 /* AGL.framework */; }; *************** *** 1118,1121 **** --- 1120,1125 ---- 49C1C0F106E3FB6E0021D1F5 /* LayerSelectForm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = LayerSelectForm.h; path = PlanTool/LayerSelectForm.h; sourceTree = "<group>"; }; 49C1C0F206E3FB6E0021D1F5 /* LayerSelectForm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = LayerSelectForm.cpp; path = PlanTool/LayerSelectForm.cpp; sourceTree = "<group>"; }; + 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; }; 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; }; *************** *** 1492,1495 **** --- 1496,1501 ---- isa = PBXGroup; children = ( + 49C3C91B0AFE6BCC0022168F /* TestPattern1.svg */, + 49C3C91C0AFE6BCC0022168F /* TestPattern2.svg */, 49FE0FF80AFD62B900DC5501 /* Grate.svg */, 49FE0FF90AFD62B900DC5501 /* Rock1.svg */, *************** *** 2468,2471 **** --- 2474,2479 ---- 49FE0FFC0AFD62B900DC5501 /* Rock1.svg in Resources */, 49FE0FFD0AFD62B900DC5501 /* Rock2.svg in Resources */, + 49C3C91D0AFE6BCC0022168F /* TestPattern1.svg in Resources */, + 49C3C91E0AFE6BCC0022168F /* TestPattern2.svg in Resources */, ); runOnlyForDeploymentPostprocessing = 0; |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-11 15:03:07
|
Update of /cvsroot/igarden/Garden/source/resources In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25116 Modified Files: Tag: Release_branch_v1 SourceMaterialsStart.xml Log Message: Add more non-plant objects (including test pattern) Index: SourceMaterialsStart.xml =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/SourceMaterialsStart.xml,v retrieving revision 1.24.2.4 retrieving revision 1.24.2.5 diff -C2 -d -r1.24.2.4 -r1.24.2.5 *** SourceMaterialsStart.xml 5 Nov 2006 02:35:17 -0000 1.24.2.4 --- SourceMaterialsStart.xml 11 Nov 2006 15:03:05 -0000 1.24.2.5 *************** *** 1288,1291 **** --- 1288,1293 ---- <Material UID="2538CA23-F4A0-482D-BD6D-6091D7C97E7F" CommonName="Rock #1" materialType="Natural" Height="1ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Rock1.svg"/> <Material UID="A6297491-DB7B-491C-95C7-476E4149F657" CommonName="Rock #2" materialType="Natural" Height="1ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Rock2.svg"/> + <Material UID="979C0E6F-E90A-4712-B8A1-BDEA9D314956" CommonName="Test Pattern" materialType="Hardscape" Height="1ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="TestPattern1.svg"/> + <Material UID="3E842083-6358-459B-8813-48F4F1A91498" CommonName="Test Pattern 2" materialType="Hardscape" Height="1ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="TestPattern2.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"/> |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-11 15:01:22
|
Update of /cvsroot/igarden/Garden/source/resources/2DSymbols In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24601 Modified Files: Tag: Release_branch_v1 StoneWall.svg Added Files: Tag: Release_branch_v1 TestPattern2.svg TestPattern1.svg Log Message: Add more non-plant objects (including test pattern) Index: StoneWall.svg =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/2DSymbols/Attic/StoneWall.svg,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** StoneWall.svg 4 Nov 2006 23:04:55 -0000 1.1.2.1 --- StoneWall.svg 11 Nov 2006 15:01:12 -0000 1.1.2.2 *************** *** 19,24 **** startysize="1ft" sodipodi:version="0.32" ! inkscape:version="0.44.1" ! sodipodi:docbase="/Volumes/Bedell" sodipodi:docname="StoneWall.svg"> <defs --- 19,24 ---- startysize="1ft" sodipodi:version="0.32" ! inkscape:version="0.44" ! sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="StoneWall.svg"> <defs *************** *** 35,39 **** inkscape:pageshadow="2" inkscape:zoom="1.8473111" ! inkscape:cx="375" inkscape:cy="945.99418" inkscape:document-units="px" --- 35,39 ---- inkscape:pageshadow="2" inkscape:zoom="1.8473111" ! inkscape:cx="289.25443" inkscape:cy="945.99418" inkscape:document-units="px" *************** *** 60,78 **** <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.03454173px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 74.55822,54.033475 C 62.788684,48.643856 63.732922,68.765414 60.286559,71.354069 C 49.396882,79.533597 60.822628,84.078374 73.131054,88.674665 C 84.80653,93.034594 66.513867,114.35336 64.568058,117.98644 C 59.135863,128.12906 60.836334,136.74466 73.399001,135.88894 C 88.422049,134.86565 104.94624,135.30703 120.22753,135.30703 C 132.21915,135.30703 131.64487,127.56826 131.64487,117.98644 C 131.64487,108.86604 137.35352,105.1117 137.35352,95.336432 C 137.35352,90.651339 127.02923,82.097515 125.9362,78.015837 C 123.46336,68.781626 120.04578,63.898865 111.66454,58.030534 C 107.00265,54.766406 93.858782,55.714703 87.402715,52.70112 C 84.99634,51.577867 75.420671,53.872443 74.55822,54.033475 z " id="path1876" sodipodi:nodetypes="cssssssssssc" /> <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.11652792px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 147.98463,81.723979 C 141.6042,77.730539 139.64136,98.523646 138.67349,103.36986 C 137.06571,111.42017 134.03022,118.41707 136.01316,128.34587 C 136.68842,131.72697 151.38919,133.80688 153.3053,135.00614 C 162.48505,140.75165 166.90265,125.75573 174.58792,123.35067 C 193.7635,117.34978 191.88006,111.90423 191.88006,90.049318 C 191.88006,77.225943 184.26994,68.131092 181.23874,56.747964 C 178.21659,45.398819 159.73726,57.021929 155.96563,61.743168 C 151.99038,66.719281 148.99264,75.415014 147.98463,81.723979 z " ! id="path1878" /> <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.11341703px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 128.0073,54.815456 C 123.88673,59.97225 128.07125,73.23803 130.66054,79.718905 C 134.54085,89.431145 143.73234,77.276167 145.25332,74.738215 C 150.38754,66.171071 153.17312,62.249044 145.25332,54.815456 C 138.84257,48.798274 134.25157,50.908176 128.0073,54.815456 z " id="path1880" /> <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.23876262px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 186.77535,55.244386 C 180.22731,48.760357 193.41205,75.116261 195.39722,85.600316 C 197.07156,94.442854 198.75497,100.12053 196.8342,110.2645 C 193.87234,125.90667 214.01566,123.21512 218.38889,119.75073 C 232.8384,108.30413 234.20147,100.77637 251.43943,95.086545 C 266.51393,90.110824 242.91825,70.5553 238.5066,64.730614 C 231.05612,54.893716 218.95099,56.378541 209.76701,53.347141 C 207.39754,52.565038 204.97709,52.08231 202.58212,51.449895 C 197.00733,49.977815 191.57489,52.07596 186.77535,55.244386 z " ! id="path1882" /> <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.23162794px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" --- 60,80 ---- <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.03454173px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 74.55822,54.033475 C 62.788684,48.643856 58.987734,67.244129 60.286559,71.354069 C 65.095375,86.570852 61.07027,74.90082 64.469816,87.592011 C 66.942728,96.823886 64.889885,113.27071 64.568058,117.98644 C 63.784669,129.46545 60.836334,136.74466 73.399001,135.88894 C 88.422049,134.86565 104.94624,135.30703 120.22753,135.30703 C 132.21915,135.30703 130.02089,127.02693 131.64487,117.98644 C 133.2574,109.00972 137.35352,105.1117 137.35352,95.336432 C 137.35352,90.651339 129.19454,82.097515 128.10151,78.015837 C 125.62867,68.781626 120.04578,63.898865 111.66454,58.030534 C 107.00265,54.766406 93.858782,55.714703 87.402715,52.70112 C 84.99634,51.577867 75.420671,53.872443 74.55822,54.033475 z " id="path1876" sodipodi:nodetypes="cssssssssssc" /> <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.11652792px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 147.98463,81.723979 C 141.6042,77.730539 139.64136,98.523646 138.67349,103.36986 C 137.06571,111.42017 134.03022,118.41707 136.01316,128.34587 C 136.68842,131.72697 151.38919,133.80688 153.3053,135.00614 C 162.48505,140.75165 166.90265,125.75573 174.58792,123.35067 C 193.7635,117.34978 195.50611,124.88819 189.71475,90.590645 C 187.54944,77.76727 184.26994,68.131092 181.23874,56.747964 C 178.21659,45.398819 159.73726,57.021929 155.96563,61.743168 C 151.99038,66.719281 148.99264,75.415014 147.98463,81.723979 z " ! id="path1878" ! sodipodi:nodetypes="csssssssc" /> <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.11341703px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 129.08995,53.732801 C 124.96938,58.889595 129.1539,72.155375 131.74319,78.63625 C 135.6235,88.34849 144.81499,76.193512 146.33597,73.65556 C 151.47019,65.088416 154.25577,61.166389 146.33597,53.732801 C 139.92522,47.715619 135.33422,49.825521 129.08995,53.732801 z " id="path1880" /> <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.23876262px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 186.77535,55.244386 C 180.22731,48.760357 189.62276,75.116261 191.60793,85.600316 C 193.28227,94.442854 195.04146,96.227113 196.29287,106.47521 C 198.20296,122.11738 214.01566,123.21512 218.38889,119.75073 C 232.8384,108.30413 234.20147,100.77637 251.43943,95.086545 C 266.51393,90.110824 242.91825,70.5553 238.5066,64.730614 C 231.05612,54.893716 218.95099,56.378541 209.76701,53.347141 C 207.39754,52.565038 204.97709,52.08231 202.58212,51.449895 C 197.00733,49.977815 191.57489,52.07596 186.77535,55.244386 z " ! id="path1882" ! sodipodi:nodetypes="csssssssc" /> <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.23162794px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" *************** *** 82,87 **** <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.22600341px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 249.48904,58.896306 C 240.10261,65.232618 261.70836,78.288582 263.553,79.782844 C 270.72578,85.593231 279.16975,86.952668 286.05533,89.276725 C 297.31012,93.075501 297.38045,95.072913 304.33848,104.46694 C 310.40871,112.66236 323.01427,119.43545 325.43441,106.36572 C 327.17152,96.984596 319.5287,88.898531 314.18324,81.68162 C 309.14272,74.876403 301.57915,74.158695 295.9001,66.491411 C 287.65267,55.356551 279.36615,55.214454 267.77219,51.301201 C 256.9591,47.651513 258.71121,51.425788 249.48904,58.896306 z " ! id="path1886" /> <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.21002293px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" --- 84,90 ---- <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.22600341px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 249.48904,58.896306 C 240.10261,65.232618 261.70836,78.288582 263.553,79.782844 C 270.72578,85.593231 275.63007,88.919781 281.18338,93.607344 C 290.81419,101.73674 294.78497,97.729552 304.33848,104.46694 C 313.65667,111.03838 323.01427,119.43545 325.43441,106.36572 C 327.17152,96.984596 319.5287,88.898531 314.18324,81.68162 C 309.14272,74.876403 301.57915,74.158695 295.9001,66.491411 C 287.65267,55.356551 279.36615,55.214454 267.77219,51.301201 C 256.9591,47.651513 258.71121,51.425788 249.48904,58.896306 z " ! id="path1886" ! sodipodi:nodetypes="csssssssc" /> <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.21002293px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" *************** *** 90,98 **** <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.28758502px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 441.16995,53.532374 C 435.23547,51.884494 432.00477,47.697196 432.00477,66.182639 C 432.00477,84.35107 434.22813,91.349697 435.99364,106.05702 C 438.35051,125.69059 424.06324,137.06038 447.96024,130.42471 C 459.82902,127.129 473.62741,120.09499 487.8489,117.13324 C 498.24252,114.96869 507.80379,124.22553 519.75984,128.20946 C 544.51308,136.4576 556.74634,131.36194 542.36341,99.411296 C 532.95136,78.503092 528.28952,81.689344 513.11173,81.689344 C 502.3741,81.689344 511.78205,89.073372 502.47475,68.397883 C 499.34892,61.45408 483.34722,59.366029 477.21193,57.321665 C 469.70577,54.820511 465.1115,55.604488 458.59722,52.891177 C 457.73727,52.532993 440.82953,52.891177 439.94313,52.891177" id="path1890" sodipodi:nodetypes="cssssssssssc" /> <path ! style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.8674376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 426.00082,56.265097 C 402.02201,53.000058 404.26405,71.448368 410.56476,85.175265 C 413.06037,90.612246 427.42856,107.59099 427.42856,90.686222 C 427.42856,79.280023 427.42856,71.19622 427.42856,55.783505" id="path1892" --- 93,101 ---- <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.28758502px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 441.16995,53.532374 C 435.23547,51.884494 432.00477,47.697196 432.00477,66.182639 C 432.00477,84.35107 426.64955,91.349697 428.41506,106.05702 C 430.77193,125.69059 424.06324,137.06038 447.96024,130.42471 C 459.82902,127.129 474.16874,133.62817 488.39023,130.66642 C 498.78385,128.50187 507.24476,126.7291 519.75984,128.20946 C 548.30237,131.58565 556.74634,131.36194 542.36341,99.411296 C 532.95136,78.503092 534.78545,91.974563 520.69031,80.606689 C 512.33224,73.865818 523.69125,84.201426 502.47475,68.397883 C 496.3678,63.848997 483.34722,59.366029 477.21193,57.321665 C 469.70577,54.820511 465.1115,55.604488 458.59722,52.891177 C 457.73727,52.532993 440.82953,52.891177 439.94313,52.891177" id="path1890" sodipodi:nodetypes="cssssssssssc" /> <path ! style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.067;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" d="M 426.00082,56.265097 C 402.02201,53.000058 404.26405,71.448368 410.56476,85.175265 C 413.06037,90.612246 427.42856,107.59099 427.42856,90.686222 C 427.42856,79.280023 427.42856,71.19622 427.42856,55.783505" id="path1892" *************** *** 109,113 **** <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.1263051px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 193.09502,119.17699 C 191.96578,119.40931 186.59574,121.07953 184.49334,121.59712 C 180.6789,122.53618 177.56535,123.57917 175.27727,125.83234 C 172.85811,128.21458 172.20525,130.27476 172.20525,134.30276 C 172.20525,137.06959 181.01382,136.72289 182.65012,136.72289 C 191.802,136.72289 200.73704,136.83165 209.68393,137.93295 C 214.78503,138.56086 227.69542,138.94244 229.40446,135.57652 C 231.19493,132.05023 224.63168,127.2688 223.01139,125.67323 C 219.29138,122.00998 205.98104,128.97604 202.92548,126.43736 C 201.30163,125.08821 194.68967,120.43326 193.09502,119.17699 z " id="path2787" sodipodi:nodetypes="cssssssssc" /> --- 112,116 ---- <path style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.1263051px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 193.09502,119.17699 C 191.96578,119.40931 186.59574,121.07953 184.49334,121.59712 C 180.6789,122.53618 177.56535,123.57917 175.27727,125.83234 C 172.85811,128.21458 172.20525,130.27476 172.20525,134.30276 C 172.20525,137.06959 181.01382,136.72289 182.65012,136.72289 C 191.802,136.72289 200.73704,136.83165 209.68393,137.93295 C 214.78503,138.56086 227.69542,138.94244 229.40446,135.57652 C 231.19493,132.05023 224.63168,127.2688 223.01139,125.67323 C 219.29138,122.00998 209.35783,123.32636 205.09079,122.10674 C 201.67178,121.12951 194.68967,120.43326 193.09502,119.17699 z " id="path2787" sodipodi:nodetypes="cssssssssc" /> *************** *** 117,123 **** id="path2789" /> <path ! style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.12490427px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 55.038494,93.178243 C 52.514371,97.20719 52.288417,104.93704 52.288417,110.97662 C 52.288417,115.93748 54.258952,116.51444 51.600898,120.68482 C 48.920335,124.89051 57.249563,122.78394 58.476088,122.30285 C 64.721808,119.85303 64.711484,110.86429 66.726316,106.12251 C 68.453226,102.05834 70.85143,96.013177 70.85143,91.560209 C 70.85143,86.342761 56.344266,91.47099 55.038494,93.178243 z " ! id="path2801" /> </g> </svg> --- 120,127 ---- id="path2789" /> <path ! style="fill:#c9c9c9;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.04061198px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 51.763893,93.083642 C 49.574426,97.058395 49.378429,104.68427 49.378429,110.64261 C 49.378429,115.53674 51.087705,116.10594 48.782064,120.22022 C 46.456898,124.36934 53.681812,122.29111 54.74572,121.81649 C 60.163364,119.39962 60.154409,111.07312 61.902108,106.39512 C 63.40006,102.38562 62.773665,96.42177 62.773665,92.028699 C 62.773665,86.881432 52.896542,91.399353 51.763893,93.083642 z " ! id="path2801" ! sodipodi:nodetypes="csssssc" /> </g> </svg> --- NEW FILE: TestPattern2.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg2867" rgminx="10ft" rgminy="10ft" rgmaxx="10ft" rgmaxy="10ft" startxsize="10ft" startysize="10ft" sodipodi:version="0.32" inkscape:version="0.44" sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="TestPattern2.svg"> <defs id="defs2869" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="375" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="823" inkscape:window-height="577" inkscape:window-x="60" inkscape:window-y="82" /> <metadata id="metadata2872"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> <path style="fill:red;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 288.57143,106.6479 C 280.05112,113.1582 255.29115,112.36218 237.14286,112.36218 C 214.68125,112.36218 195.7407,106.29736 174.28571,100.93361 C 160.34771,97.449111 140.15645,100.93361 125.71429,100.93361 C 112.00836,100.93361 97.471512,111.54055 91.428571,126.6479 C 82.497437,148.97573 97.995092,167.57524 117.14286,172.36218 C 151.42469,180.93264 180.57658,195.7959 197.14286,212.36218 C 224.47041,239.68974 172.4421,257.56971 160,263.79075 C 135.57266,276.00443 109.30915,268.0296 100,286.6479 C 91.242087,304.16372 138.52516,318.07647 148.57143,318.07647 C 185.1655,318.07647 224.81029,323.79075 262.85714,323.79075 C 288.57143,323.79075 314.28571,323.79075 340,323.79075 C 352.51467,323.79075 348.57143,271.38285 348.57143,260.93361 C 348.57143,236.45629 274.28572,225.21493 274.28572,203.79076 C 274.28572,188.55266 348.57143,164.74313 348.57143,149.50504 C 348.57143,133.79495 342.85714,120.34017 342.85714,103.79075 C 342.85714,101.22233 293.32485,105.45954 288.57143,106.6479 z " id="path2875" sodipodi:nodetypes="csssssssssssssssc" /> </g> </svg> --- NEW FILE: TestPattern1.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg2833" rgminx="4ft" rgminy="4ft" rgmaxx="4ft" rgmaxy="4ft" startxsize="4ft" startysize="4ft" sodipodi:version="0.32" inkscape:version="0.44" sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="TestPattern1.svg"> <defs id="defs2835" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.56857668" inkscape:cx="375" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1003" inkscape:window-height="728" inkscape:window-x="40" inkscape:window-y="62" /> <metadata id="metadata2838"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> <g id="g3023"> <path style="fill:#5c5c5c;fill-opacity:1;stroke:black;stroke-width:1.06700003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path2841" inkscape:flatsided="true" inkscape:rounded="0" inkscape:randomized="0" d="M 100,100 L 100,300 L 200,200 L 100,100 z " /> <rect y="181.76721" x="124.87321" height="29.899221" width="35.175556" id="rect2134" style="fill:#ff5c5c;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g id="g3027" transform="matrix(-1,0,0,1,400.2503,0)"> <path d="M 100,100 L 100,300 L 200,200 L 100,100 z " inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" id="path3029" style="fill:#5c5c5c;fill-opacity:1;stroke:black;stroke-width:1.06700003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect style="fill:#ff5c5c;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3031" width="35.175556" height="29.899221" x="124.87321" y="181.76721" /> </g> <g id="g3033" transform="matrix(0,1,-1,0,401.0046,-1.004554)"> <path d="M 100,100 L 100,300 L 200,200 L 100,100 z " inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" id="path3035" style="fill:#5c5c5c;fill-opacity:1;stroke:black;stroke-width:1.06700003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect style="fill:#ff5c5c;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3037" width="35.175556" height="29.899221" x="124.87321" y="181.76721" /> </g> <g transform="matrix(0,-1,1,0,-0.754258,401.0046)" id="g3061"> <path d="M 100,100 L 100,300 L 200,200 L 100,100 z " inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" id="path3063" style="fill:#5c5c5c;fill-opacity:1;stroke:black;stroke-width:1.06700003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect style="fill:#ff5c5c;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3065" width="35.175556" height="29.899221" x="124.87321" y="181.76721" /> </g> </g> </svg> |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-11 15:00:01
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23895 Modified Files: Tag: Release_branch_v1 RGGLView.h RGGLView.cpp Log Message: Split tessellation object off of RGGLView Index: RGGLView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLView.cpp,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -d -r1.11.2.1 -r1.11.2.2 *** RGGLView.cpp 5 Nov 2006 02:34:23 -0000 1.11.2.1 --- RGGLView.cpp 11 Nov 2006 14:59:56 -0000 1.11.2.2 *************** *** 42,65 **** typedef GLvoid (*CallBackFunc)(...); - static GLvoid beginCallback(GLenum which); - static void errorCallback(GLenum errorCode); - static GLvoid endCallback(void); - static GLvoid vertexCallback(GLvoid *vertex); - static GLvoid combineCallback(GLdouble coords[3], - GLdouble *vertex_data[4], - GLfloat weight[4], GLdouble **dataOut ); ! long RGGLView::_tessBufSize; ! long RGGLView::_tessBufFilled; ! GLdouble *RGGLView::_tessBuf; ! GLdouble *RGGLView::_tessPtr; ! GLdouble RGGLView::_xOrigin; ! GLdouble RGGLView::_yOrigin; ! GLdouble RGGLView::_xSize; ! GLdouble RGGLView::_ySize; ! GLint RGGLView::_list; ! ! ! GLUtesselator *RGGLView::_tessObj = NULL; // --------------------------------------------------------------------------- --- 42,48 ---- typedef GLvoid (*CallBackFunc)(...); ! XGArena RGTessellator::_tessBuf; ! GLUtesselator *RGTessellator::_tessObj = NULL; // --------------------------------------------------------------------------- *************** *** 497,501 **** } ! void RGGLView::BeginTesselation(GLint list, long numPoints, double xOrigin, double yOrigin, double xSize, double ySize) { if(_tessObj == NULL) --- 480,525 ---- } ! RGGLBitmapFont *RGGLView::CreateBitmapFont(XGFont *fontPtr) ! { ! long n, count; ! RGGLBitmapFont *test, *result = NULL; ! char fontName[512]; ! short style, pointSize; ! ! fontPtr->GetFontName(fontName); ! style = fontPtr->GetFontFlags(); ! pointSize = fontPtr->GetFontSize(); ! count = _allFonts.Length(); ! for(n = 0; (n < count) && result == NULL; n++) ! { ! test = _allFonts[n]; ! if(test->GetContext() == aglGetCurrentContext()) ! { ! if(test->Matches(fontName, style, pointSize)) ! result = test; ! } ! } ! ! if(result == NULL) ! { ! result = new RGGLBitmapFont::RGGLBitmapFont(fontPtr); ! _allFonts.push_back(result); ! } ! ! return result; ! } ! ! ! #pragma mark *** RGTessellator *** ! ! RGTessellator::RGTessellator() ! { ! } ! ! RGTessellator::~RGTessellator() ! { ! } ! ! void RGTessellator::Begin(GLint list, long numPoints, double xOrigin, double yOrigin, double xSize, double ySize) { if(_tessObj == NULL) *************** *** 511,520 **** _list = list; - _tessBufSize = numPoints; - _tessBufFilled = 0; - _tessBuf = new GLdouble[numPoints*5]; - _tessPtr = _tessBuf; gluTessBeginPolygon(_tessObj, NULL); ! glNewList(_list, GL_COMPILE); _xOrigin = xOrigin; _yOrigin = yOrigin; --- 535,541 ---- _list = list; gluTessBeginPolygon(_tessObj, NULL); ! if(_list != 0) ! glNewList(_list, GL_COMPILE); _xOrigin = xOrigin; _yOrigin = yOrigin; *************** *** 523,596 **** } ! void RGGLView::BeginTessContour() { gluTessBeginContour(_tessObj); } ! void RGGLView::AddTessPoint(double x, double y, double z) { ! GLdouble *start; ! PRECONDITION(_tessBufFilled < _tessBufSize); ! start = _tessPtr; ! *_tessPtr++ = x; ! *_tessPtr++ = y; ! *_tessPtr++ = z; ! *_tessPtr++ = (x - _xOrigin) / _xSize; ! *_tessPtr++ = (y - _yOrigin) / _ySize; ! gluTessVertex (_tessObj, start, start); ! _tessBufFilled++; } ! void RGGLView::EndTessContour() { gluTessEndContour(_tessObj); } ! void RGGLView::EndTesselation() { gluTessEndPolygon(_tessObj); ! glEndList(); ! delete [] _tessBuf; ! } ! ! RGGLBitmapFont *RGGLView::CreateBitmapFont(XGFont *fontPtr) ! { ! long n, count; ! RGGLBitmapFont *test, *result = NULL; ! char fontName[512]; ! short style, pointSize; ! ! fontPtr->GetFontName(fontName); ! style = fontPtr->GetFontFlags(); ! pointSize = fontPtr->GetFontSize(); ! count = _allFonts.Length(); ! for(n = 0; (n < count) && result == NULL; n++) ! { ! test = _allFonts[n]; ! if(test->GetContext() == aglGetCurrentContext()) ! { ! if(test->Matches(fontName, style, pointSize)) ! result = test; ! } ! } ! ! if(result == NULL) ! { ! result = new RGGLBitmapFont::RGGLBitmapFont(fontPtr); ! _allFonts.push_back(result); ! } ! ! return result; } ! ! static GLvoid beginCallback(GLenum which) { glBegin(which); } ! static void errorCallback(GLenum errorCode) { const GLubyte *estring; --- 544,586 ---- } ! void RGTessellator::BeginContour() { gluTessBeginContour(_tessObj); } ! void RGTessellator::AddPoint(double x, double y, double z) { ! MyVertexData_t *vertex; ! vertex = AllocVertex(); ! vertex->x = x; ! vertex->y = y; ! vertex->z = z; ! vertex->textureX = (x - _xOrigin) / _xSize; ! vertex->textureY = (y - _yOrigin) / _ySize; ! gluTessVertex (_tessObj, reinterpret_cast<GLdouble*>(vertex), vertex); } ! void RGTessellator::EndContour() { gluTessEndContour(_tessObj); } ! void RGTessellator::End() { + if(_list != 0) + glEndList(); gluTessEndPolygon(_tessObj); ! _tessBuf.FreeAll(); } + #pragma mark *** RGTessellator (PRIVATE) *** ! GLvoid RGTessellator::beginCallback(GLenum which) { glBegin(which); } ! void RGTessellator::errorCallback(GLenum errorCode) { const GLubyte *estring; *************** *** 601,615 **** } ! static GLvoid endCallback(void) { glEnd(); } ! static GLvoid vertexCallback(GLvoid *vertex) ! { ! double *vPtr = (double*)vertex; ! ! glTexCoord2f(vPtr[3], vPtr[4]); ! glVertex3dv(vPtr); } --- 591,603 ---- } ! GLvoid RGTessellator::endCallback(void) { glEnd(); } ! GLvoid RGTessellator::vertexCallback(MyVertexData_t *vertex) ! { ! glTexCoord2d(vertex->textureX, vertex->textureY); ! glVertex3d(vertex->x, vertex->y, vertex->z); } *************** *** 619,654 **** * coordinate data. In this program, color is weighted. */ ! static GLvoid combineCallback(GLdouble coords[3], ! GLdouble *vertex_data[4], ! GLfloat weight[4], GLdouble **dataOut ) { ! GLdouble *vertex, oneVert, oneDatum; ! GLfloat oneWeight; ! int i; ! ! vertex = (GLdouble *) malloc(5 * sizeof(GLdouble)); ! vertex[0] = coords[0]; ! vertex[1] = coords[1]; ! vertex[2] = coords[2]; ! for (i = 3; i < 5; i++) { ! oneWeight = weight[0]; ! oneDatum = vertex_data[0][i]; ! oneVert = oneWeight * oneDatum; ! /**/ ! oneWeight = weight[1]; ! oneDatum = vertex_data[1][i]; ! oneVert += oneWeight * oneDatum; ! /**/ ! oneWeight = weight[2]; ! oneDatum = vertex_data[2][i]; ! oneVert += oneWeight * oneDatum; ! /**/ ! oneWeight = weight[3]; ! oneDatum = vertex_data[3][i]; ! oneVert += oneWeight * oneDatum; ! /**/ ! vertex[i] = oneVert; } *dataOut = vertex; --- 607,630 ---- * coordinate data. In this program, color is weighted. */ ! GLvoid RGTessellator::combineCallback(GLdouble coords[3], ! MyVertexData_t *vertex_data[4], ! GLfloat weight[4], MyVertexData_t **dataOut ) { ! MyVertexData_t *vertex; ! long n; ! vertex = AllocVertex(); ! vertex->x = coords[0]; ! vertex->y = coords[1]; ! vertex->z = coords[2]; ! vertex->textureX = 0; ! vertex->textureY = 0; ! for(n = 0; n < 4; n++) { ! if(vertex_data[n] != NULL) ! { ! vertex->textureX += weight[n]*vertex_data[n]->textureX; ! vertex->textureY += weight[n]*vertex_data[n]->textureY; ! } } *dataOut = vertex; Index: RGGLView.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLView.h,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -d -r1.9.2.1 -r1.9.2.2 *** RGGLView.h 5 Nov 2006 02:34:23 -0000 1.9.2.1 --- RGGLView.h 11 Nov 2006 14:59:56 -0000 1.9.2.2 *************** *** 37,43 **** --- 37,45 ---- #include <AGL/agl.h> #include <XGView.h> + #include <XGArena.h> #include "RGGLBitmapFont.h" using yaaf::XGView; + using yaaf::XGArena; using yaaf::XGArgStream; using yaaf::XGSViewInitRecord; *************** *** 79,83 **** } glRectangle_t; ! class RGGLView : public XGView { public: --- 81,125 ---- } glRectangle_t; ! typedef struct ! { ! double x; ! double y; ! double z; ! double textureX; ! double textureY; ! } MyVertexData_t; ! ! class RGTessellator ! { ! public: ! RGTessellator(); ! ~RGTessellator(); ! void Begin(GLint list, long numPoints, double xOrigin, double yOrigin, double xSize, double ySize); ! void BeginContour(); ! void AddPoint(double x, double y, double z); ! void EndContour(); ! void End(); ! static MyVertexData_t *AllocVertex() { return static_cast<MyVertexData_t*>(_tessBuf.Alloc(sizeof(MyVertexData_t))); } ! ! private: ! static GLvoid beginCallback(GLenum which); ! static void errorCallback(GLenum errorCode); ! static GLvoid endCallback(void); ! static GLvoid vertexCallback(MyVertexData_t *vertex); ! static GLvoid combineCallback(GLdouble coords[3], ! MyVertexData_t *vertex_data[4], ! GLfloat weight[4], MyVertexData_t **dataOut ); ! GLdouble _xOrigin; ! GLdouble _yOrigin; ! GLdouble _xSize; ! GLdouble _ySize; ! GLint _list; ! long _tessBufSize; ! long _tessBufFilled; ! static GLUtesselator *_tessObj; ! static XGArena _tessBuf; ! }; ! ! class RGGLView : public XGView { public: *************** *** 86,94 **** virtual ~RGGLView(); private: ! RGGLView& RGGLView::operator=(const RGGLView& p); ! RGGLView(const RGGLView& p); // copy constructor ! void Init(); public: ! void Swap() { aglSwapBuffers (_winGLContext); } virtual void Activate(); virtual void Deactivate(); --- 128,136 ---- virtual ~RGGLView(); private: ! RGGLView& RGGLView::operator=(const RGGLView& p); ! RGGLView(const RGGLView& p); // copy constructor ! void Init(); public: ! void Swap() { aglSwapBuffers (_winGLContext); } virtual void Activate(); virtual void Deactivate(); *************** *** 111,150 **** AGLContext SetupOffscreen(Rect& printRect, CGWorld *world ); void FinishOffscreen( Rect& printRect, CGWorld *world, AGLContext saveContext ); ! void Draw(); void DrawSpecial( Rect& printRect ); void DrawToCGWorld( Rect& printRect, CGWorld *world ); ! ! static void BeginTesselation(GLint list, long numPoints, double xOrigin, double yOrigin, double xSize, double ySize); ! static void BeginTessContour(); ! static void AddTessPoint(double x, double y, double z); ! static void EndTessContour(); ! static void EndTesselation(); ! RGGLBitmapFont* CreateBitmapFont(XGFont *fontPtr); ! private: #if OPT_MACOS ! AGLPixelFormat _printFmt; AGLContext _printCtx; CGWorld *_printfOffscreen; #endif ! recCamera_t _camera; ! AGLPixelFormat _aglPixFmt; ! AGLContext _winGLContext; ! double _defaultScale; ! double _curScale; ! static long _tessBufSize; ! static long _tessBufFilled; ! static GLdouble *_tessBuf; ! static GLdouble *_tessPtr; ! static GLdouble _xOrigin; ! static GLdouble _yOrigin; ! static GLdouble _xSize; ! static GLdouble _ySize; ! static GLint _list; ! bool _active; ! static GLUtesselator *_tessObj; XGDynArray<RGGLBitmapFont *> _allFonts; }; --- 153,177 ---- AGLContext SetupOffscreen(Rect& printRect, CGWorld *world ); void FinishOffscreen( Rect& printRect, CGWorld *world, AGLContext saveContext ); ! void Draw(); void DrawSpecial( Rect& printRect ); void DrawToCGWorld( Rect& printRect, CGWorld *world ); ! RGGLBitmapFont* CreateBitmapFont(XGFont *fontPtr); ! RGTessellator tessellation; ! private: #if OPT_MACOS ! AGLPixelFormat _printFmt; AGLContext _printCtx; CGWorld *_printfOffscreen; #endif ! recCamera_t _camera; ! AGLPixelFormat _aglPixFmt; ! AGLContext _winGLContext; ! double _defaultScale; ! double _curScale; ! bool _active; XGDynArray<RGGLBitmapFont *> _allFonts; }; |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-11 14:58:42
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23495 Modified Files: Tag: Release_branch_v1 ArcPath.cpp SimplePath.cpp PlanGroup.cp FreehandPath.cpp Log Message: Split tessellation object off of RGGLView Index: SimplePath.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/SimplePath.cpp,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -C2 -d -r1.17.2.1 -r1.17.2.2 *** SimplePath.cpp 2 Nov 2006 23:26:59 -0000 1.17.2.1 --- SimplePath.cpp 11 Nov 2006 14:58:39 -0000 1.17.2.2 *************** *** 761,778 **** if(_inPathBackdropList == 0) _inPathBackdropList = glGenLists(1); ! planView->BeginTesselation(_inPathBackdropList, count*2, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->BeginTessContour(); for(n = 0; n < count; n++) { destPoint = leftPoints[n]; ! planView->AddTessPoint(destPoint.xOffset, destPoint.yOffset, kBackGroundZ); } for(n = count-1; n >= 0; n--) { destPoint = rightPoints[n]; ! planView->AddTessPoint(destPoint.xOffset, destPoint.yOffset, kBackGroundZ); } ! planView->EndTessContour(); ! planView->EndTesselation(); _rebuildBackdrop = false; PathClean(); --- 761,778 ---- if(_inPathBackdropList == 0) _inPathBackdropList = glGenLists(1); ! planView->tessellation.Begin(_inPathBackdropList, count*2, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->tessellation.BeginContour(); for(n = 0; n < count; n++) { destPoint = leftPoints[n]; ! planView->tessellation.AddPoint(destPoint.xOffset, destPoint.yOffset, kBackGroundZ); } for(n = count-1; n >= 0; n--) { destPoint = rightPoints[n]; ! planView->tessellation.AddPoint(destPoint.xOffset, destPoint.yOffset, kBackGroundZ); } ! planView->tessellation.EndContour(); ! planView->tessellation.End(); _rebuildBackdrop = false; PathClean(); Index: PlanGroup.cp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/PlanGroup.cp,v retrieving revision 1.34.2.1 retrieving revision 1.34.2.2 diff -C2 -d -r1.34.2.1 -r1.34.2.2 *** PlanGroup.cp 2 Nov 2006 23:41:26 -0000 1.34.2.1 --- PlanGroup.cp 11 Nov 2006 14:58:39 -0000 1.34.2.2 *************** *** 769,781 **** glShadeModel(GL_FLAT); ! planView->BeginTesselation(_list, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->BeginTessContour(); for(n = 0; n < count; n++) // Already did point zero { pt = GetIndexedPathPoint(n); ! planView->AddTessPoint(pt.xOffset, pt.yOffset, pt.zOffset); } ! planView->EndTessContour(); ! planView->EndTesselation(); glCallList(_list); _recalcBackdrop = false; --- 769,781 ---- glShadeModel(GL_FLAT); ! planView->tessellation.Begin(_list, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->tessellation.BeginContour(); for(n = 0; n < count; n++) // Already did point zero { pt = GetIndexedPathPoint(n); ! planView->tessellation.AddPoint(pt.xOffset, pt.yOffset, pt.zOffset); } ! planView->tessellation.EndContour(); ! planView->tessellation.End(); glCallList(_list); _recalcBackdrop = false; Index: ArcPath.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/ArcPath.cpp,v retrieving revision 1.19.2.1 retrieving revision 1.19.2.2 diff -C2 -d -r1.19.2.1 -r1.19.2.2 *** ArcPath.cpp 1 Nov 2006 03:09:47 -0000 1.19.2.1 --- ArcPath.cpp 11 Nov 2006 14:58:39 -0000 1.19.2.2 *************** *** 295,307 **** _list = glGenLists(1); glShadeModel(GL_FLAT); ! planView->BeginTesselation(_list, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->BeginTessContour(); for(n = 0; n < count; n++) { pt = GetIndexedPathPoint(n); ! planView->AddTessPoint(pt.xOffset, pt.yOffset, pt.zOffset); } ! planView->EndTessContour(); ! planView->EndTesselation(); glCallList(_list); _recalcBackdrop = false; --- 295,307 ---- _list = glGenLists(1); glShadeModel(GL_FLAT); ! planView->tessellation.Begin(_list, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->tessellation.BeginContour(); for(n = 0; n < count; n++) { pt = GetIndexedPathPoint(n); ! planView->tessellation.AddPoint(pt.xOffset, pt.yOffset, pt.zOffset); } ! planView->tessellation.EndContour(); ! planView->tessellation.End(); glCallList(_list); _recalcBackdrop = false; Index: FreehandPath.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/FreehandPath.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 *** FreehandPath.cpp 1 Nov 2006 03:09:47 -0000 1.41.2.1 --- FreehandPath.cpp 11 Nov 2006 14:58:39 -0000 1.41.2.2 *************** *** 482,494 **** if(_enclosedBackdropList == 0) _enclosedBackdropList = glGenLists(1); ! planView->BeginTesselation(_enclosedBackdropList, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->BeginTessContour(); for(n = 0; n < count; n++) { pt = GetIndexedAnchorPoint(n); ! planView->AddTessPoint(pt.xOffset, pt.yOffset, kBackGroundZ); } ! planView->EndTessContour(); ! planView->EndTesselation(); } --- 482,494 ---- if(_enclosedBackdropList == 0) _enclosedBackdropList = glGenLists(1); ! planView->tessellation.Begin(_enclosedBackdropList, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->tessellation.BeginContour(); for(n = 0; n < count; n++) { pt = GetIndexedAnchorPoint(n); ! planView->tessellation.AddPoint(pt.xOffset, pt.yOffset, kBackGroundZ); } ! planView->tessellation.EndContour(); ! planView->tessellation.End(); } |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-05 03:42:14
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15299 Modified Files: Tag: Release_branch_v1 RGGLSVGDraw.cpp Log Message: Clean up polygon paint Index: RGGLSVGDraw.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLSVGDraw.cpp,v retrieving revision 1.26.2.3 retrieving revision 1.26.2.4 diff -C2 -d -r1.26.2.3 -r1.26.2.4 *** RGGLSVGDraw.cpp 4 Nov 2006 23:04:12 -0000 1.26.2.3 --- RGGLSVGDraw.cpp 5 Nov 2006 03:42:08 -0000 1.26.2.4 *************** *** 636,643 **** const char *dval; - StartTransform(data, scaleX, scaleY); - dval = data->GetArgValue("d"); glPushAttrib(GL_DEPTH_BUFFER_BIT); glDisable(GL_LINE_STIPPLE); --- 636,644 ---- const char *dval; dval = data->GetArgValue("d"); + if(CIstrstr(dval, " A ") == NULL) + StartTransform(data, scaleX, scaleY); + glPushAttrib(GL_DEPTH_BUFFER_BIT); glDisable(GL_LINE_STIPPLE); *************** *** 654,666 **** dval = data->GetArgValue("d"); SetFillStyle(data); ! glBegin(GL_POLYGON); EnumeratePathVertices(dval, xOffset, yOffset, zOffset, xSize, ySize, scaleX, scaleY); glEnd(); } ! if(fillVisible || strokeVisible) { ! if(strokeVisible) ! SetStrokeStyle(data, scaleX, scaleY); glPushAttrib(GL_LINE_BIT); --- 655,666 ---- dval = data->GetArgValue("d"); SetFillStyle(data); ! glBegin(GL_TRIANGLE_FAN); EnumeratePathVertices(dval, xOffset, yOffset, zOffset, xSize, ySize, scaleX, scaleY); glEnd(); } ! if(strokeVisible) { ! SetStrokeStyle(data, scaleX, scaleY); glPushAttrib(GL_LINE_BIT); *************** *** 668,679 **** glHint (GL_LINE_SMOOTH_HINT, GL_NICEST); glBegin(GL_LINE_STRIP); ! EnumeratePathVertices(dval, xOffset, yOffset, 0.0, xSize, ySize, scaleX, scaleY); glEnd(); glPopAttrib(); } ! glPopAttrib(); ! StopTransform(); } } --- 668,681 ---- glHint (GL_LINE_SMOOTH_HINT, GL_NICEST); glBegin(GL_LINE_STRIP); ! EnumeratePathVertices(dval, xOffset, yOffset, zOffset, xSize, ySize, scaleX, scaleY); glEnd(); + glPopAttrib(); } ! glPopAttrib(); ! if(CIstrstr(dval, " A ") == NULL) ! StopTransform(); } } *************** *** 775,779 **** ParseOnePoint(val, false, xSize, ySize, _bounds.top, _bounds.left, xPosSVG, yPosSVG); val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); // Z axis taken care of on glTranslate } else if(*val == 'L') --- 777,781 ---- ParseOnePoint(val, false, xSize, ySize, _bounds.top, _bounds.left, xPosSVG, yPosSVG); val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! // glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); // Z axis taken care of on glTranslate } else if(*val == 'L') *************** *** 785,788 **** --- 787,791 ---- val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); // Z axis taken care of on glTranslate + } else if(*val == 'A') *************** *** 835,844 **** x = (cos(t) * rx*cos(t) - sin(t)*ry*sin(t)); //+ (center.x - (xSize/2)); y = (sin(t) * rx*cos(t) + cos(t)*ry*sin(t)); //+ (center.y - (ySize/2)); ! glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, 0.0); // Z axis taken care of on glTranslate } x = (cos(endA) * rx*cos(endA) - sin(endA)*ry*sin(endA)); //+ (center.x - (xSize/2)); y = (sin(endA) * rx*cos(endA) + cos(endA)*ry*sin(endA)); //+ (center.y - (ySize/2)); ! glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, 0.0); // Z axis taken care of on glTranslate } if(isClosed && startPosSet) --- 838,847 ---- x = (cos(t) * rx*cos(t) - sin(t)*ry*sin(t)); //+ (center.x - (xSize/2)); y = (sin(t) * rx*cos(t) + cos(t)*ry*sin(t)); //+ (center.y - (ySize/2)); ! glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, zOffset); // Z axis taken care of on glTranslate } x = (cos(endA) * rx*cos(endA) - sin(endA)*ry*sin(endA)); //+ (center.x - (xSize/2)); y = (sin(endA) * rx*cos(endA) + cos(endA)*ry*sin(endA)); //+ (center.y - (ySize/2)); ! glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, zOffset); // Z axis taken care of on glTranslate } if(isClosed && startPosSet) |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-05 03:37:36
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13577 Modified Files: Tag: Release_branch_v1 ActiveMaterial.cpp Log Message: FIx issue changing categories Index: ActiveMaterial.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/ActiveMaterial.cpp,v retrieving revision 1.45.2.2 retrieving revision 1.45.2.3 diff -C2 -d -r1.45.2.2 -r1.45.2.3 *** ActiveMaterial.cpp 4 Nov 2006 01:54:33 -0000 1.45.2.2 --- ActiveMaterial.cpp 5 Nov 2006 03:37:33 -0000 1.45.2.3 *************** *** 890,895 **** RebuildPlotPalette(); UpdateMaterialPaletteMenu(); ! if(GetNumMaterials() > 0) ! PickMaterial(0); result = 0; break; --- 890,894 ---- RebuildPlotPalette(); UpdateMaterialPaletteMenu(); ! _popup->SetValue(0); result = 0; break; |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-05 02:35:19
|
Update of /cvsroot/igarden/Garden/source/resources In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22247 Modified Files: Tag: Release_branch_v1 SourceMaterialsStart.xml Log Message: Add rocks and grate Index: SourceMaterialsStart.xml =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/SourceMaterialsStart.xml,v retrieving revision 1.24.2.3 retrieving revision 1.24.2.4 diff -C2 -d -r1.24.2.3 -r1.24.2.4 *** SourceMaterialsStart.xml 4 Nov 2006 23:06:22 -0000 1.24.2.3 --- SourceMaterialsStart.xml 5 Nov 2006 02:35:17 -0000 1.24.2.4 *************** *** 1285,1288 **** --- 1285,1291 ---- <Material UID="DA311450-CB1E-41F5-B750-09813B487F03" CommonName="Gazebo" materialType="Struct" Height="10ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Gazebo.svg"/> <Material UID="175923AD-30C9-4E7F-8F64-850FF9F95003" CommonName="Stone Wall" materialType="Wall" Height="2ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="StoneWall.svg"/> + <Material UID="4875948F-D6C8-4980-9920-436AC9B48A99" CommonName="Grate" materialType="Hardscape" Height="1in" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Grate.svg"/> + <Material UID="2538CA23-F4A0-482D-BD6D-6091D7C97E7F" CommonName="Rock #1" materialType="Natural" Height="1ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Rock1.svg"/> + <Material UID="A6297491-DB7B-491C-95C7-476E4149F657" CommonName="Rock #2" materialType="Natural" Height="1ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Rock2.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"/> |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-05 02:34:27
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22038 Modified Files: Tag: Release_branch_v1 RGGLView.h RGGLView.cpp Log Message: Make tesselation available in more places Index: RGGLView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLView.cpp,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** RGGLView.cpp 30 Oct 2005 03:16:33 -0000 1.11 --- RGGLView.cpp 5 Nov 2006 02:34:23 -0000 1.11.2.1 *************** *** 31,34 **** --- 31,35 ---- + #include "MyAssert.h" #include "RGGLView.h" #include "CGWorld.h" *************** *** 49,52 **** --- 50,64 ---- GLfloat weight[4], GLdouble **dataOut ); + long RGGLView::_tessBufSize; + long RGGLView::_tessBufFilled; + GLdouble *RGGLView::_tessBuf; + GLdouble *RGGLView::_tessPtr; + GLdouble RGGLView::_xOrigin; + GLdouble RGGLView::_yOrigin; + GLdouble RGGLView::_xSize; + GLdouble RGGLView::_ySize; + GLint RGGLView::_list; + + GLUtesselator *RGGLView::_tessObj = NULL; Index: RGGLView.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLView.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** RGGLView.h 16 Sep 2005 10:50:44 -0000 1.9 --- RGGLView.h 5 Nov 2006 02:34:23 -0000 1.9.2.1 *************** *** 116,124 **** void DrawToCGWorld( Rect& printRect, CGWorld *world ); ! void BeginTesselation(GLint list, long numPoints, double xOrigin, double yOrigin, double xSize, double ySize); ! void BeginTessContour(); ! void AddTessPoint(double x, double y, double z); ! void EndTessContour(); ! void EndTesselation(); RGGLBitmapFont* CreateBitmapFont(XGFont *fontPtr); --- 116,124 ---- void DrawToCGWorld( Rect& printRect, CGWorld *world ); ! static void BeginTesselation(GLint list, long numPoints, double xOrigin, double yOrigin, double xSize, double ySize); ! static void BeginTessContour(); ! static void AddTessPoint(double x, double y, double z); ! static void EndTessContour(); ! static void EndTesselation(); RGGLBitmapFont* CreateBitmapFont(XGFont *fontPtr); *************** *** 136,148 **** double _defaultScale; double _curScale; ! long _tessBufSize; ! long _tessBufFilled; ! GLdouble *_tessBuf; ! GLdouble *_tessPtr; ! GLdouble _xOrigin; ! GLdouble _yOrigin; ! GLdouble _xSize; ! GLdouble _ySize; ! GLint _list; bool _active; static GLUtesselator *_tessObj; --- 136,148 ---- double _defaultScale; double _curScale; ! static long _tessBufSize; ! static long _tessBufFilled; ! static GLdouble *_tessBuf; ! static GLdouble *_tessPtr; ! static GLdouble _xOrigin; ! static GLdouble _yOrigin; ! static GLdouble _xSize; ! static GLdouble _ySize; ! static GLint _list; bool _active; static GLUtesselator *_tessObj; |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-05 02:31:37
|
Update of /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20882 Modified Files: Tag: Release_branch_v1 project.pbxproj Log Message: Add grate and rocks Index: project.pbxproj =================================================================== RCS file: /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj/project.pbxproj,v retrieving revision 1.58.2.2 retrieving revision 1.58.2.3 diff -C2 -d -r1.58.2.2 -r1.58.2.3 *** project.pbxproj 4 Nov 2006 23:05:19 -0000 1.58.2.2 --- project.pbxproj 5 Nov 2006 02:31:35 -0000 1.58.2.3 *************** *** 556,559 **** --- 556,563 ---- 49FD3A6F09658755001543D2 /* GardenDate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49B02637064A57C300C95424 /* GardenDate.cpp */; }; 49FD3AA109658787001543D2 /* RGDateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49C1C05806E3EC460021D1F5 /* RGDateTime.cpp */; }; + 49FE0FFB0AFD62B900DC5501 /* Grate.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49FE0FF80AFD62B900DC5501 /* Grate.svg */; }; + 49FE0FFC0AFD62B900DC5501 /* Rock1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49FE0FF90AFD62B900DC5501 /* Rock1.svg */; }; + 49FE0FFD0AFD62B900DC5501 /* Rock2.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49FE0FFA0AFD62B900DC5501 /* Rock2.svg */; }; + 49FE11580AFD803200DC5501 /* RGGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4914530D07A5DB0400DE6CA0 /* RGGLView.cpp */; }; 49FEFED70AFC2B8300DC5501 /* Gazebo.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49FEFED50AFC2B8300DC5501 /* Gazebo.svg */; }; 49FEFED80AFC2B8300DC5501 /* StoneWall.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49FEFED60AFC2B8300DC5501 /* StoneWall.svg */; }; *************** *** 1181,1184 **** --- 1185,1191 ---- 49F59D9605FA9F3D00CDC512 /* Constants.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = Constants.cpp; path = ../source/Constants.cpp; sourceTree = SOURCE_ROOT; }; 49F59DAD05FAB0D000CDC512 /* ColumnSets.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = ColumnSets.h; path = Document/ColumnSets.h; sourceTree = "<group>"; }; + 49FE0FF80AFD62B900DC5501 /* Grate.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = Grate.svg; path = ../source/resources/2DSymbols/Grate.svg; sourceTree = SOURCE_ROOT; }; + 49FE0FF90AFD62B900DC5501 /* Rock1.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = Rock1.svg; path = ../source/resources/2DSymbols/Rock1.svg; sourceTree = SOURCE_ROOT; }; + 49FE0FFA0AFD62B900DC5501 /* Rock2.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = Rock2.svg; path = ../source/resources/2DSymbols/Rock2.svg; sourceTree = SOURCE_ROOT; }; 49FEFED50AFC2B8300DC5501 /* Gazebo.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = Gazebo.svg; path = ../source/resources/2DSymbols/Gazebo.svg; sourceTree = SOURCE_ROOT; }; 49FEFED60AFC2B8300DC5501 /* StoneWall.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = StoneWall.svg; path = ../source/resources/2DSymbols/StoneWall.svg; sourceTree = SOURCE_ROOT; }; *************** *** 1485,1488 **** --- 1492,1498 ---- isa = PBXGroup; children = ( + 49FE0FF80AFD62B900DC5501 /* Grate.svg */, + 49FE0FF90AFD62B900DC5501 /* Rock1.svg */, + 49FE0FFA0AFD62B900DC5501 /* Rock2.svg */, 49FEFED50AFC2B8300DC5501 /* Gazebo.svg */, 49FEFED60AFC2B8300DC5501 /* StoneWall.svg */, *************** *** 2455,2458 **** --- 2465,2471 ---- 49FEFED70AFC2B8300DC5501 /* Gazebo.svg in Resources */, 49FEFED80AFC2B8300DC5501 /* StoneWall.svg in Resources */, + 49FE0FFB0AFD62B900DC5501 /* Grate.svg in Resources */, + 49FE0FFC0AFD62B900DC5501 /* Rock1.svg in Resources */, + 49FE0FFD0AFD62B900DC5501 /* Rock2.svg in Resources */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 2555,2558 **** --- 2568,2572 ---- 49ECC1D808B410AB00AE0981 /* MaterialDrawSetup.cpp in Sources */, 490FC93708D4A5B300A250DA /* RGDOMParser.cpp in Sources */, + 49FE11580AFD803200DC5501 /* RGGLView.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-05 02:31:13
|
Update of /cvsroot/igarden/Garden/source/resources/2DSymbols In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20775 Added Files: Tag: Release_branch_v1 Rock2.svg Grate.svg Rock1.svg Log Message: Add grate and rocks --- NEW FILE: Rock1.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg1884" rgminx="3in" rgminy="3in" rgmaxx="48in" rgmaxy="48in" startxsize="14in" startysize="14in" sodipodi:version="0.32" inkscape:version="0.44" sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="Rock1.svg"> <defs id="defs1886" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="375" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="823" inkscape:window-height="577" inkscape:window-x="754" inkscape:window-y="275" /> <metadata id="metadata1889"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="GROWXY" inkscape:groupmode="layer" id="layer1"> <path style="fill:#a68d66;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 89.675211,53.938713 C 77.322871,57.186093 64.444861,65.827983 56.818061,81.081573 C 45.896401,102.92489 62.319331,126.38233 79.675201,136.79585 C 89.672211,142.79405 113.55612,139.20536 125.38949,143.93871 C 139.71466,149.66878 152.72808,127.46121 161.10378,125.36728 C 176.80597,121.44174 166.90934,94.029993 161.10378,88.224433 C 158.67567,85.796323 155.38949,84.414903 152.53235,82.510143 C 138.77981,73.341783 135.49719,61.724583 118.24664,56.795853 C 106.11537,53.329783 104.49833,48.009463 89.675211,53.938713 z " id="path1872" /> </g> </svg> --- NEW FILE: Rock2.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg1911" rgminx="3in" rgminy="3in" rgmaxx="48in" rgmaxy="48in" startxsize="14in" startysize="14in" sodipodi:version="0.32" inkscape:version="0.44" sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="Rock2.svg"> <defs id="defs1913" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="375" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="823" inkscape:window-height="577" inkscape:window-x="774" inkscape:window-y="295" /> <metadata id="metadata1916"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="GROWXY" inkscape:groupmode="layer" id="layer1"> <path style="fill:#d1d0cf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 39.538093,51.795826 C 30.472753,49.20573 56.036583,63.042066 59.538093,71.795826 C 62.493853,79.185226 58.988283,91.025146 60.966663,98.938686 C 64.521943,113.15979 70.601373,121.43052 80.966663,131.79582 C 93.399503,144.22866 122.72018,130.20477 133.8238,124.65296 C 156.04174,113.54399 156.68095,77.861966 156.68095,57.510111 C 156.68095,30.085594 145.62902,30.367254 118.10952,30.367254 C 101.60998,30.367254 86.036433,22.314099 70.966663,26.08154 C 58.622623,29.16755 53.145463,35.706426 43.823803,40.367254 C 41.822053,41.368133 39.650113,51.235715 39.538093,51.795826 z " id="path1874" /> </g> </svg> --- NEW FILE: Grate.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg1920" rgminx="16in" rgminy="16in" rgmaxx="16in" rgmaxy="16in" startxsize="16in" startysize="16in" sodipodi:version="0.32" inkscape:version="0.44" sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="Grate.svg"> <defs id="defs1922" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" inkscape:cx="375" inkscape:cy="775.87457" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1048" inkscape:window-height="804" inkscape:window-x="410" inkscape:window-y="165" /> <metadata id="metadata1925"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="GROWXY" inkscape:groupmode="layer" id="layer1"> <!-- #98968e --> <path sodipodi:type="arc" style="fill:#98968e;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path1928" sodipodi:cx="281.42856" sodipodi:cy="362.36218" sodipodi:rx="141.42857" sodipodi:ry="138.57143" d="M 422.85713 362.36218 A 141.42857 138.57143 0 1 1 139.99998,362.36218 A 141.42857 138.57143 0 1 1 422.85713 362.36218 z" transform="translate(-115.8441,-200.2911)" /> <rect style="fill:#5c5e5e;fill-opacity:1;stroke:black;stroke-width:1.06360793;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2817" width="105.74169" height="19.003391" x="110.54836" y="50.916065" /> <rect style="fill:#5c5c5c;fill-opacity:1;stroke:black;stroke-width:1.06420529;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3704" width="177.16966" height="19.026794" x="75.571114" y="84.486237" /> <rect style="fill:#5c5c5c;fill-opacity:1;stroke:black;stroke-width:0.99503005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3706" width="234.38168" height="19.004971" x="44.799786" y="115.58042" /> <rect style="fill:#5c5c5c;fill-opacity:1;stroke:black;stroke-width:0.97974837;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3708" width="253.87701" height="19.085251" x="37.404194" y="149.49243" /> <rect style="fill:#5c5c5c;fill-opacity:1;stroke:black;stroke-width:1.11045182;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3710" width="115.79638" height="18.915548" x="108.54061" y="254.18166" /> <rect style="fill:#5c5c5c;fill-opacity:1;stroke:black;stroke-width:1.06420517;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3712" width="177.16966" height="19.026794" x="77.06134" y="223.77921" /> <rect style="fill:#5c5c5c;fill-opacity:1;stroke:black;stroke-width:0.99503005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3714" width="234.38168" height="19.004971" x="44.649017" y="187.38828" /> </g> </svg> |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-04 23:50:52
|
Update of /cvsroot/igarden/Garden/source/resources/2DSymbols In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24696 Modified Files: Tag: Release_branch_v1 Gazebo.svg Log Message: Ungrouped version of Gazebo, which displays with shingles Index: Gazebo.svg =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/2DSymbols/Attic/Gazebo.svg,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Gazebo.svg 4 Nov 2006 23:04:55 -0000 1.1.2.1 --- Gazebo.svg 4 Nov 2006 23:50:49 -0000 1.1.2.2 *************** *** 21,25 **** inkscape:version="0.44" sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" ! sodipodi:docname="Gazebo.svg"> <defs id="defs4" /> --- 21,25 ---- inkscape:version="0.44" sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" ! sodipodi:docname="gazebo.svg"> <defs [...1672 lines suppressed...] ! d="M 143.42426,232.53719 C 133.0567,244.78977 133.0567,244.78977 133.0567,244.78977" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#5d5d5d;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> ! <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#5d5d5d;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 133.05681,276.83511 C 156.61946,300.39776 156.61946,300.39776 156.61946,300.39776" ! id="path4197" /> ! <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#5d5d5d;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 158.50446,285.31767 C 148.1369,297.57025 148.1369,297.57025 148.1369,297.57025" ! id="path4199" /> ! <path ! id="path4203" ! d="M 160.38941,211.80213 C 183.95206,235.36478 183.95206,235.36478 183.95206,235.36478" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#5d5d5d;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> ! <path ! id="path4205" ! d="M 185.83706,220.28469 C 175.4695,232.53727 175.4695,232.53727 175.4695,232.53727" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#5d5d5d;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> ! </g> </svg> |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-04 23:06:26
|
Update of /cvsroot/igarden/Garden/source/resources In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6685 Modified Files: Tag: Release_branch_v1 SourceMaterialsStart.xml Log Message: Add stone wall and gazebo Index: SourceMaterialsStart.xml =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/SourceMaterialsStart.xml,v retrieving revision 1.24.2.2 retrieving revision 1.24.2.3 diff -C2 -d -r1.24.2.2 -r1.24.2.3 *** SourceMaterialsStart.xml 2 Nov 2006 23:47:44 -0000 1.24.2.2 --- SourceMaterialsStart.xml 4 Nov 2006 23:06:22 -0000 1.24.2.3 *************** *** 1283,1286 **** --- 1283,1288 ---- <Material UID="60495A35-20A1-460C-841E-AF2C5CC2FC1C" CommonName="Bench" materialType="Struct" Height="3ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Bench1.svg"/> <Material UID="4D1274EC-E63B-4158-B9F8-3653FCDC4BA8" CommonName="Bluestone" materialType="Walks" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Bluestone.svg"/> + <Material UID="DA311450-CB1E-41F5-B750-09813B487F03" CommonName="Gazebo" materialType="Struct" Height="10ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Gazebo.svg"/> + <Material UID="175923AD-30C9-4E7F-8F64-850FF9F95003" CommonName="Stone Wall" materialType="Wall" Height="2ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="StoneWall.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"/> |