[GRASS-SVN] r32292 - grass/branches/develbranch_6/gui/wxpython/vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-07-25 09:26:58 -0400 (Fri, 25 Jul 2008)
New Revision: 32292

Modified:
   grass/branches/develbranch_6/gui/wxpython/vdigit/digit.cpp
   grass/branches/develbranch_6/gui/wxpython/vdigit/digit.h
   grass/branches/develbranch_6/gui/wxpython/vdigit/driver.cpp
   grass/branches/develbranch_6/gui/wxpython/vdigit/driver.h
Log:
wxGUI/vdigit: breakLines moved to Digit class (update r32289) [merged from trunk, r32291]

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/digit.cpp
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/digit.cpp	2008-07-25 13:24:37 UTC (rev 32291)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/digit.cpp	2008-07-25 13:26:58 UTC (rev 32292)
@@ -38,7 +38,7 @@
 }
 
 /**
-   Digit class destructor
+   \brief Digit class destructor
 
    Frees changeset structure
 */
@@ -48,3 +48,15 @@
 	FreeChangeset(changeset);
     }
 }
+
+/**
+   \brief Update digit settings
+
+   \param breakLines break lines on intersection
+*/
+void Digit::UpdateSettings(bool breakLines)
+{
+    settings.breakLines = breakLines;
+
+    return;
+}

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/digit.h
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/digit.h	2008-07-25 13:24:37 UTC (rev 32291)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/digit.h	2008-07-25 13:26:58 UTC (rev 32292)
@@ -27,6 +27,12 @@
 	struct line_pnts *Points;
 	struct line_cats *Cats;
     };
+
+    /* settings */
+    struct _settings {
+	bool breakLines;
+    } settings;
+
     std::map<int, std::vector<action_meta> > changesets;
     int changesetCurrent;  /* first changeset to apply */
     int changesetDead;     /* first dead changeset */
@@ -81,6 +87,8 @@
 
     int Undo(int);
     int GetUndoLevel();
+
+    void UpdateSettings(bool);
 };
 
 #endif /* WXVDIGIT_DIGIT_H */

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/driver.cpp
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/driver.cpp	2008-07-25 13:24:37 UTC (rev 32291)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/driver.cpp	2008-07-25 13:26:58 UTC (rev 32292)
@@ -818,7 +818,7 @@
 				   bool eVertex,      unsigned long cVertex,
 				   bool eArea,        unsigned long cArea,
 				   bool eDirection,   unsigned long cDirection,
-				   int lineWidth, bool breakLines)
+				   int lineWidth)
 {
     settings.highlight.Set(highlight);
     
@@ -865,8 +865,6 @@
     settings.direction.color.Set(cDirection);
 
     settings.lineWidth = lineWidth;
-    
-    settings.breakLines = breakLines;
 
     return;
 }

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/driver.h
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/driver.h	2008-07-25 13:24:37 UTC (rev 32291)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/driver.h	2008-07-25 13:26:58 UTC (rev 32292)
@@ -112,8 +112,6 @@
 	symbol direction;
 
 	int lineWidth;    // screen units 
-
-	bool breakLines;
     } settings;
 
     struct _topology {
@@ -214,7 +212,7 @@
 			bool, unsigned long,
 			bool, unsigned long,
 			bool, unsigned long,
-			int, bool);
+			int);
 };
 
 int print_error(const char *, int);