diff --git a/Classes.graphml b/Classes.graphml index 5b2e9a4..10e9906 100644 --- a/Classes.graphml +++ b/Classes.graphml @@ -21,10 +21,11 @@ Testsheet - List<Question> questions -string Name + List<Question> questions +string testName int Variant Dictionary<int,bool> results +Dictionary<int, int> chosenAnswers; ==================== Testsheet(string Name, int Variant) void FillQuestions(List<Question> questions) @@ -48,10 +49,11 @@ void UpdateResults(int questionNumber, bool isCorrect) Question - Dictionary<string,bool> answers + Dictionary<string,bool> answers string questionText -*what type?* image - +string image +================ +Question() @@ -89,16 +91,65 @@ DataTable GetStudentResults( args? ) - - + - Main - string studentName + Main + string studentName +string studentSurname +string studentFname +string Faculty +string Group DateTime testStart -Testsheet currentTest +Testsheet currentTest +=================== + + + + + + + + + + + + + + + + + + + + Form1 + + + + + + + + + + + + + + + + + + + + + Form2 + int questionNum +=================== +void AnalisationOfAnswer() +void UpdatingForm() diff --git a/Guidelines.txt b/Guidelines.txt index de4d39c..9c4c723 100644 --- a/Guidelines.txt +++ b/Guidelines.txt @@ -1,9 +1,11 @@ -Интерфейс +Интерфейс ========= -Выбор варианта ответа цифрами на клавиатуре, переход влево-вправо стрелками -Сохрание последних логинов,чтоб не вбивать каждый раз -Карта вопросов - на какие ответ дан,на какие-нет. Кликая по ней, можно переходить к соотв-му вопросу -Максимум сделать через выпадающие списки - номер варинта, тесты, при просмотре результатов - результаты какого теста и тд +-Выбор варианта ответа цифрами на клавиатуре, переход влево-вправо стрелками +-Сохрание последних логинов,чтоб не вбивать каждый раз +-Карта вопросов - на какие ответ дан,на какие-нет. Кликая по ней, можно переходить к соотв-му вопросу +-Максимум сделать через выпадающие списки - номер варинта, тесты, при просмотре результатов - результаты какого теста и тд +-Сохранение выбранных ответов + MySQL diff --git a/VSProject/NachGeom.suo b/VSProject/NachGeom.suo index 0ca0ac5..14a6479 100644 Binary files a/VSProject/NachGeom.suo and b/VSProject/NachGeom.suo differ diff --git a/VSProject/NachGeom/Form1.Designer.cs b/VSProject/NachGeom/Form1.Designer.cs deleted file mode 100644 index af444b0..0000000 --- a/VSProject/NachGeom/Form1.Designer.cs +++ /dev/null @@ -1,197 +0,0 @@ -namespace WindowsFormsApplication1 -{ - partial class Form1 - { - /// - /// Требуется переменная конструктора. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Освободить все используемые ресурсы. - /// - /// истинно, если управляемый ресурс должен быть удален; иначе ложно. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Код, автоматически созданный конструктором форм Windows - - /// - /// Обязательный метод для поддержки конструктора - не изменяйте - /// содержимое данного метода при помощи редактора кода. - /// - private void InitializeComponent() - { - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.radioButton1 = new System.Windows.Forms.RadioButton(); - this.radioButton3 = new System.Windows.Forms.RadioButton(); - this.radioButton5 = new System.Windows.Forms.RadioButton(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.radioButton4 = new System.Windows.Forms.RadioButton(); - this.label1 = new System.Windows.Forms.Label(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.SuspendLayout(); - // - // button1 - // - this.button1.Enabled = false; - this.button1.Location = new System.Drawing.Point(57, 402); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(87, 23); - this.button1.TabIndex = 0; - this.button1.Text = "Предыдущий"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // button2 - // - this.button2.Location = new System.Drawing.Point(179, 402); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(78, 23); - this.button2.TabIndex = 1; - this.button2.Text = "Следующий"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); - // - // button3 - // - this.button3.Location = new System.Drawing.Point(520, 402); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(75, 23); - this.button3.TabIndex = 2; - this.button3.Text = "Закончить"; - this.button3.UseVisualStyleBackColor = true; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.radioButton1); - this.groupBox1.Controls.Add(this.radioButton3); - this.groupBox1.Controls.Add(this.radioButton5); - this.groupBox1.Controls.Add(this.radioButton2); - this.groupBox1.Controls.Add(this.radioButton4); - this.groupBox1.Location = new System.Drawing.Point(30, 31); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(400, 315); - this.groupBox1.TabIndex = 3; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Какое изображение называется видом?"; - // - // radioButton1 - // - this.radioButton1.Location = new System.Drawing.Point(27, 34); - this.radioButton1.Name = "radioButton1"; - this.radioButton1.Size = new System.Drawing.Size(359, 50); - this.radioButton1.TabIndex = 0; - this.radioButton1.TabStop = true; - this.radioButton1.Text = "Изображение фигуры, получающейся при мысленном рассечении предмета одной или неск" + - "олькими плоскостями с показом того, что получается в секущей плоскости"; - this.radioButton1.UseVisualStyleBackColor = true; - this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); - // - // radioButton3 - // - this.radioButton3.Location = new System.Drawing.Point(27, 138); - this.radioButton3.Name = "radioButton3"; - this.radioButton3.Size = new System.Drawing.Size(369, 54); - this.radioButton3.TabIndex = 4; - this.radioButton3.TabStop = true; - this.radioButton3.Text = "Изображение предмета, мысленно рассеченного одной или несколькими плоскостями с п" + - "оказом того, что получается в секущей плоскости и что расположено за ней"; - this.radioButton3.UseVisualStyleBackColor = true; - // - // radioButton5 - // - this.radioButton5.Location = new System.Drawing.Point(27, 261); - this.radioButton5.Name = "radioButton5"; - this.radioButton5.Size = new System.Drawing.Size(369, 48); - this.radioButton5.TabIndex = 3; - this.radioButton5.TabStop = true; - this.radioButton5.Text = "Разрез, служащий для выяснения устройства предмета лишь в отдельном, ограниченном" + - " месте"; - this.radioButton5.UseVisualStyleBackColor = true; - // - // radioButton2 - // - this.radioButton2.Location = new System.Drawing.Point(27, 90); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(369, 42); - this.radioButton2.TabIndex = 2; - this.radioButton2.TabStop = true; - this.radioButton2.Text = "Изображение обращенной к наблюдателю видимой части поверхности предмета"; - this.radioButton2.UseVisualStyleBackColor = true; - // - // radioButton4 - // - this.radioButton4.Location = new System.Drawing.Point(27, 198); - this.radioButton4.Name = "radioButton4"; - this.radioButton4.Size = new System.Drawing.Size(369, 57); - this.radioButton4.TabIndex = 1; - this.radioButton4.TabStop = true; - this.radioButton4.Text = "Дополнительное отдельное изображение какой-либо части предмета, требующей графиче" + - "ского и других поясненй в отношении формы, размеров и других данных"; - this.radioButton4.UseVisualStyleBackColor = true; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(520, 65); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(35, 13); - this.label1.TabIndex = 4; - this.label1.Text = "label1"; - // - // dataGridView1 - // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(461, 151); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.Size = new System.Drawing.Size(134, 155); - this.dataGridView1.TabIndex = 5; - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(669, 474); - this.Controls.Add(this.dataGridView1); - this.Controls.Add(this.label1); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.button3); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); - this.Name = "Form1"; - this.Text = "Тест"; - this.groupBox1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.RadioButton radioButton1; - private System.Windows.Forms.RadioButton radioButton3; - private System.Windows.Forms.RadioButton radioButton5; - private System.Windows.Forms.RadioButton radioButton2; - private System.Windows.Forms.RadioButton radioButton4; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridView dataGridView1; - } -} - diff --git a/VSProject/NachGeom/Form2.Designer.cs b/VSProject/NachGeom/Form2.Designer.cs new file mode 100644 index 0000000..8bb4dae --- /dev/null +++ b/VSProject/NachGeom/Form2.Designer.cs @@ -0,0 +1,343 @@ +namespace WindowsFormsApplication1 +{ + partial class Form2 + { + /// + /// Требуется переменная конструктора. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Освободить все используемые ресурсы. + /// + /// истинно, если управляемый ресурс должен быть удален; иначе ложно. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Код, автоматически созданный конструктором форм Windows + + /// + /// Обязательный метод для поддержки конструктора - не изменяйте + /// содержимое данного метода при помощи редактора кода. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.buttonPrev = new System.Windows.Forms.Button(); + this.buttonNext = new System.Windows.Forms.Button(); + this.buttonEnd = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.radioButton3 = new System.Windows.Forms.RadioButton(); + this.radioButton5 = new System.Windows.Forms.RadioButton(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.radioButton4 = new System.Windows.Forms.RadioButton(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusTime = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusVariant = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusStudentName = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusProgress = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripProgressBar1 = new System.Windows.Forms.ToolStripProgressBar(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + this.label3 = new System.Windows.Forms.Label(); + this.labelQuestionNum = new System.Windows.Forms.Label(); + this.buttonUnanswered = new System.Windows.Forms.Button(); + this.label4 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.groupBox1.SuspendLayout(); + this.statusStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // buttonPrev + // + this.buttonPrev.Enabled = false; + this.buttonPrev.Location = new System.Drawing.Point(57, 402); + this.buttonPrev.Name = "buttonPrev"; + this.buttonPrev.Size = new System.Drawing.Size(87, 23); + this.buttonPrev.TabIndex = 0; + this.buttonPrev.Text = "Предыдущий"; + this.buttonPrev.UseVisualStyleBackColor = true; + this.buttonPrev.Click += new System.EventHandler(this.button1_Click); + // + // buttonNext + // + this.buttonNext.Location = new System.Drawing.Point(179, 402); + this.buttonNext.Name = "buttonNext"; + this.buttonNext.Size = new System.Drawing.Size(78, 23); + this.buttonNext.TabIndex = 1; + this.buttonNext.Text = "Следующий"; + this.buttonNext.UseVisualStyleBackColor = true; + this.buttonNext.Click += new System.EventHandler(this.button2_Click); + // + // buttonEnd + // + this.buttonEnd.Location = new System.Drawing.Point(748, 380); + this.buttonEnd.Name = "buttonEnd"; + this.buttonEnd.Size = new System.Drawing.Size(75, 34); + this.buttonEnd.TabIndex = 2; + this.buttonEnd.Text = "Закончить"; + this.buttonEnd.UseVisualStyleBackColor = true; + this.buttonEnd.Click += new System.EventHandler(this.button3_Click); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.radioButton1); + this.groupBox1.Controls.Add(this.radioButton3); + this.groupBox1.Controls.Add(this.radioButton5); + this.groupBox1.Controls.Add(this.radioButton2); + this.groupBox1.Controls.Add(this.radioButton4); + this.groupBox1.Location = new System.Drawing.Point(29, 65); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(400, 315); + this.groupBox1.TabIndex = 3; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Какое изображение называется видом?"; + // + // radioButton1 + // + this.radioButton1.Location = new System.Drawing.Point(27, 34); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(359, 50); + this.radioButton1.TabIndex = 0; + this.radioButton1.TabStop = true; + this.radioButton1.Text = "Изображение фигуры, получающейся при мысленном рассечении предмета одной или неск" + + "олькими плоскостями с показом того, что получается в секущей плоскости"; + this.radioButton1.UseVisualStyleBackColor = true; + this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // radioButton3 + // + this.radioButton3.Location = new System.Drawing.Point(27, 138); + this.radioButton3.Name = "radioButton3"; + this.radioButton3.Size = new System.Drawing.Size(369, 54); + this.radioButton3.TabIndex = 4; + this.radioButton3.TabStop = true; + this.radioButton3.Text = "Изображение предмета, мысленно рассеченного одной или несколькими плоскостями с п" + + "оказом того, что получается в секущей плоскости и что расположено за ней"; + this.radioButton3.UseVisualStyleBackColor = true; + this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged); + // + // radioButton5 + // + this.radioButton5.Location = new System.Drawing.Point(27, 261); + this.radioButton5.Name = "radioButton5"; + this.radioButton5.Size = new System.Drawing.Size(369, 48); + this.radioButton5.TabIndex = 3; + this.radioButton5.TabStop = true; + this.radioButton5.Text = "Разрез, служащий для выяснения устройства предмета лишь в отдельном, ограниченном" + + " месте"; + this.radioButton5.UseVisualStyleBackColor = true; + this.radioButton5.CheckedChanged += new System.EventHandler(this.radioButton5_CheckedChanged); + // + // radioButton2 + // + this.radioButton2.Location = new System.Drawing.Point(27, 90); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(369, 42); + this.radioButton2.TabIndex = 2; + this.radioButton2.TabStop = true; + this.radioButton2.Text = "Изображение обращенной к наблюдателю видимой части поверхности предмета"; + this.radioButton2.UseVisualStyleBackColor = true; + this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); + // + // radioButton4 + // + this.radioButton4.Location = new System.Drawing.Point(27, 198); + this.radioButton4.Name = "radioButton4"; + this.radioButton4.Size = new System.Drawing.Size(369, 57); + this.radioButton4.TabIndex = 1; + this.radioButton4.TabStop = true; + this.radioButton4.Text = "Дополнительное отдельное изображение какой-либо части предмета, требующей графиче" + + "ского и других поясненй в отношении формы, размеров и других данных"; + this.radioButton4.UseVisualStyleBackColor = true; + this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton4_CheckedChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(458, 10); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(35, 13); + this.label1.TabIndex = 4; + this.label1.Text = "label1"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(458, 36); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(35, 13); + this.label2.TabIndex = 6; + this.label2.Text = "label2"; + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusTime, + this.toolStripStatusVariant, + this.toolStripStatusStudentName, + this.toolStripStatusProgress, + this.toolStripProgressBar1}); + this.statusStrip1.Location = new System.Drawing.Point(0, 461); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(913, 24); + this.statusStrip1.TabIndex = 7; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusTime + // + this.toolStripStatusTime.Name = "toolStripStatusTime"; + this.toolStripStatusTime.Size = new System.Drawing.Size(34, 19); + this.toolStripStatusTime.Text = "Time"; + // + // toolStripStatusVariant + // + this.toolStripStatusVariant.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Left; + this.toolStripStatusVariant.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; + this.toolStripStatusVariant.Name = "toolStripStatusVariant"; + this.toolStripStatusVariant.Size = new System.Drawing.Size(48, 19); + this.toolStripStatusVariant.Text = "Variant"; + // + // toolStripStatusStudentName + // + this.toolStripStatusStudentName.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Left; + this.toolStripStatusStudentName.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; + this.toolStripStatusStudentName.Name = "toolStripStatusStudentName"; + this.toolStripStatusStudentName.Size = new System.Drawing.Size(84, 19); + this.toolStripStatusStudentName.Text = "StudentName"; + // + // toolStripStatusProgress + // + this.toolStripStatusProgress.Name = "toolStripStatusProgress"; + this.toolStripStatusProgress.Size = new System.Drawing.Size(630, 19); + this.toolStripStatusProgress.Spring = true; + this.toolStripStatusProgress.Text = "Прогресс выполнения"; + this.toolStripStatusProgress.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.toolStripStatusProgress.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal; + // + // toolStripProgressBar1 + // + this.toolStripProgressBar1.Maximum = 5; + this.toolStripProgressBar1.Name = "toolStripProgressBar1"; + this.toolStripProgressBar1.Size = new System.Drawing.Size(100, 18); + // + // timer1 + // + this.timer1.Enabled = true; + this.timer1.Interval = 1000; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(634, 10); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(35, 13); + this.label3.TabIndex = 8; + this.label3.Text = "label3"; + // + // labelQuestionNum + // + this.labelQuestionNum.AutoSize = true; + this.labelQuestionNum.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.labelQuestionNum.Location = new System.Drawing.Point(33, 10); + this.labelQuestionNum.Name = "labelQuestionNum"; + this.labelQuestionNum.Size = new System.Drawing.Size(276, 39); + this.labelQuestionNum.TabIndex = 9; + this.labelQuestionNum.Text = "Тест: Имя теста"; + // + // buttonUnanswered + // + this.buttonUnanswered.Location = new System.Drawing.Point(507, 380); + this.buttonUnanswered.Name = "buttonUnanswered"; + this.buttonUnanswered.Size = new System.Drawing.Size(85, 34); + this.buttonUnanswered.TabIndex = 10; + this.buttonUnanswered.Text = "Неотвеченые вопросы"; + this.buttonUnanswered.UseVisualStyleBackColor = true; + this.buttonUnanswered.Click += new System.EventHandler(this.buttonUnanswered_Click); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(624, 36); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(35, 13); + this.label4.TabIndex = 11; + this.label4.Text = "label4"; + // + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(452, 88); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(449, 275); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox1.TabIndex = 12; + this.pictureBox1.TabStop = false; + // + // Form2 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(913, 485); + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.label4); + this.Controls.Add(this.buttonUnanswered); + this.Controls.Add(this.labelQuestionNum); + this.Controls.Add(this.label3); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.buttonEnd); + this.Controls.Add(this.buttonNext); + this.Controls.Add(this.buttonPrev); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "Form2"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Тест"; + this.groupBox1.ResumeLayout(false); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button buttonPrev; + private System.Windows.Forms.Button buttonNext; + private System.Windows.Forms.Button buttonEnd; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.RadioButton radioButton1; + private System.Windows.Forms.RadioButton radioButton3; + private System.Windows.Forms.RadioButton radioButton5; + private System.Windows.Forms.RadioButton radioButton2; + private System.Windows.Forms.RadioButton radioButton4; + private System.Windows.Forms.Label label1; + public System.Windows.Forms.Label label2; + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusTime; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusVariant; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusStudentName; + private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar1; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusProgress; + private System.Windows.Forms.Timer timer1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label labelQuestionNum; + private System.Windows.Forms.Button buttonUnanswered; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.PictureBox pictureBox1; + } +} + diff --git a/VSProject/NachGeom/Form1.cs b/VSProject/NachGeom/Form2.cs similarity index 59% rename from VSProject/NachGeom/Form1.cs rename to VSProject/NachGeom/Form2.cs index 4f0681e..48f10f6 100644 --- a/VSProject/NachGeom/Form1.cs +++ b/VSProject/NachGeom/Form2.cs @@ -10,15 +10,16 @@ namespace WindowsFormsApplication1 { - public partial class Form1 : Form + public partial class Form2 : Form { int questionNum = 1; - Testsheet test; + + List questionData = new List(); List RadioButtonList; List RadioButtonListCash; - - + + /* int i; string[] rad1 = {"1", "Главный вид", "Фронтальный разрез", "Наложенное сечение"}; @@ -33,21 +34,30 @@ public partial class Form1 : Form int[] answ = { 3, 1, 2, 5, 4 }; */ - - public Form1() + public Form2() { InitializeComponent(); - button1.Enabled = false; - - test = new Testsheet("Name234", 1); + buttonPrev.Enabled = false; + pMain.currentTest = new Testsheet("Name234", 1); + pMain.studentName = "Vasya"; + pMain.studentSurname = "Petrov"; + pMain.studentFname = "Petrovich"; + pMain.Faculty = "IU"; + pMain.Group = "IU4-23"; + pMain.testStart = DateTime.Now; + + + //onceMaingForm + toolStripStatusStudentName.Text = "Имя студента: " + pMain.studentName; + toolStripStatusVariant.Text = "Вариант: " + pMain.currentTest.Variant.ToString(); + toolStripStatusTime.Text = "Время выполнения: " + (DateTime.Now - pMain.testStart).ToString("hh':'mm':'ss"); + this.Text = "Тест: " + pMain.currentTest.testName; + //List of Questions for (int i = 0; i < 5; i++) - { questionData.Add(new Question()); - } - //Метод, заполняющий список данными из базы @@ -57,8 +67,8 @@ public Form1() questionData[0].questionText = "Какое изображение называется видом?"; //Variants questionData[0].answers.Add("Изображение фигуры, получающейся при мысленном рассечении предмета одной или несколькими плоскостями с показом того, что получается в секущей плоскости", false); - questionData[0].answers.Add("Изображение обращенной к наблюдателю видимой части поверхности предмета", false); - questionData[0].answers.Add("Изображение предмета, мысленно рассеченного одной или несколькими плоскостями с показом того, что получается в секущей плоскости и что расположено за ней", true); + questionData[0].answers.Add("Изображение обращенной к наблюдателю видимой части поверхности предмета", true); + questionData[0].answers.Add("Изображение предмета, мысленно рассеченного одной или несколькими плоскостями с показом того, что получается в секущей плоскости и что расположено за ней", false); questionData[0].answers.Add("Дополнительное отдельное изображение какой-либо части предмета, требующей графического и других поясненй в отношении формы, размеров и других данных", false); questionData[0].answers.Add("Разрез, служащий для выяснения устройства предмета лишь в отдельном, ограниченном месте", false); @@ -111,8 +121,7 @@ public Form1() //Заполнение списка объекта Тест - test.FillQuestions(questionData); - + pMain.currentTest.FillQuestions(questionData); //Method, creating list of RadioButtons RadioButtonList = new List(); @@ -121,104 +130,199 @@ public Form1() RadioButtonList.Add(radioButton3); RadioButtonList.Add(radioButton4); RadioButtonList.Add(radioButton5); + + UpdatingForm(); + Debugging(); + } + void Debugging() + { + //debugging + label1.Text = ""; + for (int i = 1; i <= 5; i++) + label1.Text += pMain.currentTest.results[i].ToString(); + label2.Text = ""; + for (int i = 1; i <= 5; i++) + label2.Text += pMain.currentTest.chosenAnswers[i].ToString(); + label3.Text = questionNum.ToString(); } + void AnalisationOfAnswer() { + int i = 1; foreach (RadioButton r in RadioButtonList) - { - if(r.Checked) - test.UpdateResults(questionNum, test.questions[questionNum].answers[r.Text]); + { + + if (r.Checked) + { + pMain.currentTest.UpdateResults(questionNum, pMain.currentTest.questions[questionNum - 1].answers[r.Text]); + pMain.currentTest.chosenAnswers[questionNum] = i; + } + i++; } } - - - void UpdatingForm() + + void RadioButtonChecking() { + AnalisationOfAnswer(); + + //Updating ProgressBar + int progressBarValue = 0; + for (int i = 1; i < 6; i++) + { + if (pMain.currentTest.chosenAnswers[i] != 0) + progressBarValue++; + } + toolStripProgressBar1.Value = progressBarValue; + + //Updating buttonUnanswered + bool allAnswered = true; + for (int i = 1; i < 6; i++) + if (pMain.currentTest.chosenAnswers[i] == 0) + allAnswered = false; + if (allAnswered) + buttonUnanswered.Enabled = false; + + Debugging(); + } + - int j; + void UpdatingForm() + { + //creating cash list RadioButtonListCash = new List(); RadioButtonListCash.Add(radioButton1); RadioButtonListCash.Add(radioButton2); RadioButtonListCash.Add(radioButton3); RadioButtonListCash.Add(radioButton4); RadioButtonListCash.Add(radioButton5); - Random rnd = new Random(); + //Disabling and Enabling buttons + if (questionNum == 1) + buttonPrev.Enabled = false; + else + buttonPrev.Enabled = true; + if (questionNum == 5) + buttonNext.Enabled = false; + else + buttonNext.Enabled = true; + + - - groupBox1.Text = test.questions[questionNum - 1].questionText; - foreach (KeyValuePair s in test.questions[questionNum - 1].answers) + //Filling with text + labelQuestionNum.Text = "Задание номер " + questionNum; + groupBox1.Text = pMain.currentTest.questions[questionNum - 1].questionText; + + int j = 0; + foreach (KeyValuePair s in pMain.currentTest.questions[questionNum - 1].answers) { - j = rnd.Next(RadioButtonListCash.Count); - label1.Text = j.ToString(); RadioButtonListCash[j].Text = s.Key; - RadioButtonListCash.RemoveAt(j); + j++; } - label1.Text = ""; - for (int i = 0; i < 5; i++) + + //Cheking answers as was or placing "1" + if (pMain.currentTest.chosenAnswers[questionNum] == 0) { - label1.Text = test.results[1].ToString(); + foreach (RadioButton r in RadioButtonList) + r.Checked = false; } - - label1.Text = test.results[1].ToString(); - - + else + RadioButtonList[pMain.currentTest.chosenAnswers[questionNum] - 1].Checked = true; //picture + string path; + path = "./Images/" + questionNum + ".jpg"; + pictureBox1.Image = Image.FromFile(path); } private void button2_Click(object sender, EventArgs e) { - AnalisationOfAnswer(); - - - if (questionNum == 4) - { - button2.Enabled = false; - } - if (questionNum != 5) - { questionNum++; - } - - button1.Enabled = true; - //Method of updating results; + buttonPrev.Enabled = true; + + UpdatingForm(); + + } - //Method of updating form; + private void button1_Click(object sender, EventArgs e) + { + if(questionNum != 1) + questionNum--; + + buttonNext.Enabled = true; + UpdatingForm(); + + } - + private void button3_Click(object sender, EventArgs e) + { + Form3 form3 = new Form3(); + form3.Show(); } - private void button1_Click(object sender, EventArgs e) + private void buttonUnanswered_Click(object sender, EventArgs e) { - if (questionNum == 2) - { - button1.Enabled = false; - } + if(pMain.currentTest.chosenAnswers[questionNum] != 0 ) + for (int i = 1; i < 6; i++) + if (pMain.currentTest.chosenAnswers[i] == 0) + { + questionNum = i; + UpdatingForm(); + break; + } + - if(questionNum != 1) - { - questionNum--; - } - button2.Enabled = true; + } - //Method of updating form; - UpdatingForm(); + private void timer1_Tick(object sender, EventArgs e) + { + toolStripStatusTime.Text = "Время выполнения: " + (DateTime.Now - pMain.testStart).ToString("hh':'mm':'ss"); } private void radioButton1_CheckedChanged(object sender, EventArgs e) { - // if(sender.checked) - // { - - // } + RadioButtonChecking(); + + } + + private void radioButton2_CheckedChanged(object sender, EventArgs e) + { + RadioButtonChecking(); + + } + + private void radioButton3_CheckedChanged(object sender, EventArgs e) + { + RadioButtonChecking(); + + } + + private void radioButton4_CheckedChanged(object sender, EventArgs e) + { + + RadioButtonChecking(); + } + + private void radioButton5_CheckedChanged(object sender, EventArgs e) + { + + RadioButtonChecking(); + + } + + + + + + + + } } diff --git a/VSProject/NachGeom/Form2.resx b/VSProject/NachGeom/Form2.resx new file mode 100644 index 0000000..36a781e --- /dev/null +++ b/VSProject/NachGeom/Form2.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 133, 17 + + \ No newline at end of file diff --git a/VSProject/NachGeom/Form3.Designer.cs b/VSProject/NachGeom/Form3.Designer.cs new file mode 100644 index 0000000..156afaf --- /dev/null +++ b/VSProject/NachGeom/Form3.Designer.cs @@ -0,0 +1,93 @@ +namespace WindowsFormsApplication1 +{ + partial class Form3 + { + /// + /// Требуется переменная конструктора. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Освободить все используемые ресурсы. + /// + /// истинно, если управляемый ресурс должен быть удален; иначе ложно. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Код, автоматически созданный конструктором форм Windows + + /// + /// Обязательный метод для поддержки конструктора - не изменяйте + /// содержимое данного метода при помощи редактора кода. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(131, 104); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(35, 13); + this.label1.TabIndex = 0; + this.label1.Text = "label1"; + // + // dataGridView1 + // + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2}); + this.dataGridView1.GridColor = System.Drawing.SystemColors.ControlDarkDark; + this.dataGridView1.Location = new System.Drawing.Point(23, 78); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.Size = new System.Drawing.Size(354, 175); + this.dataGridView1.TabIndex = 1; + // + // Column1 + // + this.Column1.HeaderText = "Column1"; + this.Column1.Name = "Column1"; + // + // Column2 + // + this.Column2.HeaderText = "Column2"; + this.Column2.Name = "Column2"; + // + // Form3 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(407, 313); + this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.label1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "Form3"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Результаты"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + } +} \ No newline at end of file diff --git a/VSProject/NachGeom/Form3.cs b/VSProject/NachGeom/Form3.cs new file mode 100644 index 0000000..3d2b1ce --- /dev/null +++ b/VSProject/NachGeom/Form3.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + + +namespace WindowsFormsApplication1 +{ + public partial class Form3 : Form + { + public Form3() + { + InitializeComponent(); + dataGridView1.Rows.Add("Имя теста: ", pMain.currentTest.testName); + dataGridView1.Rows.Add("Номер варианта: ", pMain.currentTest.Variant); + dataGridView1.Rows.Add("Имя студента: ", pMain.studentName + pMain.studentSurname + pMain.studentFname); + dataGridView1.Rows.Add("Группа: ", pMain.Group); + dataGridView1.Rows.Add("Затраченное время: ", (DateTime.Now - pMain.testStart).ToString("hh':'mm':'ss")); + dataGridView1.Rows.Add("Выбранные ответы: ", "d"); + dataGridView1.Rows.Add("Ошибки: ", pMain.currentTest.testName); + dataGridView1.Rows.Add("Оценка: ", pMain.currentTest.testName); + } + } +} diff --git a/VSProject/NachGeom/Form1.resx b/VSProject/NachGeom/Form3.resx similarity index 94% rename from VSProject/NachGeom/Form1.resx rename to VSProject/NachGeom/Form3.resx index 1af7de1..508fc32 100644 --- a/VSProject/NachGeom/Form1.resx +++ b/VSProject/NachGeom/Form3.resx @@ -117,4 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + \ No newline at end of file diff --git a/VSProject/NachGeom/Images/1.jpg b/VSProject/NachGeom/Images/1.jpg new file mode 100644 index 0000000..2b64dbc Binary files /dev/null and b/VSProject/NachGeom/Images/1.jpg differ diff --git a/VSProject/NachGeom/Images/2.jpg b/VSProject/NachGeom/Images/2.jpg new file mode 100644 index 0000000..0b1cfcb Binary files /dev/null and b/VSProject/NachGeom/Images/2.jpg differ diff --git a/VSProject/NachGeom/Images/3.jpg b/VSProject/NachGeom/Images/3.jpg new file mode 100644 index 0000000..65702fa Binary files /dev/null and b/VSProject/NachGeom/Images/3.jpg differ diff --git a/VSProject/NachGeom/Images/4.jpg b/VSProject/NachGeom/Images/4.jpg new file mode 100644 index 0000000..f0eeb82 Binary files /dev/null and b/VSProject/NachGeom/Images/4.jpg differ diff --git a/VSProject/NachGeom/Images/5.jpg b/VSProject/NachGeom/Images/5.jpg new file mode 100644 index 0000000..fff0834 Binary files /dev/null and b/VSProject/NachGeom/Images/5.jpg differ diff --git a/VSProject/NachGeom/NachGeom.csproj b/VSProject/NachGeom/NachGeom.csproj index b7dd1c3..1e124ee 100644 --- a/VSProject/NachGeom/NachGeom.csproj +++ b/VSProject/NachGeom/NachGeom.csproj @@ -46,18 +46,28 @@ - + Form - - Form1.cs + + Form2.cs + + Form + + + Form3.cs + + - - Form1.cs + + Form2.cs + + + Form3.cs ResXFileCodeGenerator diff --git a/VSProject/NachGeom/Program.cs b/VSProject/NachGeom/Program.cs index 302890d..9e07cea 100644 --- a/VSProject/NachGeom/Program.cs +++ b/VSProject/NachGeom/Program.cs @@ -15,7 +15,7 @@ static void Main() { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); + Application.Run(new Form2()); } } } diff --git a/VSProject/NachGeom/Testsheet.cs b/VSProject/NachGeom/Testsheet.cs index 56d533d..3970680 100644 --- a/VSProject/NachGeom/Testsheet.cs +++ b/VSProject/NachGeom/Testsheet.cs @@ -9,34 +9,24 @@ namespace WindowsFormsApplication1 public class Testsheet { public List questions; - - - private string name; - public string Name - { - get { return name; } - private set { name = value; } - } - - + public string testName; public int Variant; public Dictionary results; - + public Dictionary chosenAnswers; //Конструктор public Testsheet(string Name, int Variant) { - this.name = Name; + this.testName = Name; this.Variant = Variant; - this.questions = new List(); - this.results = new Dictionary(); for (int i = 1; i <= 5; i++) - { this.results.Add(i, false); - } + this.chosenAnswers = new Dictionary(); + for (int i = 1; i <= 5; i++) + this.chosenAnswers.Add(i, 0); } //Заполнение вопросов объекта типа Testsheet diff --git a/VSProject/NachGeom/bin/Debug/Images/1.jpg b/VSProject/NachGeom/bin/Debug/Images/1.jpg new file mode 100644 index 0000000..2b64dbc Binary files /dev/null and b/VSProject/NachGeom/bin/Debug/Images/1.jpg differ diff --git a/VSProject/NachGeom/bin/Debug/Images/2.jpg b/VSProject/NachGeom/bin/Debug/Images/2.jpg new file mode 100644 index 0000000..0b1cfcb Binary files /dev/null and b/VSProject/NachGeom/bin/Debug/Images/2.jpg differ diff --git a/VSProject/NachGeom/bin/Debug/Images/3.jpg b/VSProject/NachGeom/bin/Debug/Images/3.jpg new file mode 100644 index 0000000..65702fa Binary files /dev/null and b/VSProject/NachGeom/bin/Debug/Images/3.jpg differ diff --git a/VSProject/NachGeom/bin/Debug/Images/4.jpg b/VSProject/NachGeom/bin/Debug/Images/4.jpg new file mode 100644 index 0000000..f0eeb82 Binary files /dev/null and b/VSProject/NachGeom/bin/Debug/Images/4.jpg differ diff --git a/VSProject/NachGeom/bin/Debug/Images/5.jpg b/VSProject/NachGeom/bin/Debug/Images/5.jpg new file mode 100644 index 0000000..fff0834 Binary files /dev/null and b/VSProject/NachGeom/bin/Debug/Images/5.jpg differ diff --git a/VSProject/NachGeom/bin/Debug/NachGeom.exe b/VSProject/NachGeom/bin/Debug/NachGeom.exe index 00b5dd0..1ebf85b 100644 Binary files a/VSProject/NachGeom/bin/Debug/NachGeom.exe and b/VSProject/NachGeom/bin/Debug/NachGeom.exe differ diff --git a/VSProject/NachGeom/bin/Debug/NachGeom.pdb b/VSProject/NachGeom/bin/Debug/NachGeom.pdb index 6ae82a8..fab8fcc 100644 Binary files a/VSProject/NachGeom/bin/Debug/NachGeom.pdb and b/VSProject/NachGeom/bin/Debug/NachGeom.pdb differ diff --git a/VSProject/NachGeom/obj/x86/Debug/Images/2.jpg b/VSProject/NachGeom/obj/x86/Debug/Images/2.jpg new file mode 100644 index 0000000..0b1cfcb Binary files /dev/null and b/VSProject/NachGeom/obj/x86/Debug/Images/2.jpg differ diff --git a/VSProject/NachGeom/obj/x86/Debug/Images/3.jpg b/VSProject/NachGeom/obj/x86/Debug/Images/3.jpg new file mode 100644 index 0000000..65702fa Binary files /dev/null and b/VSProject/NachGeom/obj/x86/Debug/Images/3.jpg differ diff --git a/VSProject/NachGeom/obj/x86/Debug/Images/4.jpg b/VSProject/NachGeom/obj/x86/Debug/Images/4.jpg new file mode 100644 index 0000000..f0eeb82 Binary files /dev/null and b/VSProject/NachGeom/obj/x86/Debug/Images/4.jpg differ diff --git a/VSProject/NachGeom/obj/x86/Debug/Images/5.jpg b/VSProject/NachGeom/obj/x86/Debug/Images/5.jpg new file mode 100644 index 0000000..fff0834 Binary files /dev/null and b/VSProject/NachGeom/obj/x86/Debug/Images/5.jpg differ diff --git a/VSProject/NachGeom/obj/x86/Debug/NachGeom.csproj.FileListAbsolute.txt b/VSProject/NachGeom/obj/x86/Debug/NachGeom.csproj.FileListAbsolute.txt index 04d88d2..3468c17 100644 --- a/VSProject/NachGeom/obj/x86/Debug/NachGeom.csproj.FileListAbsolute.txt +++ b/VSProject/NachGeom/obj/x86/Debug/NachGeom.csproj.FileListAbsolute.txt @@ -1,7 +1,9 @@ C:\Users\User\Documents\GitHub\NachGeom\VSProject\NachGeom\bin\Debug\NachGeom.exe C:\Users\User\Documents\GitHub\NachGeom\VSProject\NachGeom\bin\Debug\NachGeom.pdb -C:\Users\User\Documents\GitHub\NachGeom\VSProject\NachGeom\obj\x86\Debug\WindowsFormsApplication1.Form1.resources C:\Users\User\Documents\GitHub\NachGeom\VSProject\NachGeom\obj\x86\Debug\WindowsFormsApplication1.Properties.Resources.resources C:\Users\User\Documents\GitHub\NachGeom\VSProject\NachGeom\obj\x86\Debug\NachGeom.csproj.GenerateResource.Cache C:\Users\User\Documents\GitHub\NachGeom\VSProject\NachGeom\obj\x86\Debug\NachGeom.exe C:\Users\User\Documents\GitHub\NachGeom\VSProject\NachGeom\obj\x86\Debug\NachGeom.pdb +C:\Users\User\Documents\GitHub\NachGeom\VSProject\NachGeom\obj\x86\Debug\WindowsFormsApplication1.Form2.resources +C:\Users\User\Documents\GitHub\NachGeom\VSProject\NachGeom\obj\x86\Debug\WindowsFormsApplication1.Form3.resources +C:\Users\User\Documents\GitHub\NachGeom\VSProject\NachGeom\obj\x86\Debug\NachGeom.csprojResolveAssemblyReference.cache diff --git a/VSProject/NachGeom/obj/x86/Debug/NachGeom.csproj.GenerateResource.Cache b/VSProject/NachGeom/obj/x86/Debug/NachGeom.csproj.GenerateResource.Cache index 837bb26..01bcb9c 100644 Binary files a/VSProject/NachGeom/obj/x86/Debug/NachGeom.csproj.GenerateResource.Cache and b/VSProject/NachGeom/obj/x86/Debug/NachGeom.csproj.GenerateResource.Cache differ diff --git a/VSProject/NachGeom/obj/x86/Debug/NachGeom.csprojResolveAssemblyReference.cache b/VSProject/NachGeom/obj/x86/Debug/NachGeom.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..7b7ee8f Binary files /dev/null and b/VSProject/NachGeom/obj/x86/Debug/NachGeom.csprojResolveAssemblyReference.cache differ diff --git a/VSProject/NachGeom/obj/x86/Debug/NachGeom.exe b/VSProject/NachGeom/obj/x86/Debug/NachGeom.exe index 00b5dd0..1ebf85b 100644 Binary files a/VSProject/NachGeom/obj/x86/Debug/NachGeom.exe and b/VSProject/NachGeom/obj/x86/Debug/NachGeom.exe differ diff --git a/VSProject/NachGeom/obj/x86/Debug/NachGeom.pdb b/VSProject/NachGeom/obj/x86/Debug/NachGeom.pdb index 6ae82a8..fab8fcc 100644 Binary files a/VSProject/NachGeom/obj/x86/Debug/NachGeom.pdb and b/VSProject/NachGeom/obj/x86/Debug/NachGeom.pdb differ diff --git a/VSProject/NachGeom/obj/x86/Debug/WindowsFormsApplication1.Form1.resources b/VSProject/NachGeom/obj/x86/Debug/WindowsFormsApplication1.Form2.resources similarity index 100% rename from VSProject/NachGeom/obj/x86/Debug/WindowsFormsApplication1.Form1.resources rename to VSProject/NachGeom/obj/x86/Debug/WindowsFormsApplication1.Form2.resources diff --git a/VSProject/NachGeom/obj/x86/Debug/WindowsFormsApplication1.Form3.resources b/VSProject/NachGeom/obj/x86/Debug/WindowsFormsApplication1.Form3.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/VSProject/NachGeom/obj/x86/Debug/WindowsFormsApplication1.Form3.resources differ diff --git a/VSProject/NachGeom/pMain.cs b/VSProject/NachGeom/pMain.cs new file mode 100644 index 0000000..bd5c921 --- /dev/null +++ b/VSProject/NachGeom/pMain.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace WindowsFormsApplication1 +{ + public static class pMain + { + public static string studentName; + public static string studentSurname; + public static string studentFname; + public static string Faculty; + public static string Group; + public static DateTime testStart; + public static Testsheet currentTest; + } +}