aj/ExportDXF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reset prefix if no drawing info is found.

Browse Source
This commit is contained in:
AJ
2021-10-11 06:25:01 -04:00
parent 0d1fd67b8d
commit 15edbf6fec
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ExportDXF/DrawingInfo.cs
View File

@@ -4,7 +4,7 @@ namespace ExportDXF
{
public class DrawingInfo
{
private static Regex drawingFormatRegex = new Regex(@"(?<jobNo>[34]\d{3}(-\d+\w{1,2})?)\s?(?<dwgNo>[ABEP]\d+(-?(\d+|[A-Z]))?)", RegexOptions.IgnoreCase);
private static Regex drawingFormatRegex = new Regex(@"(?<jobNo>[34]\d{3}(-\d+\w{1,2})?)\s?(?<dwgNo>[ABEP]\d+(-?(\d+[A-Z]?))?)", RegexOptions.IgnoreCase);
public string JobNo { get; set; }
@@ -14,7 +14,7 @@ namespace ExportDXF
public override string ToString()
{
return string.Format("{0} {1}", JobNo, DrawingNo);
return $"{JobNo} {DrawingNo}";
}
public override bool Equals(object obj)

20
ExportDXF/Forms/MainForm.cs
View File

@@ -597,16 +597,20 @@ namespace ExportDXF.Forms
var model = sldWorks.ActiveDoc as ModelDoc2;
var isDrawing = model is DrawingDoc;
if (!isDrawing)
return;
if (isDrawing)
{
var drawingInfo = DrawingInfo.Parse(activeDocTitleBox.Text);
var drawingInfo = DrawingInfo.Parse(activeDocTitleBox.Text);
if (drawingInfo == null)
return;
if (drawingInfo == null)
return;
prefixTextBox.Text = string.Format("{0} {1} PT", drawingInfo.JobNo, drawingInfo.DrawingNo);
prefixTextBox.SelectionStart = prefixTextBox.Text.Length;
prefixTextBox.Text = $"{drawingInfo.JobNo} {drawingInfo.DrawingNo} PT";
prefixTextBox.SelectionStart = prefixTextBox.Text.Length;
}
else
{
prefixTextBox.Text = string.Empty;
}
}
}
}