diff --git a/Tariffs/Form1.Designer.cs b/Tariffs/Form1.Designer.cs
index 4a6a184..054fe3e 100644
--- a/Tariffs/Form1.Designer.cs
+++ b/Tariffs/Form1.Designer.cs
@@ -88,10 +88,19 @@
this.numericUpDown5 = new System.Windows.Forms.NumericUpDown();
this.checkedListBox1 = new System.Windows.Forms.CheckedListBox();
this.button7 = new System.Windows.Forms.Button();
+ this.dataGridView2 = new System.Windows.Forms.DataGridView();
+ this.OperatorCmpCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.TariffCmpCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.MinsCmpCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.SmsCmpCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.MmsCmpCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.InetCmpCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.PayCmpCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.menuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+ this.tabPage2.SuspendLayout();
this.tabPage3.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).BeginInit();
@@ -102,6 +111,7 @@
((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
this.SuspendLayout();
//
// menuStrip1
@@ -259,6 +269,7 @@
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.Size = new System.Drawing.Size(764, 287);
this.dataGridView1.TabIndex = 0;
+ this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.CheckColComparing);
//
// toCompare
//
@@ -311,6 +322,7 @@
//
// tabPage2
//
+ this.tabPage2.Controls.Add(this.dataGridView2);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
@@ -334,7 +346,7 @@
this.tableLayoutPanel1.ColumnCount = 3;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 47.62886F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 52.37114F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 240F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 241F));
this.tableLayoutPanel1.Controls.Add(this.button1, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.button2, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.button3, 2, 0);
@@ -357,7 +369,7 @@
this.button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
this.button1.Location = new System.Drawing.Point(3, 3);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(227, 139);
+ this.button1.Size = new System.Drawing.Size(226, 139);
this.button1.TabIndex = 0;
this.button1.Text = "MegaFon";
this.button1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -369,7 +381,7 @@
this.button2.BackgroundImage = global::Tariffs.Properties.Resources.logotip_mts;
this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.button2.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
- this.button2.Location = new System.Drawing.Point(236, 3);
+ this.button2.Location = new System.Drawing.Point(235, 3);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(250, 139);
this.button2.TabIndex = 1;
@@ -384,7 +396,7 @@
this.button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.button3.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.button3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
- this.button3.Location = new System.Drawing.Point(492, 3);
+ this.button3.Location = new System.Drawing.Point(491, 3);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(233, 139);
this.button3.TabIndex = 2;
@@ -400,7 +412,7 @@
this.button4.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.button4.Location = new System.Drawing.Point(3, 148);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(227, 136);
+ this.button4.Size = new System.Drawing.Size(226, 136);
this.button4.TabIndex = 3;
this.button4.Text = "Tele2";
this.button4.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -412,7 +424,7 @@
this.button5.BackgroundImage = global::Tariffs.Properties.Resources.logotip_tinkoff_mobile;
this.button5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.button5.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
- this.button5.Location = new System.Drawing.Point(236, 148);
+ this.button5.Location = new System.Drawing.Point(235, 148);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(250, 136);
this.button5.TabIndex = 4;
@@ -424,7 +436,7 @@
// button6
//
this.button6.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
- this.button6.Location = new System.Drawing.Point(492, 148);
+ this.button6.Location = new System.Drawing.Point(491, 148);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(233, 136);
this.button6.TabIndex = 5;
@@ -709,10 +721,10 @@
//
this.checkedListBox1.FormattingEnabled = true;
this.checkedListBox1.Items.AddRange(new object[] {
- "Мегафон",
- "Билайн",
- "МТС",
- "Теле2"});
+ "MegaFon",
+ "BeeLine",
+ "MTS",
+ "Tele2"});
this.checkedListBox1.Location = new System.Drawing.Point(74, 27);
this.checkedListBox1.Name = "checkedListBox1";
this.checkedListBox1.Size = new System.Drawing.Size(120, 64);
@@ -728,6 +740,58 @@
this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.button7_Click);
//
+ // dataGridView2
+ //
+ this.dataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.OperatorCmpCol,
+ this.TariffCmpCol,
+ this.MinsCmpCol,
+ this.SmsCmpCol,
+ this.MmsCmpCol,
+ this.InetCmpCol,
+ this.PayCmpCol});
+ this.dataGridView2.Location = new System.Drawing.Point(0, 0);
+ this.dataGridView2.Name = "dataGridView2";
+ this.dataGridView2.Size = new System.Drawing.Size(760, 287);
+ this.dataGridView2.TabIndex = 0;
+ //
+ // OperatorCmpCol
+ //
+ this.OperatorCmpCol.HeaderText = "Оператор";
+ this.OperatorCmpCol.Name = "OperatorCmpCol";
+ //
+ // TariffCmpCol
+ //
+ this.TariffCmpCol.HeaderText = "Тариф";
+ this.TariffCmpCol.Name = "TariffCmpCol";
+ this.TariffCmpCol.Width = 130;
+ //
+ // MinsCmpCol
+ //
+ this.MinsCmpCol.HeaderText = "Звонки (мин)";
+ this.MinsCmpCol.Name = "MinsCmpCol";
+ //
+ // SmsCmpCol
+ //
+ this.SmsCmpCol.HeaderText = "SMS";
+ this.SmsCmpCol.Name = "SmsCmpCol";
+ //
+ // MmsCmpCol
+ //
+ this.MmsCmpCol.HeaderText = "MMS";
+ this.MmsCmpCol.Name = "MmsCmpCol";
+ //
+ // InetCmpCol
+ //
+ this.InetCmpCol.HeaderText = "Интернет (МБ/ГБ)";
+ this.InetCmpCol.Name = "InetCmpCol";
+ //
+ // PayCmpCol
+ //
+ this.PayCmpCol.HeaderText = "Абон. плата";
+ this.PayCmpCol.Name = "PayCmpCol";
+ //
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -768,6 +832,7 @@
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+ this.tabPage2.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).EndInit();
@@ -778,6 +843,7 @@
((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -844,6 +910,14 @@
private System.Windows.Forms.CheckedListBox checkedListBox1;
private System.Windows.Forms.Button button7;
private System.Windows.Forms.ToolStripMenuItem фильтрацияToolStripMenuItem;
+ private System.Windows.Forms.DataGridView dataGridView2;
+ private System.Windows.Forms.DataGridViewTextBoxColumn OperatorCmpCol;
+ private System.Windows.Forms.DataGridViewTextBoxColumn TariffCmpCol;
+ private System.Windows.Forms.DataGridViewTextBoxColumn MinsCmpCol;
+ private System.Windows.Forms.DataGridViewTextBoxColumn SmsCmpCol;
+ private System.Windows.Forms.DataGridViewTextBoxColumn MmsCmpCol;
+ private System.Windows.Forms.DataGridViewTextBoxColumn InetCmpCol;
+ private System.Windows.Forms.DataGridViewTextBoxColumn PayCmpCol;
}
}
diff --git a/Tariffs/Form1.cs b/Tariffs/Form1.cs
index 5caf243..39a6079 100644
--- a/Tariffs/Form1.cs
+++ b/Tariffs/Form1.cs
@@ -150,6 +150,8 @@ namespace Tariffs
{
dataGridView1.Rows.Clear();
dataGridView1.RowCount = 1;
+ dataGridView2.Rows.Clear();
+ dataGridView2.RowCount = 1;
StreamReader listfile = new StreamReader("list.txt");
String firststr = listfile.ReadLine();
String[,] tariffsArr = new String[arrlenght, 8];
@@ -208,23 +210,21 @@ namespace Tariffs
int x;
//operators
- /*for (int curOperInd = 0; curOperInd < opersQuan; curOperInd++)
+ bool myOperatorChecked = false;
+ for (int curOperInd = 0; curOperInd < opersQuan; curOperInd++)
{
if (filt_params.operators != null &&
rowsArray[1] != null &&
rowsArray[1] == filt_params.operators[curOperInd])
{
- operMatch[curOperInd] = true;
+ myOperatorChecked = true;
}
}
- for (int curOperInd = 0; curOperInd < opersQuan; curOperInd++)
+ if (!myOperatorChecked && filt_params.operators != null)
{
- if (operMatch[curOperInd])
- {
- needToAdd = true;
- }
- }*/
+ needToAdd = false;
+ }
//mins
if (filt_params.min_minutes > 0 &&
@@ -337,11 +337,18 @@ namespace Tariffs
{
ReadListFile();
}
-
+
private void button7_Click(object sender, EventArgs e)
{
Filter filt = new Filter();
+ //operators
+ filt.operators = new String[opersQuan];
+ for (int i = 0; i < checkedListBox1.CheckedItems.Count; i++)
+ {
+ filt.operators[i] = checkedListBox1.CheckedItems[i].ToString();
+ }
+
//minutes
filt.min_minutes = Convert.ToInt32(numericUpDown1.Value);
filt.max_minutes = Convert.ToInt32(numericUpDown2.Value);
@@ -360,5 +367,20 @@ namespace Tariffs
ReadListFile(filt);
}
+
+ private void CheckColComparing(object sender, DataGridViewCellEventArgs e)
+ {
+ if (e.ColumnIndex == 0)
+ {
+ String[] myRow = new String[8];
+
+ for (int i = 1; i < 8; i++)
+ {
+ myRow[i - 1] = dataGridView1.Rows[e.RowIndex].Cells[i].Value.ToString();
+ }
+
+ dataGridView2.Rows.Add(myRow);
+ }
+ }
}
}
diff --git a/Tariffs/Form1.resx b/Tariffs/Form1.resx
index f9ba10d..9769205 100644
--- a/Tariffs/Form1.resx
+++ b/Tariffs/Form1.resx
@@ -147,6 +147,27 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
37
diff --git a/Tariffs/bin/Debug/Tariffs.exe b/Tariffs/bin/Debug/Tariffs.exe
index 80c8703..df91f81 100644
Binary files a/Tariffs/bin/Debug/Tariffs.exe and b/Tariffs/bin/Debug/Tariffs.exe differ
diff --git a/Tariffs/bin/Debug/Tariffs.pdb b/Tariffs/bin/Debug/Tariffs.pdb
index a292602..53d232c 100644
Binary files a/Tariffs/bin/Debug/Tariffs.pdb and b/Tariffs/bin/Debug/Tariffs.pdb differ
diff --git a/Tariffs/obj/Debug/Tariffs.csproj.GenerateResource.cache b/Tariffs/obj/Debug/Tariffs.csproj.GenerateResource.cache
index 143a98e..b1affc9 100644
Binary files a/Tariffs/obj/Debug/Tariffs.csproj.GenerateResource.cache and b/Tariffs/obj/Debug/Tariffs.csproj.GenerateResource.cache differ
diff --git a/Tariffs/obj/Debug/Tariffs.csprojAssemblyReference.cache b/Tariffs/obj/Debug/Tariffs.csprojAssemblyReference.cache
index f8b93f2..bc26d71 100644
Binary files a/Tariffs/obj/Debug/Tariffs.csprojAssemblyReference.cache and b/Tariffs/obj/Debug/Tariffs.csprojAssemblyReference.cache differ
diff --git a/Tariffs/obj/Debug/Tariffs.exe b/Tariffs/obj/Debug/Tariffs.exe
index 80c8703..df91f81 100644
Binary files a/Tariffs/obj/Debug/Tariffs.exe and b/Tariffs/obj/Debug/Tariffs.exe differ
diff --git a/Tariffs/obj/Debug/Tariffs.pdb b/Tariffs/obj/Debug/Tariffs.pdb
index a292602..53d232c 100644
Binary files a/Tariffs/obj/Debug/Tariffs.pdb and b/Tariffs/obj/Debug/Tariffs.pdb differ