v0.3

- Volumes added in Chart - 5 min Chart added - Chart Zooming by mouse wheel - Alerts added - Many UI Improvements
EvgBitWhiskey · Jan 17, 2018 · a43f557 · a43f557
1 parent 1c90199
commit a43f557
Show file tree

Hide file tree

Showing 40 changed files with 2,891 additions and 1,232 deletions.
diff --git a/Alert.cs b/Alert.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Timers;
+
+namespace BitWhiskey
+{
+    public class Alert
+    {
+        private static int IdCounter=0;
+        public int id;
+        public string caption;
+        public string tickerPair;
+        public DateTime createDate;
+        public double createPrice;
+
+        public double priceAlert;
+
+        public bool showInChart;
+        public bool playSound;
+
+        public bool alertExecute;
+
+        public Alert(string caption_)
+        {
+            IdCounter++;
+            id = IdCounter;
+
+            caption = caption_;
+            createDate = DateTime.Now;
+            showInChart = true;
+            alertExecute = false;
+        }
+        public static int GetNewId()
+        {
+            return IdCounter + 1;
+        }
+
+    }
+
+
+}
diff --git a/AppBin/alert.wav b/AppBin/alert.wav
diff --git a/AppSettings.cs b/AppSettings.cs
@@ -34,6 +34,14 @@ public AppSettingsManager()
         {
             pathProfiles = Path.Combine(ApplicationPath.directory, @"AppBin\Profiles");
         }
+        public static void LoadSettings()
+        {
+            Global.settingsInit = SettingsInit.Load(Path.Combine(ApplicationPath.directoryAppBin, "init.json"));
+            AppSettingsManager settingsManager = new AppSettingsManager();
+            string settingsPath = settingsManager.GetSettingsFilePath(Global.settingsInit.currentprofile, "settings.json");
+            Global.settingsMain = MySettings.Load(settingsPath);
+        }
+
         public string  GetProfileDir(string profileName)
         {
             return Path.Combine(pathProfiles, profileName);

diff --git a/ApplicationPath.cs b/ApplicationPath.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.IO;
+
+
+namespace BitWhiskey
+{
+    public class ApplicationPath
+    {
+        static public string directory;
+        static public string directoryAppBin;
+        static ApplicationPath()
+        {
+#if DEBUG
+            directory = @"t:\DevelopNew\Crypt\BitWhiskeyBIN\";
+            directoryAppBin = Path.Combine(directory, @"AppBin");
+#else
+            directory = Environment.CurrentDirectory.Replace(@"\bin\Debug", "");
+            directoryAppBin = Path.Combine(directory, @"AppBin");
+#endif
+
+        }
+    }
+
+
+}
diff --git a/BitWhiskey.csproj b/BitWhiskey.csproj
@@ -60,11 +60,14 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Alert.cs" />
     <Compile Include="AppCrypt.cs" />
     <Compile Include="AppExceptions.cs" />
+    <Compile Include="ApplicationPath.cs" />
     <Compile Include="AppTimer.cs" />
     <Compile Include="Bittrex.cs" />
     <Compile Include="Chart.cs" />
+    <Compile Include="ConvertData.cs" />
     <Compile Include="Cryptor.cs" />
     <Compile Include="DataGridViewWrapper.cs" />
     <Compile Include="ExchangeManager.cs" />
@@ -74,6 +77,18 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="FormAlertAdd.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormAlertAdd.Designer.cs">
+      <DependentUpon>FormAlertAdd.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FormAlertMain.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormAlertMain.Designer.cs">
+      <DependentUpon>FormAlertMain.cs</DependentUpon>
+    </Compile>
     <Compile Include="FormBalance.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -103,8 +118,10 @@
     <Compile Include="FormTradeRequestHandlers.cs" />
     <Compile Include="Global.cs" />
     <Compile Include="Helper.cs" />
+    <Compile Include="Logman.cs" />
     <Compile Include="Market.cs" />
     <Compile Include="AppSettings.cs" />
+    <Compile Include="MarketsState.cs" />
     <Compile Include="Poloniex.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -114,6 +131,12 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FormAlertAdd.resx">
+      <DependentUpon>FormAlertAdd.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FormAlertMain.resx">
+      <DependentUpon>FormAlertMain.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FormBalance.resx">
       <DependentUpon>FormBalance.cs</DependentUpon>
     </EmbeddedResource>
@@ -137,7 +160,16 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <None Include="app.config" />
+    <None Include="if_business-work_12_2377635.png" />
+    <Content Include="icon-plus-minus.png" />
+    <Content Include="icons8-bitcoin.png" />
+    <Content Include="icons8-coin.png" />
+    <Content Include="icons8-error-50.png" />
+    <Content Include="icons8-gears.png" />
+    <Content Include="icons8-wallet.png" />
     <Content Include="if_CoinSphere-Bitcoin-Red-Casino-Chip-48_134211.ico" />
+    <Content Include="if_CoinSphere-Bitcoin-Red-Casino-Chip-48_134211.png" />
+    <Content Include="if_vector_65_14_473802.png" />
     <Content Include="NLog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>