build number updated
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 28 Aug 2017 10:49:21 +0000 (13:49 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 28 Aug 2017 10:49:21 +0000 (13:49 +0300)
build/build_number
include/build.h
src/java/build/set_build_number.cmd
src/java/build/set_build_number.sh
src/java/client/netxms-base/src/main/java/org/netxms/base/BuildNumber.java
src/java/netxms-eclipse/Charts/src/org/netxms/ui/eclipse/charts/api/ChartFactory.java
src/java/netxms-eclipse/Charts/src/org/netxms/ui/eclipse/charts/widgets/CurrentValueWidget.java
src/java/netxms-eclipse/Charts/src/org/netxms/ui/eclipse/charts/widgets/DialChartWidget.java
src/java/netxms-eclipse/Charts/src/org/netxms/ui/eclipse/charts/widgets/GaugeWidget.java

index 892e34d..5caff40 100644 (file)
@@ -1 +1 @@
-9012
+10000
index a65ccce..323837e 100644 (file)
@@ -1,5 +1,5 @@
 #ifndef __build_h
 #define __build_h
-#define NETXMS_VERSION_BUILD 9012
-#define NETXMS_VERSION_BUILD_STRING _T("9012")
+#define NETXMS_VERSION_BUILD 10000
+#define NETXMS_VERSION_BUILD_STRING _T("10000")
 #endif
index 6077e0a..ab5909d 100644 (file)
@@ -1 +1 @@
-set build_number=9012
+set build_number=10000
index 6f6fda0..3469cf3 100644 (file)
@@ -1,5 +1,5 @@
 package org.netxms.base;
 public final class BuildNumber {
-   public static final String TEXT = "9012";
-   public static final int NUMBER = 9012;
+   public static final String TEXT = "10000";
+   public static final int NUMBER = 10000;
 }
index c0f737a..814ed2f 100644 (file)
@@ -4,6 +4,7 @@
 package org.netxms.ui.eclipse.charts.api;
 
 import org.eclipse.swt.widgets.Composite;
+import org.netxms.ui.eclipse.charts.widgets.BarGaugeWidget;
 import org.netxms.ui.eclipse.charts.widgets.CurrentValueWidget;
 import org.netxms.ui.eclipse.charts.widgets.DataComparisonBirtChart;
 import org.netxms.ui.eclipse.charts.widgets.DialChartWidget;
@@ -74,6 +75,18 @@ public class ChartFactory
                return new DialChartWidget(parent, style);
        }
        
+   /**
+    * Create bar gauge chart
+    * 
+    * @param parent parent composite
+    * @param style widget style
+    * @return bar gauge chart widget
+    */
+   public static Gauge createBarGaugeChart(Composite parent, int style)
+   {
+      return new BarGaugeWidget(parent, style);
+   }
+   
        /**
         * Create "current values" pseudo-chart
         * 
index b55a7bc..b193e79 100644 (file)
@@ -21,7 +21,6 @@ package org.netxms.ui.eclipse.charts.widgets;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Composite;
@@ -133,19 +132,4 @@ public class CurrentValueWidget extends GaugeWidget
                        gc.drawText(dci.getName(), rect.x + ((rect.width - ext.x) / 2), rect.y + rect.height + 4, true);
                }
        }
-       
-       /**
-     * Take snapshot of network map
-     * 
-     * @return
-     */
-       public Image takeSnapshot()
-       {
-               Rectangle rect = getClientArea();
-               Image image = new Image(getDisplay(), rect.width, rect.height);
-               GC gc = new GC(image);
-               this.print(gc);
-               gc.dispose();
-               return image;
-       }
 }
index 177a11f..85f53cb 100644 (file)
@@ -23,7 +23,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
@@ -322,21 +321,6 @@ public class DialChartWidget extends GaugeWidget
                }
        }
        
-       /**
-     * Take snapshot of network map
-     * 
-     * @return
-     */
-       public Image takeSnapshot()
-       {
-               Rectangle rect = getClientArea();
-               Image image = new Image(getDisplay(), rect.width, rect.height);
-               GC gc = new GC(image);
-               this.print(gc);
-               gc.dispose();
-               return image;
-       }
-
    /**
     * Get minimal element size
     * 
index 5e9a92d..87ffaf2 100644 (file)
@@ -33,6 +33,7 @@ import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Composite;
 import org.netxms.client.datacollection.DataFormatter;
 import org.netxms.client.datacollection.DciDataRow;
@@ -781,4 +782,18 @@ public abstract class GaugeWidget extends GenericChart implements Gauge, PaintLi
    {
       customColor = color;
    }
+
+   /* (non-Javadoc)
+    * @see org.netxms.ui.eclipse.charts.api.DataChart#takeSnapshot()
+    */
+   @Override
+   public Image takeSnapshot()
+   {
+      Rectangle rect = getClientArea();
+      Image image = new Image(getDisplay(), rect.width, rect.height);
+      GC gc = new GC(image);
+      this.print(gc);
+      gc.dispose();
+      return image;
+   }
 }