Thread: [PlaneShift-svn] SF.net SVN: planeshift:[9542] trunk (Page 30)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 9542
          http://sourceforge.net/p/planeshift/code/9542
Author:   joelyon
Date:     2014-08-13 15:56:37 +0000 (Wed, 13 Aug 2014)
Log Message:
-----------
implemented flash, warn and danger nodes and attributes in pawsprogressmeter xml

Modified Paths:
--------------
    trunk/data/gui/infowindow.xml
    trunk/src/client/gui/pawsdndbutton.cpp
    trunk/src/client/gui/shortcutwindow.cpp
    trunk/src/common/paws/pawsprogressbar.cpp
    trunk/src/common/paws/pawsprogressbar.h

Modified: trunk/data/gui/infowindow.xml
===================================================================

--- trunk/data/gui/infowindow.xml	2014-08-13 14:56:28 UTC (rev 9541)
+++ trunk/data/gui/infowindow.xml	2014-08-13 15:56:37 UTC (rev 9542)
@@ -18,9 +18,14 @@
     </attachpoints>
 
     <widget name="My HP" factory="pawsProgressBar" tooltip="Health">
+<!-- 
+        <flash level="0.20" low="true" r="0" g="0" b="0" rate="250" />
+        <warn level="0.30" low="true" r="200" g="200" b="0" />
+        <danger level="0.10" low="true" r="200" g="0" b="0" />
+-->
         <frame x="0" y="5" width="170" height="10" border="no" />
-            <color r="150" g="20" b="20" />
-            <fadecolor r="200" g="50" b="50" />
+        <color r="20" g="150" b="20" />
+        <fadecolor r="200" g="50" b="50" />
         <subscriptions>
             <subscribe data="fVitalValue0:Self" />
         </subscriptions>
@@ -54,9 +59,14 @@
     </widget>
 
     <widget name="My Mana" factory="pawsProgressBar" tooltip="Mana">
+<!--
+        <flash level="0.20" low="true" r="0" g="0" b="0" rate="250" />
+        <warn level="0.30" low="true" r="200" g="200" b="0" />
+        <danger level="0.10" low="true" r="200" g="0" b="0" />
+-->
         <frame x="0" y="27" width="170" height="10" border="no" />
-            <color r="20" g="20" b="160" />
-            <fadecolor r="50" g="50" b="200" />
+        <color r="20" g="20" b="160" />
+        <fadecolor r="50" g="50" b="200" />
         <subscriptions>
             <subscribe data="fVitalValue1:Self" />
         </subscriptions>

Modified: trunk/src/client/gui/pawsdndbutton.cpp
===================================================================
--- trunk/src/client/gui/pawsdndbutton.cpp	2014-08-13 14:56:28 UTC (rev 9541)
+++ trunk/src/client/gui/pawsdndbutton.cpp	2014-08-13 15:56:37 UTC (rev 9542)
@@ -230,9 +230,10 @@
 
     spellProgress->SetTotalValue(1.0);
     spellProgress->SetColor( 0, 0, 200 );
-    spellProgress->SetWarning(warnLevel, warnLow, 200, 200, 0 );
-    spellProgress->SetDanger(dangerLevel, warnLow, 200, 0, 0 );
-    spellProgress->SetFlash(flashLevel, warnLow, 250, 0, 0, 0 );
+    spellProgress->SetWarningLevel(warnLevel, warnLow);
+    spellProgress->SetDangerLevel(dangerLevel, warnLow);
+    spellProgress->SetFlashLevel(flashLevel, warnLow);
+    spellProgress->SetFlashRate( 250);
 
     float currentProgress = (currentTicks-startTicks)/duration;
     spellProgress->SetCurrentValue(currentProgress);

Modified: trunk/src/client/gui/shortcutwindow.cpp
===================================================================
--- trunk/src/client/gui/shortcutwindow.cpp	2014-08-13 14:56:28 UTC (rev 9541)
+++ trunk/src/client/gui/shortcutwindow.cpp	2014-08-13 15:56:37 UTC (rev 9542)
@@ -1260,7 +1260,7 @@
 {
     if( main_hp )
     {
-        main_hp->SetWarning(val,true,200,200,0);
+        main_hp->SetWarningLevel(val,true);
     }
 }
 float pawsShortcutWindow::GetHPWarnLevel()
@@ -1276,7 +1276,7 @@
 {
     if( main_hp )
     {
-        main_hp->SetDanger(val,true,250,0,0);
+        main_hp->SetDangerLevel(val,true);
     }
 }
 float pawsShortcutWindow::GetHPDangerLevel()
@@ -1292,7 +1292,8 @@
 {
     if( main_hp )
     {
-        main_hp->SetFlash(val,true,200,0,0,0);
+        main_hp->SetFlashLevel(val,true);
+        main_hp->SetFlashRate(200);
     }
 }
 float pawsShortcutWindow::GetHPFlashLevel()
@@ -1308,7 +1309,7 @@
 {
     if( main_mana )
     {
-        main_mana->SetWarning(val,true,200,200,200);
+        main_mana->SetWarningLevel(val,true);
     }
 }
 float pawsShortcutWindow::GetManaWarnLevel()
@@ -1324,7 +1325,7 @@
 {
     if( main_mana )
     {
-        main_mana->SetDanger(val,true,250,0,0);
+        main_mana->SetDangerLevel(val,true);
     }
 }
 float pawsShortcutWindow::GetManaDangerLevel()
@@ -1340,7 +1341,8 @@
 {
     if( main_mana )
     {
-        main_mana->SetFlash(val,true,200,0,0,0);
+        main_mana->SetFlashLevel(val,true);
+        main_mana->SetFlashRate(200);
     }
 }
 float pawsShortcutWindow::GetManaFlashLevel()

Modified: trunk/src/common/paws/pawsprogressbar.cpp
===================================================================
--- trunk/src/common/paws/pawsprogressbar.cpp	2014-08-13 14:56:28 UTC (rev 9541)
+++ trunk/src/common/paws/pawsprogressbar.cpp	2014-08-13 15:56:37 UTC (rev 9542)
@@ -88,43 +88,56 @@
         diff_b = ColourNode2->GetAttributeValueAsInt("b") - start_b;
     }
 
-    csRef<iDocumentNode> ColourNode3 = node->GetNode("flashcolor");
-    if(ColourNode3)
+    csRef<iDocumentNode> OpNode = node->GetNode("flash");
+    if(OpNode)
     {
-        flash_r = ColourNode3->GetAttributeValueAsInt("r");
-        flash_g = ColourNode3->GetAttributeValueAsInt("g");
-        flash_b = ColourNode3->GetAttributeValueAsInt("b");
+        flashLevel = OpNode->GetAttributeValueAsFloat("level");
+        flashLow = OpNode->GetAttributeValueAsBool("low");
+        flash_r = OpNode->GetAttributeValueAsInt("r");
+        flash_g = OpNode->GetAttributeValueAsInt("g");
+        flash_b = OpNode->GetAttributeValueAsInt("b");
+        flashRate = OpNode->GetAttributeValueAsInt("rate");
     }
     else
     {
+        flashLevel = 0;
+        flashLow = false;
         flash_r = 0;
         flash_g = 0;
         flash_b = 0;
     }
 
-    csRef<iDocumentNode> ColourNode4 = node->GetNode("warncolor");
-    if(ColourNode4)
+    OpNode = node->GetNode("warn");
+    if(OpNode)
     {
-        warn_r = ColourNode4->GetAttributeValueAsInt("r");
-        warn_g = ColourNode4->GetAttributeValueAsInt("g");
-        warn_b = ColourNode4->GetAttributeValueAsInt("b");
+        warnLevel = OpNode->GetAttributeValueAsFloat("level");
+        warnLow = OpNode->GetAttributeValueAsBool("low");
+        warn_r = OpNode->GetAttributeValueAsInt("r");
+        warn_g = OpNode->GetAttributeValueAsInt("g");
+        warn_b = OpNode->GetAttributeValueAsInt("b");
     }
     else
     {
+        warnLevel = 0;
+        warnLow = false;
         warn_r = 200;
         warn_g = 200;
         warn_b = 0;
     }
 
-    csRef<iDocumentNode> ColourNode5 = node->GetNode("dangercolor");
-    if(ColourNode5)
+    OpNode = node->GetNode("danger");
+    if(OpNode)
     {
-        danger_r = ColourNode5->GetAttributeValueAsInt("r");
-        danger_g = ColourNode5->GetAttributeValueAsInt("g");
-        danger_b = ColourNode5->GetAttributeValueAsInt("b");
+        dangerLevel = OpNode->GetAttributeValueAsFloat("level");
+        dangerLow = OpNode->GetAttributeValueAsBool("low");
+        danger_r = OpNode->GetAttributeValueAsInt("r");
+        danger_g = OpNode->GetAttributeValueAsInt("g");
+        danger_b = OpNode->GetAttributeValueAsInt("b");
     }
     else
     {
+        dangerLevel = 0;
+        dangerLow = false;
         danger_r = 200;
         danger_g = 0;
         danger_b = 0;
@@ -260,30 +273,39 @@
     start_b    = blue;
 }
 
-void pawsProgressBar::SetFlash(float level, bool low, int rate, int red, int green, int blue )
+void pawsProgressBar::SetReversed( bool val )
 {
+    reversed = val;
+}
+
+
+void pawsProgressBar::SetFlashLevel(float level, bool low )
+{
     flashLevel = level;
     flashLow   = low;
-    flashRate  = rate;
+}
+void pawsProgressBar::SetFlashColor( int red, int green, int blue )
+{
     flash_r    = red;
     flash_g    = green;
     flash_b    = blue;
 }
+void pawsProgressBar::SetFlashRate( int rate)
+{
+    flashRate  = rate;
+}
 float pawsProgressBar::GetFlashLevel()
 {
     return flashLevel;
 }
 
-
-void pawsProgressBar::SetReversed( bool val )
+void pawsProgressBar::SetWarningLevel( float level, bool low)
 {
-    reversed = val;
+    warnLevel = level;
+    warnLow   = low;
 }
-
-void pawsProgressBar::SetWarning( float level, bool low, int red, int green, int blue )
+void pawsProgressBar::SetWarningColor( int red, int green, int blue )
 {
-    warnLevel = level;
-    warnLow   = low;
     warn_r    = red;
     warn_g    = green;
     warn_b    = blue;
@@ -293,10 +315,13 @@
     return warnLevel;
 }
 
-void pawsProgressBar::SetDanger( float level, bool low, int red, int green, int blue )
+void pawsProgressBar::SetDangerLevel( float level, bool low)
 {
     dangerLevel = level;
     dangerLow   = low;
+}
+void pawsProgressBar::SetDangerColor(  int red, int green, int blue )
+{
     danger_r    = red;
     danger_g    = green;
     danger_b    = blue;

Modified: trunk/src/common/paws/pawsprogressbar.h
===================================================================
--- trunk/src/common/paws/pawsprogressbar.h	2014-08-13 14:56:28 UTC (rev 9541)
+++ trunk/src/common/paws/pawsprogressbar.h	2014-08-13 15:56:37 UTC (rev 9542)
@@ -48,43 +48,59 @@
      */
     virtual void SetColor( int red, int green, int blue );
 
-    /** flash a different color if value is below/above threshold.
+    /** Set threshold for flashing
      **  numbers outside of min & max = no flash.
      **  default = no flash.
      *  @param value  within this threshold, flash; outside it, no flash.
      *  @param low    if TRUE then flash below this level; if FALSE flash above.
-     *  @param rate   switch colors every 'rate' ticks
+     */
+    virtual void SetFlashLevel(float level, bool low);
+
+    /** Set flash color 
      *  @param red     red saturation value 
      *  @param green   green saturation value 
      *  @param blue    blue saturation value 
      */
-    virtual void SetFlash(float level, bool low, int rate, int red, int green, int blue );
+    virtual void SetFlashColor( int red, int green, int blue );
 
+    /** Set rate of flash
+     *  @param rate   switch colors every 'rate' ticks
+     */
+    virtual void SetFlashRate( int rate);
+
     /** return the current "flash" level
      */
     float GetFlashLevel();
 
-    /** use a different primary color if above a certain threshold
+    /** Set threshold for warn color
      *  @param level   threshold
      *  @param low     if TRUE then active below this level; if FALSE active above.
+     */
+    virtual void SetWarningLevel( float level, bool low);
+
+    /** Set warn color
      *  @param red     red saturation value 
      *  @param green   green saturation value 
      *  @param blue    blue saturation value 
      */
-    virtual void SetWarning( float level, bool low, int red, int green, int blue );
+    virtual void SetWarningColor(  int red, int green, int blue );
 
     /** return the current "Warn" level
      */
     float GetWarningLevel();
 
-    /** use a different primary color if above a certain threshold
+    /** set threshold for danger color
      *  @param level   threshold
      *  @param low     if TRUE then active below this level; if FALSE active above.
+     */
+    virtual void SetDangerLevel( float level, bool low);
+
+    /** Set Danger Color
      *  @param red     red saturation value
      *  @param green   green saturation value
      *  @param blue    blue saturation value
      */
-    virtual void SetDanger( float level, bool low, int red, int green, int blue );
+    virtual void SetDangerColor(  int red, int green, int blue );
 
     /** return the current "Danger" level
      */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [PlaneShift-svn] SF.net SVN: planeshift:[9542] trunk (Page 30)

planeshift-cvs