diff --git a/Dokumentáció Készítő 3/MainWindow.xaml b/Dokumentáció Készítő 3/MainWindow.xaml
index f5d041d..e96ccf0 100644
--- a/Dokumentáció Készítő 3/MainWindow.xaml
+++ b/Dokumentáció Készítő 3/MainWindow.xaml
@@ -19,7 +19,7 @@
WindowStyle="None"
ResizeMode="NoResize"
SizeToContent="WidthAndHeight"
- WindowStartupLocation="CenterScreen" Height="283">
+ WindowStartupLocation="CenterScreen" Height="329">
@@ -75,10 +75,24 @@
+ Margin="400,10,10,0"
+ Background="{x:Null}"
+ BorderThickness="2"
+ BorderBrush="#FFECE0E0"
+ Height="191"
+ VerticalAlignment="Top"
+ FontSize="14">
+
+
+
+
+
+
@@ -92,7 +106,7 @@
-
+
@@ -101,7 +115,8 @@
-
+
+
@@ -112,18 +127,25 @@
+ Margin="195,10,0,235"
+ Width="200"
+ HorizontalAlignment="Left"
+ Padding="5">
-
-
+
+
+
diff --git a/Dokumentáció Készítő 3/MainWindow.xaml.vb b/Dokumentáció Készítő 3/MainWindow.xaml.vb
index 9ee77d3..a2739ae 100644
--- a/Dokumentáció Készítő 3/MainWindow.xaml.vb
+++ b/Dokumentáció Készítő 3/MainWindow.xaml.vb
@@ -669,11 +669,15 @@ Public Class MainWindow
If isSeperateDrawing = True Then
- If y = 0 Then
+ Try
+
HandleNames(FileNameMod, y, i, ".xls", Model1)
CreateExcel(Session, FileNameMod)
- End If
+ Catch ex As Exception
+
+ End Try
+
Else
HandleNames(FileNameMod, y, i, ".xls", Model1)
@@ -858,7 +862,7 @@ Public Class MainWindow
FileNamesWOExtention = sresult
Else
- FileNamesWOExtention = "NO_VIEW_ON_SHEET"
+ FileNamesWOExtention = System.IO.Path.GetFileNameWithoutExtension(model1.FileName)
End If
@@ -1026,6 +1030,7 @@ Public Class MainWindow
'table.Erase()
End Sub
+
Private Sub HandleExcel(model1 As IpfcModel, FilnameMod As String, TableContent(,) As String)
xlApp = New Excel.Application
@@ -1037,51 +1042,105 @@ Public Class MainWindow
Dim ColCount As Integer = TableContent.GetLength(1) - 1
'Fill V-numbers...I think
- For row = 3 To RowCount - 3
+ Dim ColCount2 As Integer = TableContent.GetLength(1)
+
+ Dim o As Integer = 2
+ If ColCount2 > 13 Then
+ For row = 3 To RowCount - 3
+
+ Console.WriteLine(TableContent(row, 7))
+ ' If TableContent(row, 7).Length < 2 Then
+ ' TableContent(row, 7) = " "
+ ' End If
+ 'Ha "V-"-vel kezdődik a string akkor kitölti a
+ ' If TableContent(row, 7).Substring(0, 2) <> "V-" Then
+ ' For col = 1 To ColCount
+ ' xlWorkSheet.Cells(row + 5, col) = TableContent(row, col)
+ 'xt
+ ' Else
+ Dim u As Integer = 0
+ xlWorkSheet.Cells(row + u, 1) = TableContent(row, 1)
+
+ xlWorkSheet.Cells(row + u, 2) = TableContent(row, 3)
+ 'xlWorkSheet.Cells(row + u, 3) = TableContent(row, 3)
+ ' xlWorkSheet.Cells(row + u, 3) = TableContent(row, 4)
+ xlWorkSheet.Cells(row + u, 3) = TableContent(row, 5)
+ xlWorkSheet.Cells(row + u, 4) = TableContent(row, 6)
+ xlWorkSheet.Cells(row + u, 5) = TableContent(row, 7)
+ xlWorkSheet.Cells(row + u, 6) = TableContent(row, 8)
+ xlWorkSheet.Cells(row + u, 9) = TableContent(row, 9).Replace("n", "ø")
+ ' xlWorkSheet.Cells(row + u, 9) = TableContent(row, 9)
+ xlWorkSheet.Cells(row + u, 10) = TableContent(row, 10)
+ xlWorkSheet.Cells(row + u, 11) = TableContent(row, 11)
+ xlWorkSheet.Cells(row + u, 12) = TableContent(row, 12)
+ xlWorkSheet.Cells(row + u, 13) = TableContent(row, 13)
+ xlWorkSheet.Cells(row + u, 14) = TableContent(row, 14)
+
+
+ ' End If
+ '
+ Next
+
+
+
+
- Console.WriteLine(TableContent(row, 7))
- ' If TableContent(row, 7).Length < 2 Then
- ' TableContent(row, 7) = " "
- ' End If
- 'Ha "V-"-vel kezdődik a string akkor kitölti a
- ' If TableContent(row, 7).Substring(0, 2) <> "V-" Then
- ' For col = 1 To ColCount
- ' xlWorkSheet.Cells(row + 5, col) = TableContent(row, col)
- 'xt
- ' Else
- Dim u As Integer = 1
- xlWorkSheet.Cells(row + u, 1) = TableContent(row, 1)
- xlWorkSheet.Cells(row + u, 2) = TableContent(row, 2)
- xlWorkSheet.Cells(row + u, 3) = TableContent(row, 3)
- xlWorkSheet.Cells(row + u, 4) = TableContent(row, 4)
- xlWorkSheet.Cells(row + u, 5) = TableContent(row, 5)
- xlWorkSheet.Cells(row + u, 6) = TableContent(row, 6)
- xlWorkSheet.Cells(row + u, 7) = TableContent(row, 7)
- xlWorkSheet.Cells(row + u, 8) = TableContent(row, 8)
- xlWorkSheet.Cells(row + u, 9) = TableContent(row, 9).Replace("n", "ø")
- ' xlWorkSheet.Cells(row + u, 9) = TableContent(row, 9)
- xlWorkSheet.Cells(row + u, 10) = TableContent(row, 10)
- ' End If
'
- Next
- 'Do I really need this ?!
- SHMNum = CellToString(table, 1, 5)
- NameT = CellToString(table, 3, 5)
- MachineName = CellToString(table, 3, 7)
- SHMDate = CellToString(table, 4, 7)
- SubMachineName = CellToString(table, 2, 7)
- AudiNum = CellToString(table, 1, 7)
- 'A fejléc kitöltése
- xlWorkSheet.Cells(1, 5) = SHMNum
- ' xlWorkSheet.Cells(4, 10) = SHMNum
- xlWorkSheet.Cells(3, 5) = NameT
- xlWorkSheet.Cells(4, 5) = NameT
- xlWorkSheet.Cells(3, 7) = MachineName
- xlWorkSheet.Cells(4, 7) = SHMDate
- xlWorkSheet.Cells(4, 9) = SHMDate
- xlWorkSheet.Cells(2, 7) = SubMachineName
+ Else
+ For row = 3 To RowCount - 3
+
+ Console.WriteLine(TableContent(row, 7))
+ ' If TableContent(row, 7).Length < 2 Then
+ ' TableContent(row, 7) = " "
+ ' End If
+ 'Ha "V-"-vel kezdődik a string akkor kitölti a
+ ' If TableContent(row, 7).Substring(0, 2) <> "V-" Then
+ ' For col = 1 To ColCount
+ ' xlWorkSheet.Cells(row + 5, col) = TableContent(row, col)
+ 'xt
+ ' Else
+
+ Dim u As Integer = 1
+
+ xlWorkSheet.Cells(row + u, 1) = TableContent(row, 1)
+ xlWorkSheet.Cells(row + u, 2) = TableContent(row, 2)
+ xlWorkSheet.Cells(row + u, 3) = TableContent(row, 3)
+ xlWorkSheet.Cells(row + u, 4) = TableContent(row, 4)
+ xlWorkSheet.Cells(row + u, 5) = TableContent(row, 5)
+ xlWorkSheet.Cells(row + u, 6) = TableContent(row, 6)
+ xlWorkSheet.Cells(row + u, 7) = TableContent(row, 7)
+ xlWorkSheet.Cells(row + u, 8) = TableContent(row, 8)
+ xlWorkSheet.Cells(row + u, 9) = TableContent(row, 9).Replace("n", "ø")
+ ' xlWorkSheet.Cells(row + u, 9) = TableContent(row, 9)
+ xlWorkSheet.Cells(row + u, 10) = TableContent(row, 10)
+ Next
+ 'Do I really need this ?!
+ 'SHMNum = CellToString(table, 1, 5)
+ ' NameT = CellToString(table, 3, 5)
+ ' MachineName = CellToString(table, 3, 7)
+ ' SHMDate = CellToString(table, 4, 7)
+ SubMachineName = CellToString(table, 2, 7)
+ ' AudiNum = CellToString(table, 1, 7)
+
+ 'A fejléc kitöltése
+ ' xlWorkSheet.Cells(1, 5) = SHMNum
+ ' xlWorkSheet.Cells(4, 10) = SHMNum
+ ' xlWorkSheet.Cells(3, 5) = NameT
+ ' xlWorkSheet.Cells(4, 5) = NameT
+ ' xlWorkSheet.Cells(3, 7) = MachineName
+ ' xlWorkSheet.Cells(4, 7) = SHMDate
+ 'xlWorkSheet.Cells(4, 9) = SHMDate
+ ' xlWorkSheet.Cells(2, 7) = SubMachineName
+
+ ' End If
+ End If
+
+
+
+
+ '
If namingsyntax = "stefani" Then
xlWorkSheet.Cells(1, 7) = ""
ElseIf namingsyntax = "audi" Then
@@ -1340,12 +1399,22 @@ Public Class MainWindow
End If
HandleTable(session, TableContent, MoreThanOneTable)
-
- ' Generálja a temp fájl elérési útját
Dim tempPath As String = System.IO.Path.Combine(System.IO.Path.GetTempPath(), Path.GetFileName(FilnameMod))
Dim currentDirectory As String = Directory.GetCurrentDirectory() ' Gets the running directory
- currentDirectory = "C:\Creo_config\06 - Creo\18 - Utilities"
- Dim sourcePath As String = Path.Combine(currentDirectory, "Darabjegyzek.xlsm")
+ currentDirectory = "C:\Creo11\18-Utilities\Dokumentacio"
+ Dim ColCount2 As Integer = TableContent.GetLength(1)
+ Dim sourcePath As String
+
+
+ If ColCount2 > 13 Then
+ sourcePath = Path.Combine(currentDirectory, "Darabjegyzek_beszerzes.xlsm")
+ Else
+ sourcePath = Path.Combine(currentDirectory, "Darabjegyzek.xlsm")
+
+ End If
+
+ ' Generálja a temp fájl elérési útját
+
' Másolja az XLS-t az ideiglenes mappába
File.Copy(sourcePath, tempPath, True)
@@ -1758,7 +1827,7 @@ Public Class MainWindow
Try
Dim CellStr As String = CellToString(iTablea, 2, 5)
'MsgBox(CellStr)
- If CellStr = "Famex Tools Kft." Or CellStr = "Famex Tools" Then
+ If CellStr = "Robotizalunk Kft." Or CellStr = "Robotizalunk" Then
MoreThanOne = MoreThanOne + 1
iTableRef = iTablea
End If
@@ -1773,54 +1842,60 @@ Public Class MainWindow
' iLayer.
End Sub
Private Sub HideShowTables(session As IpfcBaseSession, model1 As IpfcModel, HideShow As Boolean)
+ Try
- Dim iTables As IpfcTables
- Dim iTableOnwer As IpfcTableOwner
- iTableOnwer = model1
- iTables = iTableOnwer.ListTables
- Dim iTCells As IpfcTableCell
- iTCells = (New CCpfcTableCell).Create(5, 7)
- Dim Cstringseq As New Cstringseq
- Dim iModelItems As IpfcModelItems
- Dim iLayer As IpfcLayer = Nothing
- iModelItems = CType(model1, IpfcModelItemOwner).ListItems(EpfcModelItemType.EpfcITEM_LAYER)
- Dim CheckLayers As Integer = 0
- For Each iModelItem In iModelItems
- If iModelItem.GetName.ToString = "HIDETABLE" Then
- iLayer = iModelItem
- CheckLayers = 1
-
- End If
- Next
-
- If CheckLayers = 0 Then
- iLayer = model1.CreateLayer("HideTable")
- End If
-
- iLayer.Status = 2
-
- For Each iTablea As IpfcTable In iTables
- ' iTablea.
- Try
-
- Cstringseq = iTablea.GetText(iTCells, 0)
-
- If Cstringseq.Item(0) = "Stefani" Then
- If HideShow = True Then
- iLayer.AddItem(iTablea)
- Else
- iLayer.RemoveItem(iTablea)
- End If
+ Dim iTables As IpfcTables
+ Dim iTableOnwer As IpfcTableOwner
+ iTableOnwer = model1
+ iTables = iTableOnwer.ListTables
+ Dim iTCells As IpfcTableCell
+ iTCells = (New CCpfcTableCell).Create(5, 7)
+ Dim Cstringseq As New Cstringseq
+ Dim iModelItems As IpfcModelItems
+ Dim iLayer As IpfcLayer = Nothing
+ iModelItems = CType(model1, IpfcModelItemOwner).ListItems(EpfcModelItemType.EpfcITEM_LAYER)
+ Dim CheckLayers As Integer = 0
+ For Each iModelItem In iModelItems
+ If iModelItem.GetName.ToString = "HIDETABLE" Then
+ iLayer = iModelItem
+ CheckLayers = 1
End If
- ' MsgBox(Cstringseq.Item(0))
- Catch ex As Exception
+ Next
- End Try
+ If CheckLayers = 0 Then
+ iLayer = model1.CreateLayer("HideTable")
+ End If
- Next
+ iLayer.Status = 2
+
+ For Each iTablea As IpfcTable In iTables
+ ' iTablea.
+ Try
+
+ Cstringseq = iTablea.GetText(iTCells, 0)
+
+ If Cstringseq.Item(0) = "Robot" Then
+ If HideShow = True Then
+ iLayer.AddItem(iTablea)
+ Else
+ iLayer.RemoveItem(iTablea)
+ End If
+
+
+ End If
+ ' MsgBox(Cstringseq.Item(0))
+ Catch ex As Exception
+
+ End Try
+
+ Next
+
+ Catch ex As Exception
+
+ End Try
' iLayer.
End Sub
diff --git a/Dokumentáció Készítő 3/form3.xaml b/Dokumentáció Készítő 3/form3.xaml
index a1860ec..59802d9 100644
--- a/Dokumentáció Készítő 3/form3.xaml
+++ b/Dokumentáció Készítő 3/form3.xaml
@@ -1,11 +1,4 @@
-
-
-
-
-
+ Title="Elkészült"
+ Height="183.994"
+ Width="370.188"
+ FontSize="13"
+ WindowStyle="None"
+ WindowStartupLocation="CenterScreen"
+ TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+ TextElement.FontWeight="Regular"
+ TextElement.FontSize="13"
+ TextOptions.TextFormattingMode="Ideal"
+ TextOptions.TextRenderingMode="Auto"
+ Background="{DynamicResource MaterialDesignPaper}"
+ FontFamily="{DynamicResource MaterialDesignFont}">
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Dokumentáció Készítő 3/form3.xaml.vb b/Dokumentáció Készítő 3/form3.xaml.vb
index 4369a64..3c620af 100644
--- a/Dokumentáció Készítő 3/form3.xaml.vb
+++ b/Dokumentáció Készítő 3/form3.xaml.vb
@@ -2,7 +2,7 @@
Private Sub Form3_Loaded(ByVal sender As Object, ByVal e As EventArgs) Handles MyClass.Loaded
- TextBox1.Text = MainWindow.sresult
+ ' TextBox1.Text = MainWindow.sresult
' MaterialLabel2.Text = "Hibák száma: " & MainWindow.HibakSzama
If MainWindow.HibakSzama = 0 Then
@@ -25,9 +25,9 @@
Process.Start(MainWindow.workDir)
End Sub
- Private Sub TextBox1_TextChanged(sender As Object, e As TextChangedEventArgs) Handles TextBox1.TextChanged
+ ' Private Sub TextBox1_TextChanged(sender As Object, e As TextChangedEventArgs) Handles TextBox1.TextChanged
- End Sub
+ ' End Sub
Private Sub MaterialRaisedButton1_Click_1(sender As Object, e As RoutedEventArgs) Handles MaterialRaisedButton1.Click