igarden-commit Mailing List for GardenSketch (Page 6)
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...> - 2008-04-18 02:38:29
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32254/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGGLSVGDraw.cpp Log Message: Remove debug printing Index: RGGLSVGDraw.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLSVGDraw.cpp,v retrieving revision 1.26.2.23 retrieving revision 1.26.2.24 diff -C2 -d -r1.26.2.23 -r1.26.2.24 *** RGGLSVGDraw.cpp 29 Mar 2008 19:38:03 -0000 1.26.2.23 --- RGGLSVGDraw.cpp 18 Apr 2008 02:38:31 -0000 1.26.2.24 *************** *** 74,78 **** count = _SVGCache.Length(); - printf("RemoveMatching: Count = %ld\n", count); for(i = count-1; i >= 0; i--) { --- 74,77 ---- *************** *** 241,245 **** _SVGCache.Delete(0); } - printf("GetCacheEntry: Count = %ld\n", _SVGCache.Length()); return result; --- 240,243 ---- *************** *** 292,297 **** } - printf("GetCacheEntry(2): Count = %ld\n", _SVGCache.Length()); - return result; } --- 290,293 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-17 22:19:34
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8869/source/PlanTool Modified Files: Tag: Release_branch_v1 WarningOverlay.h WarningOverlay.cpp Log Message: Fixes to overlap warnings Index: WarningOverlay.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/WarningOverlay.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** WarningOverlay.h 17 Apr 2008 10:51:12 -0000 1.1.2.1 --- WarningOverlay.h 17 Apr 2008 22:18:20 -0000 1.1.2.2 *************** *** 55,60 **** yaaf::InfoPopupView* _curInfoView; yaaf::XGPopWindow* _popWindow; - bool _oneFound; // For callback - planPoint_t _point; // For callback }; --- 55,58 ---- Index: WarningOverlay.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/WarningOverlay.cpp,v retrieving revision 1.4.2.6 retrieving revision 1.4.2.7 diff -C2 -d -r1.4.2.6 -r1.4.2.7 *** WarningOverlay.cpp 17 Apr 2008 10:51:10 -0000 1.4.2.6 --- WarningOverlay.cpp 17 Apr 2008 22:18:30 -0000 1.4.2.7 *************** *** 125,145 **** } void WarningOverlay::MouseMovedCallback(Element *element, void *ref) { ! WarningOverlay *overlay = reinterpret_cast<WarningOverlay*>(ref); long index; ! if(element->IsOverWarning(overlay->_point, overlay->_view->GetScale())) { // On warning if(overlay->_popWindow == NULL) ! overlay->RaiseWarningWindow(element, overlay->_view, kWarningOnly, overlay->_point); ! overlay->_oneFound = true; } ! else if(element->IsOverOverlap(overlay->_point, overlay->_scale, index)) { if(overlay->_popWindow == NULL) ! overlay->RaiseWarningWindow(element, overlay->_view, kOverlapOnly, overlay->_point, index); ! overlay->_oneFound = true; } } --- 125,159 ---- } + typedef struct + { + bool oneFound; // For callback + planPoint_t point; // For callback + WarningOverlay *overlay; + PlanView *view; + } mmcall_t; + void WarningOverlay::MouseMovedCallback(Element *element, void *ref) { ! mmcall_t *info = reinterpret_cast<mmcall_t*>(ref); ! WarningOverlay *overlay = info->overlay; ! PlanView *view = info->view; long index; + + PRECONDITION(info != NULL); + PRECONDITION(overlay != NULL); + PRECONDITION(view != NULL); ! if(element->IsOverWarning(info->point, overlay->_scale)) { // On warning if(overlay->_popWindow == NULL) ! overlay->RaiseWarningWindow(element, view, kWarningOnly, info->point); ! info->oneFound = true; } ! else if(element->IsOverOverlap(info->point, overlay->_scale, index)) { if(overlay->_popWindow == NULL) ! overlay->RaiseWarningWindow(element, view, kOverlapOnly, info->point, index); ! info->oneFound = true; } } *************** *** 152,166 **** { planRectangle_t rect; ! rect.xOffset = point.xOffset - (20*_scale); ! rect.xSize = (40*_scale); ! rect.yOffset = point.yOffset - (20*_scale); ! rect.ySize = (40*_scale); ! _oneFound = false; ! _point = point; ! _view->GetLayout()->ExecuteForEachElementWithin(MouseMovedCallback, this, rect); ! if(!_oneFound) RemoveWarningWindow(); } --- 166,184 ---- { planRectangle_t rect; ! mmcall_t cbInfo; ! ! rect.xOffset = point.xOffset - (kIconWidth*_scale); ! rect.xSize = (kIconWidth*2*_scale); ! rect.yOffset = point.yOffset - (kIconHeight*_scale); ! rect.ySize = (kIconHeight*2*_scale); ! cbInfo.oneFound = false; ! cbInfo.point = point; ! cbInfo.overlay = this; ! cbInfo.view = _view; ! _view->GetLayout()->ExecuteForEachElementWithin(MouseMovedCallback, &cbInfo, rect); ! if(!cbInfo.oneFound) RemoveWarningWindow(); } |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-17 22:19:24
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8869/source/LayoutDB Modified Files: Tag: Release_branch_v1 MaterialRef.cpp Log Message: Fixes to overlap warnings Index: MaterialRef.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialRef.cpp,v retrieving revision 1.119.2.33 retrieving revision 1.119.2.34 diff -C2 -d -r1.119.2.33 -r1.119.2.34 *** MaterialRef.cpp 8 Apr 2008 22:26:50 -0000 1.119.2.33 --- MaterialRef.cpp 17 Apr 2008 22:18:41 -0000 1.119.2.34 *************** *** 1043,1049 **** break; } ! otherDistance = testMaterialRef->GetMinimumSpacing(); ! if(otherDistance < distance) ! distance = otherDistance; } testPath = testPathElem->GetPath(); --- 1043,1047 ---- break; } ! distance = (distance + otherDistance)/2; } testPath = testPathElem->GetPath(); *************** *** 1081,1084 **** --- 1079,1083 ---- testElement->NoteOverlap(overlapPoint, (action==kAddingElement), overlapType); } + NoteOverlap(overlapPoint, false, overlapType); } } |
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20763/source/LayoutDB Modified Files: Tag: Release_branch_v1 PathElement.h Element.h Path.cpp PointPath.cpp PointPath.h PathElement.cpp Log Message: Fixed the display of plan warnings overlap warning didn't take plan scale into account plant size warning flickered Index: PathElement.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/PathElement.h,v retrieving revision 1.35.2.1 retrieving revision 1.35.2.2 diff -C2 -d -r1.35.2.1 -r1.35.2.2 *** PathElement.h 26 Mar 2008 22:18:40 -0000 1.35.2.1 --- PathElement.h 17 Apr 2008 10:50:59 -0000 1.35.2.2 *************** *** 65,69 **** virtual void DrawAnchorPoints(PlanView* intoView); #pragma mark Overlap ! virtual bool IsOverOverlap(planPoint_t point, long &outIndex); #pragma mark Warnings virtual bool IsOverWarning(planPoint_t point, planScale_t scale); --- 65,69 ---- virtual void DrawAnchorPoints(PlanView* intoView); #pragma mark Overlap ! virtual bool IsOverOverlap(planPoint_t point, planScale_t scale, long &outIndex); #pragma mark Warnings virtual bool IsOverWarning(planPoint_t point, planScale_t scale); Index: Path.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Path.cpp,v retrieving revision 1.67.2.8 retrieving revision 1.67.2.9 diff -C2 -d -r1.67.2.8 -r1.67.2.9 *** Path.cpp 16 Apr 2008 11:33:57 -0000 1.67.2.8 --- Path.cpp 17 Apr 2008 10:51:00 -0000 1.67.2.9 *************** *** 868,875 **** else ClearElementPoints(); } else PlaceElementsAlongPath(); ! // Don't do for group paths if(dynamic_cast<GroupPath*>(this) == NULL) --- 868,897 ---- else ClearElementPoints(); + + if(_owningElement->HasMaterials()) + { + if(GetNumItemPoints() != 0) + _owningElement->RemoveWarning(kNoSpread); + else if(!IsOpenPath()) + _owningElement->AddWarning(kNoSpread); + } } else + { + MaterialRef *ref = dynamic_cast<MaterialRef*>(_owningElement); PlaceElementsAlongPath(); ! if(ref != NULL) ! { ! landscapeHeight_t height; ! planLength_t spread; ! ! ref->GetLatestPlantDimensions(&height, &spread ); ! if(spread > 0.0) ! _owningElement->RemoveWarning(kNoSpread); ! else ! _owningElement->AddWarning(kNoSpread); ! } ! } ! // Don't do for group paths if(dynamic_cast<GroupPath*>(this) == NULL) *************** *** 885,895 **** _owningElement->TransferAllElementsFromUnusedLayer(true); } - if(_owningElement->HasMaterials()) - { - if(newCount != 0) - _owningElement->RemoveWarning(kNoSpread); - else if(!IsFilledPath() || !IsOpenPath()) - _owningElement->AddWarning(kNoSpread); - } } } --- 907,910 ---- Index: Element.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Element.h,v retrieving revision 1.38.2.10 retrieving revision 1.38.2.11 diff -C2 -d -r1.38.2.10 -r1.38.2.11 *** Element.h 26 Mar 2008 22:23:10 -0000 1.38.2.10 --- Element.h 17 Apr 2008 10:51:00 -0000 1.38.2.11 *************** *** 162,166 **** virtual void Draw(PlanView* view) = 0; #pragma mark Overlap ! virtual bool IsOverOverlap(planPoint_t /*point*/, long & /*outIndex*/) { return false; } virtual bool TestOverlap(Element* testElement, overlapAction_t action); virtual void NoteOverlap(planPoint_t aPoint, bool isPresent, overlapResult_t overlapType); --- 162,166 ---- virtual void Draw(PlanView* view) = 0; #pragma mark Overlap ! virtual bool IsOverOverlap(planPoint_t /*point*/, planScale_t /*scale*/, long & /*outIndex*/) { return false; } virtual bool TestOverlap(Element* testElement, overlapAction_t action); virtual void NoteOverlap(planPoint_t aPoint, bool isPresent, overlapResult_t overlapType); Index: PointPath.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/PointPath.cpp,v retrieving revision 1.21.2.5 retrieving revision 1.21.2.6 diff -C2 -d -r1.21.2.5 -r1.21.2.6 *** PointPath.cpp 16 Apr 2008 02:47:16 -0000 1.21.2.5 --- PointPath.cpp 17 Apr 2008 10:51:01 -0000 1.21.2.6 *************** *** 199,214 **** // --------------------------------------------------------------------------- - /// RecalculateElementPoints - /// Recalculates all of the computed item points to maintain minimum distances. - // - void PointPath::RecalculateElementPoints() - { - ClearElementPoints(); - if(GetNumAnchorPoints() != 0) - AddElementPoint(GetIndexedAnchorPoint(0)); - } - - - // --------------------------------------------------------------------------- /// PathLength /// For open paths, returns the length of the path in sample units. For closed paths, return 0. --- 199,202 ---- *************** *** 300,303 **** --- 288,292 ---- { PRECONDITION(GetNumAnchorPoints() == 1); + ClearElementPoints(); AddElementPoint(GetIndexedAnchorPoint(0)); } Index: PathElement.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/PathElement.cpp,v retrieving revision 1.40.2.4 retrieving revision 1.40.2.5 diff -C2 -d -r1.40.2.4 -r1.40.2.5 *** PathElement.cpp 26 Mar 2008 22:18:45 -0000 1.40.2.4 --- PathElement.cpp 17 Apr 2008 10:51:06 -0000 1.40.2.5 *************** *** 399,403 **** /// Is the specified planPoint over an area where plants overlap. // ! bool PathElement::IsOverOverlap(planPoint_t point, long &outIndex) { bool result; --- 399,403 ---- /// Is the specified planPoint over an area where plants overlap. // ! bool PathElement::IsOverOverlap(planPoint_t point, planScale_t scale, long &outIndex) { bool result; *************** *** 411,418 **** { aPoint = GetIndexedOverlapPoint(n); ! upperLeft.xOffset = aPoint.xOffset - (kIconWidth/2); ! upperLeft.yOffset = aPoint.yOffset + (kIconHeight/2); ! lowerRight.xOffset = aPoint.xOffset + (kIconWidth/2); ! lowerRight.yOffset = aPoint.yOffset - (kIconHeight/2); if((point.xOffset >= upperLeft.xOffset) && (point.xOffset <= lowerRight.xOffset) && (point.yOffset >= lowerRight.yOffset) && (point.yOffset <= upperLeft.yOffset)) --- 411,423 ---- { aPoint = GetIndexedOverlapPoint(n); ! upperLeft.xOffset = aPoint.xOffset - (kIconWidth*scale/2); ! upperLeft.yOffset = aPoint.yOffset + (kIconHeight*scale/2); ! lowerRight.xOffset = aPoint.xOffset + (kIconWidth*scale/2); ! lowerRight.yOffset = aPoint.yOffset - (kIconHeight*scale/2); ! ! // printf("point = %f,%f\n", point.xOffset, point.yOffset); ! // printf("upperLeft = %f,%f\n", upperLeft.xOffset, upperLeft.yOffset); ! // printf("lowerRight = %f,%f\n", lowerRight.xOffset, lowerRight.yOffset); ! if((point.xOffset >= upperLeft.xOffset) && (point.xOffset <= lowerRight.xOffset) && (point.yOffset >= lowerRight.yOffset) && (point.yOffset <= upperLeft.yOffset)) Index: PointPath.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/PointPath.h,v retrieving revision 1.16.2.2 retrieving revision 1.16.2.3 diff -C2 -d -r1.16.2.2 -r1.16.2.3 *** PointPath.h 16 Apr 2008 02:47:17 -0000 1.16.2.2 --- PointPath.h 17 Apr 2008 10:51:03 -0000 1.16.2.3 *************** *** 59,63 **** virtual double ComputeArea() { return 0.0; } virtual void PlaceElementsAlongPath(); - virtual void RecalculateElementPoints(); virtual bool AllowResizableNonPlantItems() { return true; } --- 59,62 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-17 10:52:07
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20763/source/PlanTool Modified Files: Tag: Release_branch_v1 WarningOverlay.cpp WarningOverlay.h Log Message: Fixed the display of plan warnings overlap warning didn't take plan scale into account plant size warning flickered Index: WarningOverlay.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/WarningOverlay.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** WarningOverlay.h 24 Jan 2005 12:38:05 -0000 1.1 --- WarningOverlay.h 17 Apr 2008 10:51:12 -0000 1.1.2.1 *************** *** 51,57 **** --- 51,60 ---- void RaiseWarningWindow(Element *elem, PlanView* parent, infoPopupType_t type, planPoint_t point, long index = 0); void RemoveWarningWindow(); + static void MouseMovedCallback(Element *element, void *ref); yaaf::InfoPopupView* _curInfoView; yaaf::XGPopWindow* _popWindow; + bool _oneFound; // For callback + planPoint_t _point; // For callback }; Index: WarningOverlay.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/WarningOverlay.cpp,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -C2 -d -r1.4.2.5 -r1.4.2.6 *** WarningOverlay.cpp 19 Mar 2008 01:57:32 -0000 1.4.2.5 --- WarningOverlay.cpp 17 Apr 2008 10:51:10 -0000 1.4.2.6 *************** *** 125,128 **** --- 125,148 ---- } + void WarningOverlay::MouseMovedCallback(Element *element, void *ref) + { + WarningOverlay *overlay = reinterpret_cast<WarningOverlay*>(ref); + long index; + + if(element->IsOverWarning(overlay->_point, overlay->_view->GetScale())) + { + // On warning + if(overlay->_popWindow == NULL) + overlay->RaiseWarningWindow(element, overlay->_view, kWarningOnly, overlay->_point); + overlay->_oneFound = true; + } + else if(element->IsOverOverlap(overlay->_point, overlay->_scale, index)) + { + if(overlay->_popWindow == NULL) + overlay->RaiseWarningWindow(element, overlay->_view, kOverlapOnly, overlay->_point, index); + overlay->_oneFound = true; + } + } + //---------------------------------------------------- // void WarningOverlay::MouseMoved( planPoint_t point ) *************** *** 131,173 **** void WarningOverlay::MouseMoved(planPoint_t point) { ! long n, count; ! Element *elem; ! bool found, oneFound = false; ! XGDynArray<Element*> results; ! found = _view->GetLayout()->GetElementsAtPoint(point, _view, results); ! if(found && results.Length() != 0) ! { ! count = results.Length(); ! for(n = 0; n < count; n++) ! { ! elem = results[n]; ! // printf("over item %ld,%ld\n", point.xOffset, point.yOffset); ! if(elem->IsOverWarning(point, _view->GetScale())) ! { ! // On warning ! RaiseWarningWindow(elem, _view, kWarningOnly, point); ! oneFound = true; ! } ! } ! ! if(!oneFound) ! { ! for(n = 0; n < count; n++) ! { ! long index; ! ! elem = results[n]; ! if(elem->IsOverOverlap(point, index)) ! { ! RaiseWarningWindow(elem, _view, kOverlapOnly, point, index); ! oneFound = true; ! } ! } ! if(!oneFound) ! RemoveWarningWindow(); ! } ! } ! else RemoveWarningWindow(); } --- 151,166 ---- void WarningOverlay::MouseMoved(planPoint_t point) { ! planRectangle_t rect; ! rect.xOffset = point.xOffset - (20*_scale); ! rect.xSize = (40*_scale); ! rect.yOffset = point.yOffset - (20*_scale); ! rect.ySize = (40*_scale); ! _oneFound = false; ! _point = point; ! ! _view->GetLayout()->ExecuteForEachElementWithin(MouseMovedCallback, this, rect); ! ! if(!_oneFound) RemoveWarningWindow(); } |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-17 10:44:32
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15194/source/Document Modified Files: Tag: Release_branch_v1 CPlanPanel.h CPlanPanel.cpp Log Message: Add switch to enable/disable plan warnings Index: CPlanPanel.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CPlanPanel.h,v retrieving revision 1.12.2.4 retrieving revision 1.12.2.5 diff -C2 -d -r1.12.2.4 -r1.12.2.5 *** CPlanPanel.h 8 Mar 2008 04:14:24 -0000 1.12.2.4 --- CPlanPanel.h 17 Apr 2008 10:44:21 -0000 1.12.2.5 *************** *** 49,52 **** --- 49,53 ---- const long kMenuToolsUngroup = 1114; const long kMenuToolsStyle = 1115; + const long kMenuToolsShowWarnings = 1116; const long kMenuToolsBasePlotName = 1150; Index: CPlanPanel.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CPlanPanel.cpp,v retrieving revision 1.4.2.8 retrieving revision 1.4.2.9 diff -C2 -d -r1.4.2.8 -r1.4.2.9 *** CPlanPanel.cpp 29 Mar 2008 20:23:49 -0000 1.4.2.8 --- CPlanPanel.cpp 17 Apr 2008 10:44:23 -0000 1.4.2.9 *************** *** 72,75 **** --- 72,76 ---- #include "DynamicCursor.h" #include "RGGLSVGDraw.h" + #include "WarningOverlay.h" using namespace yaaf; *************** *** 255,258 **** --- 256,261 ---- theLayout->GetCurrentPlot()->SendMessage(kModifyPlotInfoMsg,0,this); + _planView->FindOverlay(warningOverlayID)->EnableOverlay(prefs->GetBoolPref(kPlanShowWarningsState)); + RebuildPlotMenu(); RecalculateDisplay(); *************** *** 508,511 **** --- 511,525 ---- break; + + case kMenuToolsShowWarnings: + m->enable = state != NULL; + if(m->enable) + { + m->check = state->GetBoolPref(kPlanShowWarningsState); + m->mark = KXGCheckmark; + } + return 0; + break; + case kMenuToolsAddLayer: case kMenuToolsEditLayers: *************** *** 605,608 **** --- 619,623 ---- long n, count; SelectedElements *select; + DocumentTags *state; PRECONDITION(_planView != NULL); *************** *** 613,616 **** --- 628,633 ---- layout = _parentDoc->GetLayout(); PRECONDITION(layout != NULL); + state = GetActiveSavedState(_parentDoc->GetFile()); + PRECONDITION(state != NULL); switch (arg) *************** *** 733,745 **** break; case kMenuToolsShowFullGrown: - DocumentTags *state; ! state = GetActiveSavedState(_parentDoc->GetFile()); ! if(state != NULL) ! { ! state->ToggleBoolPref(kPlanFullSize); ! _planView->InvalView(); ! } break; --- 750,764 ---- break; + case kMenuToolsShowWarnings: + state->ToggleBoolPref(kPlanShowWarningsState); + _planView->FindOverlay(warningOverlayID)->EnableOverlay(state->GetBoolPref(kPlanShowWarningsState)); + return 0; + break; + + case kMenuToolsShowFullGrown: ! state->ToggleBoolPref(kPlanFullSize); ! _planView->InvalView(); break; |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-17 10:43:00
|
Update of /cvsroot/igarden/Garden/source/resources/fr.lproj In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12821/source/resources/fr.lproj Modified Files: Tag: Release_branch_v1 GardenLocal.rsrc Log Message: Add switch to enable/disable plan warnings Index: GardenLocal.rsrc =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/fr.lproj/GardenLocal.rsrc,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 Binary files /tmp/cvsYY5Lzt and /tmp/cvskGWWHV differ |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-17 10:43:00
|
Update of /cvsroot/igarden/Garden/source/Preferences In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12821/source/Preferences Modified Files: Tag: Release_branch_v1 GlobalTags.cpp PersistentTags.h PersistentTags.cpp Log Message: Add switch to enable/disable plan warnings Index: GlobalTags.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Preferences/GlobalTags.cpp,v retrieving revision 1.9.2.8 retrieving revision 1.9.2.9 diff -C2 -d -r1.9.2.8 -r1.9.2.9 *** GlobalTags.cpp 5 Apr 2008 23:07:01 -0000 1.9.2.8 --- GlobalTags.cpp 17 Apr 2008 10:42:10 -0000 1.9.2.9 *************** *** 72,75 **** --- 72,78 ---- listFontSize = _newPrefs->GetInteger(vc->FieldName(kListFontSizePref), defaultListFontSize); _newPrefs->SetInteger(vc->FieldName(kListFontSizePref), listFontSize); + + oldValue = _newPrefs->GetBoolean(vc->FieldName(kPlanShowWarningsState), true); + _newPrefs->SetBoolean(vc->FieldName(kPlanShowWarningsState), oldValue); _inCopyAway = false; Index: PersistentTags.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Preferences/PersistentTags.h,v retrieving revision 1.11.2.7 retrieving revision 1.11.2.8 diff -C2 -d -r1.11.2.7 -r1.11.2.8 *** PersistentTags.h 23 Feb 2008 18:51:58 -0000 1.11.2.7 --- PersistentTags.h 17 Apr 2008 10:42:11 -0000 1.11.2.8 *************** *** 68,72 **** kCurrentIDState, kPaletteIndexState, ! kPaletteGroupState } stateTags_t; --- 68,73 ---- kCurrentIDState, kPaletteIndexState, ! kPaletteGroupState, ! kPlanShowWarningsState } stateTags_t; Index: PersistentTags.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Preferences/PersistentTags.cpp,v retrieving revision 1.12.2.8 retrieving revision 1.12.2.9 diff -C2 -d -r1.12.2.8 -r1.12.2.9 *** PersistentTags.cpp 23 Feb 2008 18:51:58 -0000 1.12.2.8 --- PersistentTags.cpp 17 Apr 2008 10:42:13 -0000 1.12.2.9 *************** *** 149,153 **** vc3->AddProperty(kCurrentIDState, "CurrentIDState", kStringField); vc3->AddProperty(kPaletteIndexState, "PaletteIndexState", kIntegerField); ! vc3->AddProperty(kPaletteGroupState, "PaletteGroupState", kIntegerField); } --- 149,154 ---- vc3->AddProperty(kCurrentIDState, "CurrentIDState", kStringField); vc3->AddProperty(kPaletteIndexState, "PaletteIndexState", kIntegerField); ! vc3->AddProperty(kPaletteGroupState, "PaletteGroupState", kIntegerField); ! vc3->AddProperty(kPlanShowWarningsState, "ShowPlanWarnings", kBoolField); } |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-17 10:42:23
|
Update of /cvsroot/igarden/Garden/source/resources/English.lproj In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12821/source/resources/English.lproj Modified Files: Tag: Release_branch_v1 GardenLocal.rsrc Log Message: Add switch to enable/disable plan warnings Index: GardenLocal.rsrc =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/English.lproj/Attic/GardenLocal.rsrc,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 Binary files /tmp/cvsxfzDx7 and /tmp/cvsGJhuft differ |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 11:33:53
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15171/source/LayoutDB Modified Files: Tag: Release_branch_v1 Path.cpp Log Message: Fix a spurious warning message Index: Path.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Path.cpp,v retrieving revision 1.67.2.7 retrieving revision 1.67.2.8 diff -C2 -d -r1.67.2.7 -r1.67.2.8 *** Path.cpp 26 Mar 2008 22:18:38 -0000 1.67.2.7 --- Path.cpp 16 Apr 2008 11:33:57 -0000 1.67.2.8 *************** *** 889,893 **** if(newCount != 0) _owningElement->RemoveWarning(kNoSpread); ! else _owningElement->AddWarning(kNoSpread); } --- 889,893 ---- if(newCount != 0) _owningElement->RemoveWarning(kNoSpread); ! else if(!IsFilledPath() || !IsOpenPath()) _owningElement->AddWarning(kNoSpread); } |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 11:33:08
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14991/source/LayoutDB Modified Files: Tag: Release_branch_v1 Element.cpp Log Message: Prevent an identical warning from being raised multiple times on the same plan Index: Element.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Element.cpp,v retrieving revision 1.40.2.9 retrieving revision 1.40.2.10 diff -C2 -d -r1.40.2.9 -r1.40.2.10 *** Element.cpp 16 Apr 2008 10:20:58 -0000 1.40.2.9 --- Element.cpp 16 Apr 2008 11:33:11 -0000 1.40.2.10 *************** *** 605,616 **** { warningEntry_t entry; ! entry._warningType = wtype; ! entry._acknowledged = acknowledged; ! if(str != NULL) ! entry._value = new String(str); ! else ! entry._value = NULL; ! _warnings.push_back(entry); } --- 605,635 ---- { warningEntry_t entry; + long i, count; + bool found; ! count = NumWarnings(); ! for(i =0,found = false; i < count && !found; i++) ! { ! if(wtype == GetIndexedWarningType(i)) ! { ! String msg; ! bool hasMsg = GetIndexedWarningMessage(i, msg); ! if(str == NULL) ! found = true; ! else if(hasMsg && (str != NULL) && String(str) == msg) ! found = true; ! } ! } ! ! if(!found) ! { ! entry._warningType = wtype; ! entry._acknowledged = acknowledged; ! if(str != NULL) ! entry._value = new String(str); ! else ! entry._value = NULL; ! _warnings.push_back(entry); ! } } |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 10:20:55
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7350/source/LayoutDB Modified Files: Tag: Release_branch_v1 Element.cpp Log Message: Fix problem reading overlap warnings from documents Index: Element.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Element.cpp,v retrieving revision 1.40.2.8 retrieving revision 1.40.2.9 diff -C2 -d -r1.40.2.8 -r1.40.2.9 *** Element.cpp 26 Mar 2008 22:23:05 -0000 1.40.2.8 --- Element.cpp 16 Apr 2008 10:20:58 -0000 1.40.2.9 *************** *** 257,312 **** } } ! } ! ! stringObj = dynamic_cast<XGXMLStringData*>(obj); ! if(stringObj != NULL) ! { ! overlapPoint_t pointData; ! ! // <Element>[2074,2326,0], [220,220,0]</Element> ! // ! val = stringObj->GetValue(); ! for(ptr = val; ptr != NULL; ) { ! StringToPlanPoint(ptr, pointData.point); ! ptr = strchr(ptr, ']'); ! if(ptr != NULL) { ! ptr++; ! if(*ptr == '(') // Newer format { ! ptr++; ! if(CIstrncmp(ptr, "Current", 7) == 0) ! { ! pointData.style = kBeyondCurrentSize; ! ptr += 7; ! } ! else if(CIstrncmp(ptr, "Trunk", 5) == 0) ! { ! pointData.style = kBeyondTrunk; ! ptr += 5; ! } ! else if(CIstrncmp(ptr, "All", 3) == 0) { - pointData.style = kAllOverlap; - ptr += 3; - } - else - pointData.style = kBeyondMaximumGrowth; - if(CIstrncmp(ptr, "/Ack", 3) == 0) - pointData.ack = true; - else - pointData.ack = false; - while(*ptr != ',' && *ptr != ' ') ptr++; } - else - pointData.style = kBeyondMaximumGrowth; - while(*ptr == ',' || *ptr == ' ') - ptr++; - if(*ptr == '\0') - ptr = NULL; } - _overlapPoints.push_back(pointData); } } --- 257,314 ---- } } ! else if(strcmp(dataObj->GetTag(), "Overlap") == 0) { ! stringObj = dynamic_cast<XGXMLStringData*>(dataObj->GetChild()); ! if(stringObj != NULL) { ! overlapPoint_t pointData; ! ! // <Element>[2074,2326,0], [220,220,0]</Element> ! // ! val = stringObj->GetValue(); ! for(ptr = val; ptr != NULL; ) { ! StringToPlanPoint(ptr, pointData.point); ! ptr = strchr(ptr, ']'); ! if(ptr != NULL) { ptr++; + if(*ptr == '(') // Newer format + { + ptr++; + if(CIstrncmp(ptr, "Current", 7) == 0) + { + pointData.style = kBeyondCurrentSize; + ptr += 7; + } + else if(CIstrncmp(ptr, "Trunk", 5) == 0) + { + pointData.style = kBeyondTrunk; + ptr += 5; + } + else if(CIstrncmp(ptr, "All", 3) == 0) + { + pointData.style = kAllOverlap; + ptr += 3; + } + else + pointData.style = kBeyondMaximumGrowth; + if(CIstrncmp(ptr, "/Ack", 3) == 0) + pointData.ack = true; + else + pointData.ack = false; + while(*ptr != ',' && *ptr != ' '&& *ptr != '\0') + ptr++; + } + else + pointData.style = kBeyondMaximumGrowth; + while(*ptr == ',' || *ptr == ' ') + ptr++; + if(*ptr == '\0') + ptr = NULL; + } + _overlapPoints.push_back(pointData); } } } } |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 10:19:25
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6603/source/PlanTool Modified Files: Tag: Release_branch_v1 ArcTool.cpp Log Message: Fix problem with overlap warnings not showing up on material add Index: ArcTool.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/ArcTool.cpp,v retrieving revision 1.6.2.6 retrieving revision 1.6.2.7 diff -C2 -d -r1.6.2.6 -r1.6.2.7 *** ArcTool.cpp 24 Feb 2008 23:23:26 -0000 1.6.2.6 --- ArcTool.cpp 16 Apr 2008 10:19:27 -0000 1.6.2.7 *************** *** 106,112 **** newElem = _associatedPlanTool->CreatePathElement(view, _curPath); AddElementToAction(newElem); FinishAndPostAction(wview); - _curPath->RecalculateElementPoints(); _initial = true; _curPath = NULL; --- 106,112 ---- newElem = _associatedPlanTool->CreatePathElement(view, _curPath); + _curPath->RecalculateElementPoints(); AddElementToAction(newElem); FinishAndPostAction(wview); _initial = true; _curPath = NULL; |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 10:18:57
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5999/source/PlanTool Modified Files: Tag: Release_branch_v1 CircleTool.cpp Log Message: Fix problem with overlap warnings not showing up on material add Index: CircleTool.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/CircleTool.cpp,v retrieving revision 1.5.2.5 retrieving revision 1.5.2.6 diff -C2 -d -r1.5.2.5 -r1.5.2.6 *** CircleTool.cpp 24 Feb 2008 23:23:26 -0000 1.5.2.5 --- CircleTool.cpp 16 Apr 2008 10:19:00 -0000 1.5.2.6 *************** *** 87,93 **** newElem = _associatedPlanTool->CreatePathElement(view, _curPath); AddElementToAction(newElem); FinishAndPostAction(wview); - _curPath->RecalculateElementPoints(); _initial = true; _curPath = NULL; --- 87,93 ---- newElem = _associatedPlanTool->CreatePathElement(view, _curPath); + _curPath->RecalculateElementPoints(); AddElementToAction(newElem); FinishAndPostAction(wview); _initial = true; _curPath = NULL; |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 10:17:16
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5166/source/PlanTool Modified Files: Tag: Release_branch_v1 LineTool.cpp Log Message: Fix problem with overlap warnings not showing up on material add Index: LineTool.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/LineTool.cpp,v retrieving revision 1.10.2.4 retrieving revision 1.10.2.5 diff -C2 -d -r1.10.2.4 -r1.10.2.5 *** LineTool.cpp 24 Feb 2008 23:23:44 -0000 1.10.2.4 --- LineTool.cpp 16 Apr 2008 10:17:16 -0000 1.10.2.5 *************** *** 120,126 **** MEMCHECK(path); newElem = _associatedPlanTool->CreatePathElement(view, path); AddElementToAction(newElem); FinishAndPostAction(view2); - path->RecalculateElementPoints(); _initial = true; StopDynamicCursor(); --- 120,126 ---- MEMCHECK(path); newElem = _associatedPlanTool->CreatePathElement(view, path); + path->RecalculateElementPoints(); AddElementToAction(newElem); FinishAndPostAction(view2); _initial = true; StopDynamicCursor(); |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 10:16:25
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4516/source/PlanTool Modified Files: Tag: Release_branch_v1 FreehandTool.cpp Log Message: Fix problem with overlap warnings not showing up on material add Index: FreehandTool.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/FreehandTool.cpp,v retrieving revision 1.20.2.5 retrieving revision 1.20.2.6 diff -C2 -d -r1.20.2.5 -r1.20.2.6 *** FreehandTool.cpp 24 Feb 2008 23:27:11 -0000 1.20.2.5 --- FreehandTool.cpp 16 Apr 2008 10:16:26 -0000 1.20.2.6 *************** *** 177,185 **** StartAction(action); newElem = _associatedPlanTool->CreatePathElement(view, _path); AddElementToAction(newElem); FinishAndPostAction(view2); if(!view->TestLastEventModifier(kModOptionDown)) _path->Smooth(1, 0); - _path->RecalculateElementPoints(); _initial = true; StopDynamicCursor(); --- 177,185 ---- StartAction(action); newElem = _associatedPlanTool->CreatePathElement(view, _path); + _path->RecalculateElementPoints(); AddElementToAction(newElem); FinishAndPostAction(view2); if(!view->TestLastEventModifier(kModOptionDown)) _path->Smooth(1, 0); _initial = true; StopDynamicCursor(); |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 10:15:28
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3943/source/PlanTool Modified Files: Tag: Release_branch_v1 RectangleTool.cpp Log Message: Fix problem with overlap warnings not showing up on material add Index: RectangleTool.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/RectangleTool.cpp,v retrieving revision 1.10.2.5 retrieving revision 1.10.2.6 diff -C2 -d -r1.10.2.5 -r1.10.2.6 *** RectangleTool.cpp 24 Feb 2008 23:24:06 -0000 1.10.2.5 --- RectangleTool.cpp 16 Apr 2008 10:15:22 -0000 1.10.2.6 *************** *** 157,163 **** MEMCHECK(path); newElem = _associatedPlanTool->CreatePathElement(view, path); AddElementToAction(newElem); FinishAndPostAction(wview); - path->RecalculateElementPoints(); _initial = true; _rotatedRect = false; --- 157,163 ---- MEMCHECK(path); newElem = _associatedPlanTool->CreatePathElement(view, path); + path->RecalculateElementPoints(); AddElementToAction(newElem); FinishAndPostAction(wview); _initial = true; _rotatedRect = false; *************** *** 243,249 **** MEMCHECK(path); newElem = _associatedPlanTool->CreatePathElement(view, path); AddElementToAction(newElem); FinishAndPostAction(wview); - path->RecalculateElementPoints(); _initial = true; _rotatedRect = false; --- 243,249 ---- MEMCHECK(path); newElem = _associatedPlanTool->CreatePathElement(view, path); + path->RecalculateElementPoints(); AddElementToAction(newElem); FinishAndPostAction(wview); _initial = true; _rotatedRect = false; |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 02:50:15
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4320/source/Document Modified Files: Tag: Release_branch_v1 ClientDocument.cpp Log Message: Fix newly introduced bug where extra plot got created on file open Index: ClientDocument.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/ClientDocument.cpp,v retrieving revision 1.6.2.10 retrieving revision 1.6.2.11 diff -C2 -d -r1.6.2.10 -r1.6.2.11 *** ClientDocument.cpp 11 Apr 2008 10:40:23 -0000 1.6.2.10 --- ClientDocument.cpp 16 Apr 2008 02:50:03 -0000 1.6.2.11 *************** *** 370,374 **** _isNamed = true; ! _layout = new Layout(this); ReadPictureData(inZipFile); --- 370,374 ---- _isNamed = true; ! _layout = new Layout(); ReadPictureData(inZipFile); *************** *** 392,396 **** _isNamed = true; ! _layout = new Layout(this); bytesRead = inFile.Read(sizeof(buf), buf); --- 392,396 ---- _isNamed = true; ! _layout = new Layout(); bytesRead = inFile.Read(sizeof(buf), buf); *************** *** 1088,1092 **** bool found = false; - PRECONDITION(_layout != NULL); if(strcmp(data->GetTag(), "Layout") == 0) { --- 1088,1091 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 02:48:42
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3041/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGTableView.cpp Log Message: Clean up printing of tables Index: RGTableView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableView.cpp,v retrieving revision 1.28.2.37 retrieving revision 1.28.2.38 diff -C2 -d -r1.28.2.37 -r1.28.2.38 *** RGTableView.cpp 12 Apr 2008 22:41:01 -0000 1.28.2.37 --- RGTableView.cpp 16 Apr 2008 02:48:35 -0000 1.28.2.38 *************** *** 1465,1468 **** --- 1465,1469 ---- { rt = hdr; + rt.left = rightEdge+1; draw.EraseRect(rt); *************** *** 1542,1550 **** draw.ClipRect(&body); // if(ix == 0) { draw.SetForeColor(KXGColorBlack); draw.MoveTo(body.left, t); ! draw.LineTo(rightEdge, t); } //*** --- 1543,1558 ---- draw.ClipRect(&body); // + long newRight; + + if(rightEdge < body.right) + newRight = rightEdge; + else + newRight = body.right; + if(ix == 0) { draw.SetForeColor(KXGColorBlack); draw.MoveTo(body.left, t); ! draw.LineTo(newRight, t); } //*** *************** *** 1556,1560 **** draw.SetForeColor(KXGColorBlack); draw.MoveTo(body.left, b-1); ! draw.LineTo(rightEdge, b-1); draw.SetPenWidth(1); } --- 1564,1568 ---- draw.SetForeColor(KXGColorBlack); draw.MoveTo(body.left, b-1); ! draw.LineTo(newRight, b-1); draw.SetPenWidth(1); } *************** *** 1563,1578 **** draw.SetForeColor(KXGColorBlack); draw.MoveTo(body.left, b-1); ! draw.LineTo(rightEdge, b-1); } } else { - long newRight; - - if(rightEdge < body.right) - newRight = rightEdge; - else - newRight = body.right; - if(rrec->drawBottomLine) { --- 1571,1579 ---- draw.SetForeColor(KXGColorBlack); draw.MoveTo(body.left, b-1); ! draw.LineTo(newRight, b-1); } } else { if(rrec->drawBottomLine) { |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-16 02:47:24
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1886/source/LayoutDB Modified Files: Tag: Release_branch_v1 PointPath.cpp PointPath.h Log Message: Fix problem displaying the bounds of a point path Index: PointPath.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/PointPath.h,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.2 diff -C2 -d -r1.16.2.1 -r1.16.2.2 *** PointPath.h 26 Mar 2008 22:21:33 -0000 1.16.2.1 --- PointPath.h 16 Apr 2008 02:47:17 -0000 1.16.2.2 *************** *** 42,45 **** --- 42,46 ---- virtual void DrawCenterline(PlanView* view, lineType_t pattern); virtual void DrawDimensionLine(PlanView* view); + virtual void DrawBounds( PlanView* view); #pragma mark Test virtual bool IsOpenPath(); Index: PointPath.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/PointPath.cpp,v retrieving revision 1.21.2.4 retrieving revision 1.21.2.5 diff -C2 -d -r1.21.2.4 -r1.21.2.5 *** PointPath.cpp 26 Mar 2008 22:21:37 -0000 1.21.2.4 --- PointPath.cpp 16 Apr 2008 02:47:16 -0000 1.21.2.5 *************** *** 142,145 **** --- 142,155 ---- } + + // --------------------------------------------------------------------------- + /// DrawBounds + // + void PointPath::DrawBounds( PlanView* view) + { + DrawCenterline(view, kPlanStandardLine); + } + + #pragma mark Test |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-12 22:43:50
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26982/YAAFExtensions Modified Files: Tag: Release_branch_v1 TextEntryDialog.cpp TextEntryDialog.h Log Message: Add context menu (right-click) to text entry dialog Index: TextEntryDialog.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/TextEntryDialog.h,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -d -r1.4.2.3 -r1.4.2.4 *** TextEntryDialog.h 4 Mar 2008 13:34:42 -0000 1.4.2.3 --- TextEntryDialog.h 12 Apr 2008 22:43:45 -0000 1.4.2.4 *************** *** 48,51 **** --- 48,52 ---- virtual void OKClicked(XGDialog *dlog); virtual void SetAlternateExitKeys(const char*keys); + virtual void OtherEvent(XGDialog *dlog, long msg, long arg, void *parg); private: Index: TextEntryDialog.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/TextEntryDialog.cpp,v retrieving revision 1.5.2.5 retrieving revision 1.5.2.6 diff -C2 -d -r1.5.2.5 -r1.5.2.6 *** TextEntryDialog.cpp 4 Mar 2008 13:34:42 -0000 1.5.2.5 --- TextEntryDialog.cpp 12 Apr 2008 22:43:45 -0000 1.5.2.6 *************** *** 42,45 **** --- 42,46 ---- #include <xAppMenu.h> #include "MyAssert.h" + #include "RGContextMenu.h" const int kTextDialog = 141; *************** *** 56,59 **** --- 57,62 ---- using yaaf::XGAppSingleWindow; using yaaf::XGSMenuStatus; + using yaaf::RGContextMenu; + using yaaf::KRGAddToContextMenu; TextEntryDialog::TextEntryDialog() : RGDialog() *************** *** 162,165 **** --- 165,179 ---- } + void TextEntryDialog::OtherEvent(XGDialog *dlog, long msg, long arg, void *parg) + { + if(msg == KRGAddToContextMenu) + { + RGContextMenu *menu = reinterpret_cast<RGContextMenu*>(parg); + menu->AddItem(stx("Cut"), KXGEditCut); + menu->AddItem(stx("Copy"), KXGEditCopy); + menu->AddItem(stx("Paste"), KXGEditPaste); + } + } + long TextEntryDialog::DoDialog(const char *title, String& result, RGPDialogCallbackProc proc, void *parent, const char *exitChars) { |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-12 22:42:09
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25195/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGTableCell.cpp RGTableCell.h Log Message: Make sure that the elipses for over-long cell text get written Index: RGTableCell.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.h,v retrieving revision 1.23.2.11 retrieving revision 1.23.2.12 diff -C2 -d -r1.23.2.11 -r1.23.2.12 *** RGTableCell.h 8 Apr 2008 22:22:36 -0000 1.23.2.11 --- RGTableCell.h 12 Apr 2008 22:42:08 -0000 1.23.2.12 *************** *** 176,181 **** void InputError(const char *msg); ! static void DrawWrappedText(XGDraw &, titleJust_t, Rect &, char *text); ! static short SizeWrappedText(XGDraw &, Rect &, char *text); int GetRow(); --- 176,181 ---- void InputError(const char *msg); ! static void DrawWrappedText(XGDraw &, titleJust_t, Rect &, char *); ! static short SizeWrappedText(XGDraw &, Rect &, char *); int GetRow(); Index: RGTableCell.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.cpp,v retrieving revision 1.46.2.22 retrieving revision 1.46.2.23 diff -C2 -d -r1.46.2.22 -r1.46.2.23 *** RGTableCell.cpp 8 Apr 2008 22:22:36 -0000 1.46.2.22 --- RGTableCell.cpp 12 Apr 2008 22:42:07 -0000 1.46.2.23 *************** *** 56,59 **** --- 56,61 ---- const long kTableReadOnlyColor = RGB(0xFF,0xE0,0xE0); const long kTableGreyColor = RGB(0xF0,0xF0,0xF0); + const long kMaxTextLines = 3; + uint32 sFlexMenu = 0; *************** *** 1184,1188 **** } ! if(lineCount >= 3) break; } --- 1186,1190 ---- } ! if(lineCount >= kMaxTextLines) break; } *************** *** 1209,1212 **** --- 1211,1219 ---- while(*lineStart != 0) { + if((lineCount == (kMaxTextLines-1))) + { + w -= draw.StringWidth("..."); + } + for(next = lineStart; ; next++) { *************** *** 1216,1220 **** if(draw.StringWidth(lineStart, (next-lineStart)) + 4 > w) // If need to split a word { ! while(draw.StringWidth(lineStart, (next-lineStart)) + 4 > w) { wordSplit = true; --- 1223,1227 ---- if(draw.StringWidth(lineStart, (next-lineStart)) + 4 > w) // If need to split a word { ! while((next >= lineStart) && draw.StringWidth(lineStart, (next-lineStart)) + 4 > w) { wordSplit = true; *************** *** 1288,1295 **** break; } - - } ! if(lineCount >= 3) { draw.DrawString("...",3); --- 1295,1301 ---- break; } } ! ! if((strlen(lineStart) > 0) && (lineCount >= kMaxTextLines)) { draw.DrawString("...",3); |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-12 22:40:59
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24109/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGTableView.cpp Log Message: Cener columns header text vertically Index: RGTableView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableView.cpp,v retrieving revision 1.28.2.36 retrieving revision 1.28.2.37 diff -C2 -d -r1.28.2.36 -r1.28.2.37 *** RGTableView.cpp 11 Apr 2008 10:25:58 -0000 1.28.2.36 --- RGTableView.cpp 12 Apr 2008 22:41:01 -0000 1.28.2.37 *************** *** 1448,1452 **** Rect rtText = rt; ! rtText.top += draw.GetFontAscent(); RGTableCell::DrawWrappedText(draw,kCenterJust,rtText,buf); } --- 1448,1453 ---- Rect rtText = rt; ! // rtText.top += draw.GetFontAscent(); ! rtText.top += (_titleHeight - RGTableCell::SizeWrappedText(draw, rt, buf))/2; RGTableCell::DrawWrappedText(draw,kCenterJust,rtText,buf); } *************** *** 1483,1487 **** Rect cr; Rect s; ! Rect hdr, body; long t,b, i, numColumns; long ix; --- 1484,1488 ---- Rect cr; Rect s; ! Rect body; long t,b, i, numColumns; long ix; |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-12 22:40:13
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23320/source/Document Modified Files: Tag: Release_branch_v1 CGardenForm.cpp Log Message: Fix a compile warning Index: CGardenForm.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CGardenForm.cpp,v retrieving revision 1.4.2.10 retrieving revision 1.4.2.11 diff -C2 -d -r1.4.2.10 -r1.4.2.11 *** CGardenForm.cpp 6 Apr 2008 04:05:07 -0000 1.4.2.10 --- CGardenForm.cpp 12 Apr 2008 22:40:04 -0000 1.4.2.11 *************** *** 1163,1173 **** CGardenForm* oldForm; XGString title; ! ClientDocument *doc; const char *name; oldForm = TopDocument(); ! doc = oldForm->GetFile(); ! if(doc->IsDocumentNamed()) { oldForm->GetTitle(title); --- 1163,1173 ---- CGardenForm* oldForm; XGString title; ! ClientDocument *cdoc; const char *name; oldForm = TopDocument(); ! cdoc = oldForm->GetFile(); ! if(cdoc->IsDocumentNamed()) { oldForm->GetTitle(title); *************** *** 1179,1183 **** if(BooleanQueryDialog::DoBooleanQueryDialog(198, name)) { ! doc->ImportPlan(*inFileSpec, RSGardenTemplateType, errLine); return oldForm; } --- 1179,1183 ---- if(BooleanQueryDialog::DoBooleanQueryDialog(198, name)) { ! cdoc->ImportPlan(*inFileSpec, RSGardenTemplateType, errLine); return oldForm; } |
|
From: Jeffrey B. <jlb...@us...> - 2008-04-12 21:25:05
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7140/source/Document Modified Files: Tag: Release_branch_v1 MaterialPictSelectDialog.cpp MaterialPictSelectDialog.h Log Message: Lock picture metadata fields for pictures loaded by the application (ex: from a web site) Index: MaterialPictSelectDialog.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/MaterialPictSelectDialog.h,v retrieving revision 1.10.2.3 retrieving revision 1.10.2.4 diff -C2 -d -r1.10.2.3 -r1.10.2.4 *** MaterialPictSelectDialog.h 12 Apr 2008 19:04:59 -0000 1.10.2.3 --- MaterialPictSelectDialog.h 12 Apr 2008 21:25:07 -0000 1.10.2.4 *************** *** 48,52 **** virtual void GetDefaultPictureProperties(String &title, String ©right, String &creator, long &locationChoice); virtual long CreateLocationChoice(); ! virtual void OKClicked(XGDialog *dlog); --- 48,53 ---- virtual void GetDefaultPictureProperties(String &title, String ©right, String &creator, long &locationChoice); virtual long CreateLocationChoice(); ! virtual bool IsMetadataLocked(); ! virtual void OKClicked(XGDialog *dlog); Index: MaterialPictSelectDialog.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/MaterialPictSelectDialog.cpp,v retrieving revision 1.19.2.10 retrieving revision 1.19.2.11 diff -C2 -d -r1.19.2.10 -r1.19.2.11 *** MaterialPictSelectDialog.cpp 12 Apr 2008 19:04:59 -0000 1.19.2.10 --- MaterialPictSelectDialog.cpp 12 Apr 2008 21:25:06 -0000 1.19.2.11 *************** *** 359,362 **** --- 359,364 ---- _defaultPictEntry = newEntry; ChangeDefaultPicture(_defaultPicture); + SaveCurrentPictureProperties(); + UpdateTitle(); RebuildBottomPane(); } *************** *** 405,408 **** --- 407,418 ---- } + //******************************************* + /// IsMetadataLocked + // + bool MaterialPictureSelectDialog::IsMetadataLocked() + { + const char *url = _defaultPictEntry.GetExternalURL(); + return(url != NULL && (strlen(url) != 0)); + } |