Revert "Minor code improvements."

This reverts commit 8cc49ea.
yuriqdev · Jun 6, 2018 · d22a0aa · d22a0aa
1 parent 8cc49ea
commit d22a0aa
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,15 @@
+### Csharp ###
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
 *.suo
 *.user
 *.userosscache
 *.sln.docstates
 
-!*.exe
-!*.dll
-
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
@@ -18,14 +18,12 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-[Xx]64/
-[Xx]86/
-[Bb]uild/
+x64/
+x86/
 bld/
 [Bb]in/
 [Oo]bj/
-
-
+[Ll]og/
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -45,9 +43,11 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
-# DNX
+# .NET Core
 project.lock.json
+project.fragment.lock.json
 artifacts/
+**/Properties/launchSettings.json
 
 *_i.c
 *_p.c
@@ -86,6 +86,7 @@ ipch/
 *.sdf
 *.cachefile
 *.VC.db
+*.VC.VC.opendb
 
 # Visual Studio profiler
 *.psess
@@ -113,6 +114,10 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
@@ -144,13 +149,18 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-
-# TODO: Un-comment the next line if you do not want to checkin
-# your web deploy settings because they may include unencrypted
-# passwords
+# TODO: Uncomment the next line to ignore your web deploy settings.
+# By default, sensitive information, such as encrypted password
+# should be stored in the .pubxml.user file.
 #*.pubxml
+*.pubxml.user
 *.publishproj
 
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
@@ -159,7 +169,7 @@ publish/
 !**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
+# NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets
 
@@ -171,9 +181,11 @@ csx/
 ecf/
 rcf/
 
-# Windows Store app package directory
+# Windows Store app package directories and files
 AppPackages/
 BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -183,16 +195,19 @@ BundleArtifacts/
 
 # Others
 ClientBin/
-[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
 *.dbproj.schemaview
+*.jfm
 *.pfx
 *.publishsettings
-node_modules/
 orleans.codegen.cs
 
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
 # RIA/Silverlight projects
 Generated_Code/
 
@@ -207,6 +222,7 @@ UpgradeLog*.htm
 # SQL Server files
 *.mdf
 *.ldf
+*.ndf
 
 # Business Intelligence projects
 *.rdl.data
@@ -221,13 +237,20 @@ FakesAssemblies/
 
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
 
 # Visual Studio 6 build log
 *.plg
 
 # Visual Studio 6 workspace options file
 *.opt
 
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -236,12 +259,36 @@ FakesAssemblies/
 **/*.Server/ModelManifest.xml
 _Pvt_Extensions
 
-# LightSwitch generated files
-GeneratedArtifacts/
-ModelManifest.xml
-
 # Paket dependency manager
 .paket/paket.exe
+paket-files/
 
 # FAKE - F# Make
 .fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+
+# End of
diff --git a/WinCCFlexArchViewer/Main.cs b/WinCCFlexArchViewer/Main.cs
@@ -258,7 +258,7 @@ private void parse_data(object sender, DoWorkEventArgs e)
 				}
 			}   //EndOfForeach
 
-            datapointCounter = timeList.Count;  //  получим число записей сразу, без цикла
+            datapointCounter = timeList.Count;  //немного оптимизации, получим число записей сразу, без цикла
             table = new DataTable();
 			DataColumn dataColumn = new DataColumn();
 			dataColumn.DataType = Type.GetType("System.String");
@@ -320,7 +320,7 @@ private void parse_data(object sender, DoWorkEventArgs e)
 					}
 				}
             } //EndOfForeach
-            goodRecCounter = table.Rows.Count;  //  получим число записей сразу, без цикла
+            goodRecCounter = table.Rows.Count;  //немного оптимизации, получим число записей сразу, без цикла
         }
 
 		// 
@@ -441,7 +441,6 @@ private void toolMnuItemChSta(object sender, EventArgs e)
         {
             ((ToolStripMenuItem)sender).Checked = DTrend.GraphPane.CurveList[((ToolStripMenuItem)sender).OwnerItem.Text].IsVisible;
         }
-
         // Event handler for Dropdown MenuItem "show/hide ALL Curves"
         private void toggleAllCurves(object sender, EventArgs e)
         {

diff --git a/WinCCFlexArchViewer/NumTextBox.cs b/WinCCFlexArchViewer/NumTextBox.cs
@@ -35,7 +35,7 @@ protected override void WndProc(ref Message m)
                 {
                     Text = value.ToString();
                 }
-                else MessageBox.Show("Only Number Allowed", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                else MessageBox.Show("Error paste");
             }
         }
 
@@ -44,13 +44,13 @@ private double DblParse()
             double d = 0.0;
             if (Text == String.Empty)
             {
-                MessageBox.Show("Empty Value Not Allowed", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                MessageBox.Show("Empty Value Not Allowed");
                 ok = false;
             }
             else
             {
                 ok = double.TryParse(this.Text, out d);
-                if (ok == false) MessageBox.Show("Only Number Allowed", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                if (ok == false) MessageBox.Show("Only Number Allowed");
             }
             return d;
         }

diff --git a/WinCCFlexArchViewer/WinCCFlexLogViewer.csproj b/WinCCFlexArchViewer/WinCCFlexLogViewer.csproj
@@ -45,14 +45,13 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/WinCCFlexArchViewer/bin/Release/WinCCFlexLogViewer.exe b/WinCCFlexArchViewer/bin/Release/WinCCFlexLogViewer.exe