diff --git a/MtApi/EnumChartPropertyDouble.cs b/MtApi/EnumChartPropertyDouble.cs new file mode 100644 index 00000000..72fd1570 --- /dev/null +++ b/MtApi/EnumChartPropertyDouble.cs @@ -0,0 +1,13 @@ +namespace MtApi +{ + public enum EnumChartPropertyDouble + { + CHART_SHIFT_SIZE = 3, + CHART_FIXED_POSITION = 41, + CHART_FIXED_MAX = 8, + CHART_FIXED_MIN = 9, + CHART_POINTS_PER_BAR = 11, + CHART_PRICE_MIN = 108, + CHART_PRICE_MAX = 109 + } +} diff --git a/MtApi/EnumChartPropertyInteger.cs b/MtApi/EnumChartPropertyInteger.cs new file mode 100644 index 00000000..abc7d3c4 --- /dev/null +++ b/MtApi/EnumChartPropertyInteger.cs @@ -0,0 +1,55 @@ +namespace MtApi +{ + public enum EnumChartPropertyInteger + { + CHART_BRING_TO_TOP = 35, + CHART_MOUSE_SCROLL = 42, + CHART_EVENT_MOUSE_MOVE = 40, + CHART_EVENT_OBJECT_CREATE = 38, + CHART_EVENT_OBJECT_DELETE = 39, + CHART_MODE = 0, + CHART_FOREGROUND = 1, + CHART_SHIFT = 2, + CHART_AUTOSCROLL = 4, + CHART_QUICK_NAVIGATION = 45, + CHART_SCALE = 5, + CHART_SCALEFIX = 6, + CHART_SCALEFIX_11 = 7, + CHART_SCALE_PT_PER_BAR = 10, + CHART_SHOW_OHLC = 12, + CHART_SHOW_BID_LINE = 13, + CHART_SHOW_ASK_LINE = 14, + CHART_SHOW_LAST_LINE = 15, + CHART_SHOW_PERIOD_SEP = 16, + CHART_SHOW_GRID = 17, + CHART_SHOW_VOLUMES = 18, + CHART_SHOW_OBJECT_DESCR = 19, + CHART_VISIBLE_BARS = 100, + CHART_WINDOWS_TOTAL = 101, + CHART_WINDOW_IS_VISIBLE = 102, + CHART_WINDOW_HANDLE = 103, + CHART_WINDOW_YDISTANCE = 110, + CHART_FIRST_VISIBLE_BAR = 104, + CHART_WIDTH_IN_BARS = 105, + CHART_WIDTH_IN_PIXELS = 106, + CHART_HEIGHT_IN_PIXELS = 107, + CHART_COLOR_BACKGROUND = 21, + CHART_COLOR_FOREGROUND = 22, + CHART_COLOR_GRID = 23, + CHART_COLOR_VOLUME = 24, + CHART_COLOR_CHART_UP = 25, + CHART_COLOR_CHART_DOWN = 26, + CHART_COLOR_CHART_LINE = 27, + CHART_COLOR_CANDLE_BULL = 28, + CHART_COLOR_CANDLE_BEAR = 29, + CHART_COLOR_BID = 30, + CHART_COLOR_ASK = 31, + CHART_COLOR_LAST = 32, + CHART_COLOR_STOP_LEVEL = 33, + CHART_SHOW_TRADE_LEVELS = 34, + CHART_DRAG_TRADE_LEVELS = 43, + CHART_SHOW_DATE_SCALE = 36, + CHART_SHOW_PRICE_SCALE = 37, + CHART_IS_OFFLINE = 112 + } +} diff --git a/MtApi/EnumChartPropertyString.cs b/MtApi/EnumChartPropertyString.cs new file mode 100644 index 00000000..aae72b14 --- /dev/null +++ b/MtApi/EnumChartPropertyString.cs @@ -0,0 +1,7 @@ +namespace MtApi +{ + public enum EnumChartPropertyString + { + CHART_COMMENT = 20 + } +} diff --git a/MtApi/MtApi.csproj b/MtApi/MtApi.csproj index 09bf1c52..c2c646ff 100755 --- a/MtApi/MtApi.csproj +++ b/MtApi/MtApi.csproj @@ -59,6 +59,7 @@ + diff --git a/MtApi/MtApiClient.cs b/MtApi/MtApiClient.cs index 5c931611..f4becd06 100755 --- a/MtApi/MtApiClient.cs +++ b/MtApi/MtApiClient.cs @@ -1980,9 +1980,9 @@ namespace MtApi /// ///Returns true if the command has been added to chart queue, otherwise false. /// - public bool ChartSetDouble(long chartId, int propId, double value) + public bool ChartSetDouble(long chartId, EnumChartPropertyDouble propId, double value) { - var commandParameters = new ArrayList { chartId, propId, value }; + var commandParameters = new ArrayList { chartId, (int)propId, value }; return SendCommand(MtCommandType.ChartSetDouble, commandParameters); } @@ -1995,9 +1995,9 @@ namespace MtApi /// ///Returns true if the command has been added to chart queue, otherwise false. /// - public bool ChartSetInteger(long chartId, int propId, long value) + public bool ChartSetInteger(long chartId, EnumChartPropertyInteger propId, long value) { - var commandParameters = new ArrayList { chartId, propId, value }; + var commandParameters = new ArrayList { chartId, (int)propId, value }; return SendCommand(MtCommandType.ChartSetInteger, commandParameters); } @@ -2010,9 +2010,9 @@ namespace MtApi /// ///Returns true if the command has been added to chart queue, otherwise false. /// - public bool ChartSetString(long chartId, int propId, string value) + public bool ChartSetString(long chartId, EnumChartPropertyString propId, string value) { - var commandParameters = new ArrayList { chartId, propId, value }; + var commandParameters = new ArrayList { chartId, (int)propId, value }; return SendCommand(MtCommandType.ChartSetString, commandParameters); } @@ -2025,9 +2025,9 @@ namespace MtApi /// ///The value of double type. /// - public double ChartGetDouble(long chartId, int propId, int subWindow = 0) + public double ChartGetDouble(long chartId, EnumChartPropertyDouble propId, int subWindow = 0) { - var commandParameters = new ArrayList { chartId, propId, subWindow }; + var commandParameters = new ArrayList { chartId, (int)propId, subWindow }; return SendCommand(MtCommandType.ChartGetDouble, commandParameters); } @@ -2040,9 +2040,9 @@ namespace MtApi /// ///The value of long type. /// - public long ChartGetInteger(long chartId, int propId, int subWindow = 0) + public long ChartGetInteger(long chartId, EnumChartPropertyInteger propId, int subWindow = 0) { - var commandParameters = new ArrayList { chartId, propId, subWindow }; + var commandParameters = new ArrayList { chartId, (int)propId, subWindow }; return SendCommand(MtCommandType.ChartGetInteger, commandParameters); } @@ -2054,9 +2054,9 @@ namespace MtApi /// ///The value of string type. /// - public string ChartGetString(long chartId, int propId) + public string ChartGetString(long chartId, EnumChartPropertyString propId) { - var commandParameters = new ArrayList { chartId, propId }; + var commandParameters = new ArrayList { chartId, (int)propId }; return SendCommand(MtCommandType.ChartGetString, commandParameters); } @@ -2259,7 +2259,7 @@ namespace MtApi /// ///Returns true if the chart subwindow is visible, otherwise returns false. The chart subwindow can be hidden due to the visibility properties of the indicator placed in it. /// - public bool WindowIsVisible(string index) + public bool WindowIsVisible(int index) { var commandParameters = new ArrayList { index }; return SendCommand(MtCommandType.WindowIsVisible, commandParameters); @@ -2279,23 +2279,27 @@ namespace MtApi /// ///Returns the maximal value of the vertical scale of the specified subwindow of the current chart. /// + ///Chart subwindow index (0 - main chart window). /// ///The maximal value of the vertical scale of the specified subwindow of the current chart. /// - public int WindowPriceMax() + public int WindowPriceMax(int index = 0) { - return SendCommand(MtCommandType.WindowPriceMax, null); + var commandParameters = new ArrayList { index }; + return SendCommand(MtCommandType.WindowPriceMax, commandParameters); } /// ///Returns the minimal value of the vertical scale of the specified subwindow of the current chart. /// + ///Chart subwindow index (0 - main chart window). /// ///The minimal value of the vertical scale of the specified subwindow of the current chart. /// - public int WindowPriceMin() + public int WindowPriceMin(int index = 0) { - return SendCommand(MtCommandType.WindowPriceMin, null); + var commandParameters = new ArrayList { index }; + return SendCommand(MtCommandType.WindowPriceMin, commandParameters); } ///