Skip to content

Commit 75fb008

Browse files
gabrielalbinogabrielalbino
committed
Added delete and recover options
1 parent 4d2e797 commit 75fb008

File tree

11 files changed

+205
-213
lines changed

11 files changed

+205
-213
lines changed

‎StroopTest/Models/General/FileManipulation.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public sealed class FileManipulation
3535
private static string _spacialRecoginitionTestFilesPath = "/SpacialRecognitionTestFiles/";
3636
private static string _stroopTestFilesBackupPath = "/StroopTestFiles/";
3737
private static string _reactionTestFilesBackupPath = "/ReactionTestFiles/";
38+
public static string _spacialRecognitionTestFilesBackupPath = "/SpacialRecognitionTestFiles/";
3839

3940
public static string _experimentTestFilesBackupPath = "/ExperimentTestFiles/";
4041
public static string _matchingTestFilesBackupPath = "/MatchingTestFiles/";
@@ -343,6 +344,7 @@ private void CreateBackupFolders()
343344
_reactionTestFilesBackupPath = _defaultPath + _backupFolderName + ReactionTestFilesBackupPath;
344345
_experimentTestFilesBackupPath = _defaultPath + _backupFolderName + _experimentTestFilesBackupPath;
345346
_matchingTestFilesBackupPath = _defaultPath + _backupFolderName + _matchingTestFilesBackupPath;
347+
_spacialRecognitionTestFilesBackupPath = _defaultPath + _backupFolderName + _spacialRecognitionTestFilesBackupPath;
346348
_listFilesBackup = _defaultPath + _backupFolderName + _listFilesBackup;
347349
_spacialRecoginitionFilesBackup = _defaultPath + _backupFolderName + _spacialRecoginitionFilesBackup;
348350

@@ -354,6 +356,8 @@ private void CreateBackupFolders()
354356
Directory.CreateDirectory(ReactionTestFilesBackupPath);
355357
if (!Directory.Exists(_matchingTestFilesBackupPath))
356358
Directory.CreateDirectory(_matchingTestFilesBackupPath);
359+
if (!Directory.Exists(_spacialRecognitionTestFilesBackupPath))
360+
Directory.CreateDirectory(_spacialRecognitionTestFilesBackupPath);
357361
if (!Directory.Exists(_listFilesBackup))
358362
Directory.CreateDirectory(_listFilesBackup);
359363
if (!Directory.Exists(_spacialRecoginitionFilesBackup))
@@ -474,5 +478,6 @@ private void CreateMainFolderAndPaths(string path)
474478
public static string SpacialRecognitionTestFilesPath { get => _spacialRecoginitionTestFilesPath; }
475479
public static string StroopTestFilesBackupPath { get => _stroopTestFilesBackupPath; }
476480
public static string ReactionTestFilesBackupPath { get => _reactionTestFilesBackupPath; }
481+
public static string SpacialReconitionTestFilesBackupPath { get => _spacialRecognitionTestFilesBackupPath; }
477482
}
478483
}

‎StroopTest/Models/Tests/SpacialRecognition/SpacialRecognitionProgram.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@ public SpacialRecognitionProgram(
168168
this.setExpositionLists(imagesListFile, wordsListFile, colorsListFile, stimuluSingleColor);
169169
}
170170

171+
public SpacialRecognitionProgram()
172+
{
173+
}
174+
171175
private void setExpositionLists(string imageList, string wordList, string colorList, string wordColor)
172176
{
173177
if (imageList != LocRM.GetString("open", currentCulture))

‎StroopTest/Resources/Localizations/LocalizedResources.en-US.resx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2869,10 +2869,10 @@ user to the stimulus or if there is no reaction to the stimulus(ms)</td>
28692869
<data name="defaulStroopProgram" xml:space="preserve">
28702870
<value>padrao 16 1000 true 1000 False padrao_words.lst padrao_color.lst false true false 1 false txt false false 160 false false false false 0 0 false false</value>
28712871
</data>
2872-
<data name="FilesNotDeleted" xml:space="preserve">
2873-
<value>No files were moved</value>
2874-
</data>
28752872
<data name="inFormListWarning" xml:space="preserve">
28762873
<value>You will be redirected back to program editing after create the list.</value>
28772874
</data>
2875+
<data name="spacialRecognition" xml:space="preserve">
2876+
<value>Spacial Recognition</value>
2877+
</data>
28782878
</root>

‎StroopTest/Resources/Localizations/LocalizedResources.pt-BR.resx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2316,9 +2316,6 @@ https://github.com/lab-neuro-comp/Test-Platform</value>
23162316
<data name="deleteFiles" xml:space="preserve">
23172317
<value>Você tem certeza que deseja mover todos os arquivos selecionados?</value>
23182318
</data>
2319-
<data name="FilesNotDeleted" xml:space="preserve">
2320-
<value>Nenhuma arquivo foi movido.</value>
2321-
</data>
23222319
<data name="listsNotDeleted" xml:space="preserve">
23232320
<value>Nenhuma lista foi excluída.</value>
23242321
</data>
@@ -2858,4 +2855,7 @@ https://github.com/lab-neuro-comp/Test-Platform</value>
28582855
<data name="String1inFormListWarning" xml:space="preserve">
28592856
<value>Você será redirecionado de volta para a edição do programa após a criação da lista.</value>
28602857
</data>
2858+
<data name="spacialRecognition" xml:space="preserve">
2859+
<value>Reconhecimento Espacial</value>
2860+
</data>
28612861
</root>

‎StroopTest/Views/FileManipulationPages/FileManagment.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using System.Resources;
1212
using System.Globalization;
1313
using TestPlatform.Models;
14+
using TestPlatform.Models.Tests.SpacialRecognition;
1415

1516
namespace TestPlatform.Views.MainForms
1617
{
@@ -311,6 +312,19 @@ private bool filesHasNoDepedency()
311312
return false;
312313
}
313314
}
315+
else if(type == LocRM.GetString("spacialRecognition", currentCulture))
316+
{
317+
SpacialRecognitionProgram program = new SpacialRecognitionProgram();
318+
try
319+
{
320+
program.configureReadProgram(FileManipulation._spacialRecognitionTestFilesBackupPath + destinationFilesList.Items[count].ToString() + ".prg");
321+
}
322+
catch (FileNotFoundException e)
323+
{
324+
MessageBox.Show(LocRM.GetString("cannotRecoverFilesByMotive", currentCulture) + destinationFilesList.Items[count].ToString() + "\":\n" + e.Message);
325+
return false;
326+
}
327+
}
314328
}
315329
}
316330
}

‎StroopTest/Views/FileManipulationPages/FileManagment.resx‎

Lines changed: 29 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,10 @@
119119
</resheader>
120120
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121121
<data name="originFilesList.Location" type="System.Drawing.Point, System.Drawing">
122-
<value>4, 69</value>
123-
</data>
124-
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
125-
<data name="originFilesList.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
126-
<value>4, 4, 4, 4</value>
122+
<value>3, 56</value>
127123
</data>
128124
<data name="originFilesList.Size" type="System.Drawing.Size, System.Drawing">
129-
<value>365, 329</value>
125+
<value>275, 264</value>
130126
</data>
131127
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
132128
<data name="originFilesList.TabIndex" type="System.Int32, mscorlib">
@@ -145,13 +141,10 @@
145141
<value>11</value>
146142
</data>
147143
<data name="destinationFilesList.Location" type="System.Drawing.Point, System.Drawing">
148-
<value>428, 69</value>
149-
</data>
150-
<data name="destinationFilesList.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
151-
<value>4, 4, 4, 4</value>
144+
<value>321, 56</value>
152145
</data>
153146
<data name="destinationFilesList.Size" type="System.Drawing.Size, System.Drawing">
154-
<value>365, 329</value>
147+
<value>275, 264</value>
155148
</data>
156149
<data name="destinationFilesList.TabIndex" type="System.Int32, mscorlib">
157150
<value>1</value>
@@ -172,13 +165,10 @@
172165
<value>True</value>
173166
</data>
174167
<data name="originListLabel.Location" type="System.Drawing.Point, System.Drawing">
175-
<value>4, 49</value>
176-
</data>
177-
<data name="originListLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
178-
<value>4, 0, 4, 0</value>
168+
<value>3, 40</value>
179169
</data>
180170
<data name="originListLabel.Size" type="System.Drawing.Size, System.Drawing">
181-
<value>100, 17</value>
171+
<value>74, 13</value>
182172
</data>
183173
<data name="originListLabel.TabIndex" type="System.Int32, mscorlib">
184174
<value>2</value>
@@ -201,17 +191,15 @@
201191
<data name="destinationListLabel.AutoSize" type="System.Boolean, mscorlib">
202192
<value>True</value>
203193
</data>
194+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
204195
<data name="destinationListLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
205196
<value>NoControl</value>
206197
</data>
207198
<data name="destinationListLabel.Location" type="System.Drawing.Point, System.Drawing">
208-
<value>424, 49</value>
209-
</data>
210-
<data name="destinationListLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
211-
<value>4, 0, 4, 0</value>
199+
<value>318, 40</value>
212200
</data>
213201
<data name="destinationListLabel.Size" type="System.Drawing.Size, System.Drawing">
214-
<value>134, 17</value>
202+
<value>100, 13</value>
215203
</data>
216204
<data name="destinationListLabel.TabIndex" type="System.Int32, mscorlib">
217205
<value>3</value>
@@ -235,13 +223,10 @@
235223
<value>NoControl</value>
236224
</data>
237225
<data name="errorMessage.Location" type="System.Drawing.Point, System.Drawing">
238-
<value>8, 554</value>
239-
</data>
240-
<data name="errorMessage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
241-
<value>4, 0, 4, 0</value>
226+
<value>6, 404</value>
242227
</data>
243228
<data name="errorMessage.Size" type="System.Drawing.Size, System.Drawing">
244-
<value>792, 100</value>
229+
<value>594, 81</value>
245230
</data>
246231
<data name="errorMessage.TabIndex" type="System.Int32, mscorlib">
247232
<value>4</value>
@@ -265,13 +250,10 @@
265250
<value>True</value>
266251
</data>
267252
<data name="warningCheckBox.Location" type="System.Drawing.Point, System.Drawing">
268-
<value>4, 662</value>
269-
</data>
270-
<data name="warningCheckBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
271-
<value>4, 4, 4, 4</value>
253+
<value>3, 477</value>
272254
</data>
273255
<data name="warningCheckBox.Size" type="System.Drawing.Size, System.Drawing">
274-
<value>141, 21</value>
256+
<value>112, 17</value>
275257
</data>
276258
<data name="warningCheckBox.TabIndex" type="System.Int32, mscorlib">
277259
<value>5</value>
@@ -295,13 +277,10 @@
295277
<value>Popup</value>
296278
</data>
297279
<data name="cancelButton.Location" type="System.Drawing.Point, System.Drawing">
298-
<value>4, 691</value>
299-
</data>
300-
<data name="cancelButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
301-
<value>4, 4, 4, 4</value>
280+
<value>3, 500</value>
302281
</data>
303282
<data name="cancelButton.Size" type="System.Drawing.Size, System.Drawing">
304-
<value>149, 28</value>
283+
<value>112, 23</value>
305284
</data>
306285
<data name="cancelButton.TabIndex" type="System.Int32, mscorlib">
307286
<value>6</value>
@@ -328,13 +307,10 @@
328307
<value>NoControl</value>
329308
</data>
330309
<data name="sendButton.Location" type="System.Drawing.Point, System.Drawing">
331-
<value>647, 691</value>
332-
</data>
333-
<data name="sendButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
334-
<value>4, 4, 4, 4</value>
310+
<value>485, 500</value>
335311
</data>
336312
<data name="sendButton.Size" type="System.Drawing.Size, System.Drawing">
337-
<value>149, 28</value>
313+
<value>112, 23</value>
338314
</data>
339315
<data name="sendButton.TabIndex" type="System.Int32, mscorlib">
340316
<value>7</value>
@@ -364,13 +340,10 @@
364340
<value>NoControl</value>
365341
</data>
366342
<data name="addToDestinationList.Location" type="System.Drawing.Point, System.Drawing">
367-
<value>379, 197</value>
368-
</data>
369-
<data name="addToDestinationList.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
370-
<value>4, 4, 4, 4</value>
343+
<value>284, 160</value>
371344
</data>
372345
<data name="addToDestinationList.Size" type="System.Drawing.Size, System.Drawing">
373-
<value>41, 31</value>
346+
<value>31, 25</value>
374347
</data>
375348
<data name="addToDestinationList.TabIndex" type="System.Int32, mscorlib">
376349
<value>8</value>
@@ -400,13 +373,10 @@
400373
<value>NoControl</value>
401374
</data>
402375
<data name="addToOriginList.Location" type="System.Drawing.Point, System.Drawing">
403-
<value>379, 235</value>
404-
</data>
405-
<data name="addToOriginList.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
406-
<value>4, 4, 4, 4</value>
376+
<value>284, 191</value>
407377
</data>
408378
<data name="addToOriginList.Size" type="System.Drawing.Size, System.Drawing">
409-
<value>41, 31</value>
379+
<value>31, 25</value>
410380
</data>
411381
<data name="addToOriginList.TabIndex" type="System.Int32, mscorlib">
412382
<value>9</value>
@@ -430,13 +400,13 @@
430400
<value>Zoom</value>
431401
</data>
432402
<data name="helpButton.Location" type="System.Drawing.Point, System.Drawing">
433-
<value>763, 2</value>
403+
<value>572, 2</value>
434404
</data>
435405
<data name="helpButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
436-
<value>3, 2, 3, 2</value>
406+
<value>2, 2, 2, 2</value>
437407
</data>
438408
<data name="helpButton.Size" type="System.Drawing.Size, System.Drawing">
439-
<value>35, 32</value>
409+
<value>26, 26</value>
440410
</data>
441411
<data name="helpButton.TabIndex" type="System.Int32, mscorlib">
442412
<value>10</value>
@@ -460,13 +430,10 @@
460430
<value>NoControl</value>
461431
</data>
462432
<data name="warningLabel.Location" type="System.Drawing.Point, System.Drawing">
463-
<value>12, 431</value>
464-
</data>
465-
<data name="warningLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
466-
<value>4, 0, 4, 0</value>
433+
<value>9, 323</value>
467434
</data>
468435
<data name="warningLabel.Size" type="System.Drawing.Size, System.Drawing">
469-
<value>784, 100</value>
436+
<value>588, 81</value>
470437
</data>
471438
<data name="warningLabel.TabIndex" type="System.Int32, mscorlib">
472439
<value>85</value>
@@ -493,13 +460,13 @@
493460
<value>True</value>
494461
</metadata>
495462
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
496-
<value>8, 16</value>
463+
<value>6, 13</value>
497464
</data>
498465
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
499-
<value>3, 2, 3, 2</value>
466+
<value>2, 2, 2, 2</value>
500467
</data>
501468
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
502-
<value>800, 738</value>
469+
<value>600, 525</value>
503470
</data>
504471
<data name="&gt;&gt;$this.Name" xml:space="preserve">
505472
<value>FileManagment</value>

‎StroopTest/Views/SidebarUserControls/SpacialRecognitionControl.Designer.cs‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎StroopTest/Views/SidebarUserControls/SpacialRecognitionControl.cs‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using System.Globalization;
1313
using TestPlatform.Views.SpecialRecognitionPages;
1414
using TestPlatform.Models.Tests.SpacialRecognition;
15+
using TestPlatform.Views.MainForms;
1516

1617
namespace TestPlatform.Views.SidebarUserControls
1718
{
@@ -115,5 +116,49 @@ private void editSpacialRecognitionButton_Click(object sender, EventArgs e)
115116
/*do nothing*/
116117
}
117118
}
119+
120+
private void DeleteSpacialRecognitionButton_Click(object sender, EventArgs e)
121+
{
122+
bool screenTranslationAllowed = true;
123+
try
124+
{
125+
if (deleteSpacialRecognitionButton.Checked)
126+
{
127+
if (FileManipulation.GlobalFormMain._contentPanel.Controls.Count > 0)
128+
{
129+
screenTranslationAllowed = checkSave();
130+
}
131+
if (screenTranslationAllowed)
132+
{
133+
FileManagment deleteProgram = new FileManagment(SpacialRecognitionProgram.GetProgramsPath(), FileManipulation.SpacialReconitionTestFilesBackupPath, 'd', LocRM.GetString("spacialRecognition", currentCulture));
134+
FileManipulation.GlobalFormMain._contentPanel.Controls.Add(deleteProgram);
135+
deleteSpacialRecognitionButton.Checked = false;
136+
}
137+
}
138+
}
139+
catch (Exception ex) { MessageBox.Show(ex.Message); }
140+
}
141+
142+
private void RecoverSpacialRecognitionButton_Click(object sender, EventArgs e)
143+
{
144+
bool screenTranslationAllowed = true;
145+
try
146+
{
147+
if (recoverSpacialRecognitionButton.Checked)
148+
{
149+
if (FileManipulation.GlobalFormMain._contentPanel.Controls.Count > 0)
150+
{
151+
screenTranslationAllowed = checkSave();
152+
}
153+
if (screenTranslationAllowed)
154+
{
155+
FileManagment recoverProgram = new FileManagment(FileManipulation.SpacialReconitionTestFilesBackupPath, SpacialRecognitionProgram.GetProgramsPath(), 'r', LocRM.GetString("spacialRecognition", currentCulture));
156+
FileManipulation.GlobalFormMain._contentPanel.Controls.Add(recoverProgram);
157+
recoverSpacialRecognitionButton.Checked = false;
158+
}
159+
}
160+
}
161+
catch (Exception ex) { MessageBox.Show(ex.Message); }
162+
}
118163
}
119164
}

0 commit comments

Comments
 (0)