This commit is contained in:
2025-06-20 15:05:28 +02:00
parent dc38a21336
commit 9d8e9864ae
4 changed files with 246 additions and 117 deletions

View File

@@ -19,7 +19,7 @@
WindowStyle="None" WindowStyle="None"
ResizeMode="NoResize" ResizeMode="NoResize"
SizeToContent="WidthAndHeight" SizeToContent="WidthAndHeight"
WindowStartupLocation="CenterScreen" Height="283"> WindowStartupLocation="CenterScreen" Height="329">
<!-- ******** THEME ******** --> <!-- ******** THEME ******** -->
@@ -75,10 +75,24 @@
<!-- listbox placeholder --> <!-- listbox placeholder -->
<ListBox x:Name="ListBox1" <ListBox x:Name="ListBox1"
Margin="265,126,10,0" Margin="400,10,10,0"
Background="{x:Null}" Background="{x:Null}"
BorderThickness="2" BorderThickness="2"
BorderBrush="#FFECE0E0" Height="70" VerticalAlignment="Top"/> BorderBrush="#FFECE0E0"
Height="191"
VerticalAlignment="Top"
FontSize="14">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
<Setter Property="Height" Value="64"/>
<Setter Property="MinHeight" Value="64"/>
<Setter Property="Padding" Value="10,0"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
</Style>
</ListBox.ItemContainerStyle>
</ListBox>
<!-- BAL OLDALI CSOPORTOK --> <!-- BAL OLDALI CSOPORTOK -->
<StackPanel Margin="10,10,0,0" HorizontalAlignment="Left" Width="180"> <StackPanel Margin="10,10,0,0" HorizontalAlignment="Left" Width="180">
@@ -92,7 +106,7 @@
</GroupBox> </GroupBox>
</StackPanel> </StackPanel>
<StackPanel Margin="0,10,215,252" HorizontalAlignment="Right" Width="190"> <StackPanel Margin="0,122,410,140" HorizontalAlignment="Right" Width="180" Visibility="Collapsed">
<GroupBox Header="Dokumentáció " Padding="5" Height="73"> <GroupBox Header="Dokumentáció " Padding="5" Height="73">
<StackPanel> <StackPanel>
<RadioButton x:Name="NamingSyntaxStefani" Content="Robotizálunk"/> <RadioButton x:Name="NamingSyntaxStefani" Content="Robotizálunk"/>
@@ -101,7 +115,8 @@
</GroupBox> </GroupBox>
</StackPanel> </StackPanel>
<StackPanel Margin="10,126,0,71" HorizontalAlignment="Left" Width="250">
<StackPanel Margin="10,126,0,71" HorizontalAlignment="Left" Width="250" Visibility="Collapsed">
<GroupBox Header="Egyéb" Padding="5"> <GroupBox Header="Egyéb" Padding="5">
<StackPanel> <StackPanel>
<CheckBox x:Name="AutomaticFolderSelect" Content="Automatikus mappa választás"/> <CheckBox x:Name="AutomaticFolderSelect" Content="Automatikus mappa választás"/>
@@ -112,18 +127,25 @@
<!-- Rajz használat módja --> <!-- Rajz használat módja -->
<GroupBox Header="Rajz használat módja" <GroupBox Header="Rajz használat módja"
Margin="390,10,0,235" Width="200" HorizontalAlignment="Left" Padding="5"> Margin="195,10,0,235"
Width="200"
HorizontalAlignment="Left"
Padding="5">
<StackPanel> <StackPanel>
<RadioButton x:Name="MaterialRadioButton3" Content="Aktív rajz használata"/> <RadioButton x:Name="MaterialRadioButton3"
<RadioButton x:Name="KulonAloRajzok" Content="Különálló rajzok használata"/> Content="Aktív rajz használata"
IsChecked="True"/>
<RadioButton x:Name="KulonAloRajzok"
Content="Különálló rajzok használata"/>
</StackPanel> </StackPanel>
</GroupBox> </GroupBox>
<!-- Böngészés gomb --> <!-- Böngészés gomb -->
<Button x:Name="Files_Browse" <Button x:Name="Files_Browse"
Content="Böngészés" Content="Böngészés"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="390,87,0,0" Margin="195,112,0,0"
VerticalAlignment="Top" VerticalAlignment="Top"
Width="200" Height="30" Width="200" Height="30"
FontSize="10"/> FontSize="10"/>

View File

@@ -669,11 +669,15 @@ Public Class MainWindow
If isSeperateDrawing = True Then If isSeperateDrawing = True Then
If y = 0 Then Try
HandleNames(FileNameMod, y, i, ".xls", Model1) HandleNames(FileNameMod, y, i, ".xls", Model1)
CreateExcel(Session, FileNameMod) CreateExcel(Session, FileNameMod)
End If Catch ex As Exception
End Try
Else Else
HandleNames(FileNameMod, y, i, ".xls", Model1) HandleNames(FileNameMod, y, i, ".xls", Model1)
@@ -858,7 +862,7 @@ Public Class MainWindow
FileNamesWOExtention = sresult FileNamesWOExtention = sresult
Else Else
FileNamesWOExtention = "NO_VIEW_ON_SHEET" FileNamesWOExtention = System.IO.Path.GetFileNameWithoutExtension(model1.FileName)
End If End If
@@ -1026,6 +1030,7 @@ Public Class MainWindow
'table.Erase() 'table.Erase()
End Sub End Sub
Private Sub HandleExcel(model1 As IpfcModel, FilnameMod As String, TableContent(,) As String) Private Sub HandleExcel(model1 As IpfcModel, FilnameMod As String, TableContent(,) As String)
xlApp = New Excel.Application xlApp = New Excel.Application
@@ -1037,51 +1042,105 @@ Public Class MainWindow
Dim ColCount As Integer = TableContent.GetLength(1) - 1 Dim ColCount As Integer = TableContent.GetLength(1) - 1
'Fill V-numbers...I think '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 Else
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
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 If namingsyntax = "stefani" Then
xlWorkSheet.Cells(1, 7) = "" xlWorkSheet.Cells(1, 7) = ""
ElseIf namingsyntax = "audi" Then ElseIf namingsyntax = "audi" Then
@@ -1340,12 +1399,22 @@ Public Class MainWindow
End If End If
HandleTable(session, TableContent, MoreThanOneTable) 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 tempPath As String = System.IO.Path.Combine(System.IO.Path.GetTempPath(), Path.GetFileName(FilnameMod))
Dim currentDirectory As String = Directory.GetCurrentDirectory() ' Gets the running directory Dim currentDirectory As String = Directory.GetCurrentDirectory() ' Gets the running directory
currentDirectory = "C:\Creo_config\06 - Creo\18 - Utilities" currentDirectory = "C:\Creo11\18-Utilities\Dokumentacio"
Dim sourcePath As String = Path.Combine(currentDirectory, "Darabjegyzek.xlsm") 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 ' Másolja az XLS-t az ideiglenes mappába
File.Copy(sourcePath, tempPath, True) File.Copy(sourcePath, tempPath, True)
@@ -1758,7 +1827,7 @@ Public Class MainWindow
Try Try
Dim CellStr As String = CellToString(iTablea, 2, 5) Dim CellStr As String = CellToString(iTablea, 2, 5)
'MsgBox(CellStr) 'MsgBox(CellStr)
If CellStr = "Famex Tools Kft." Or CellStr = "Famex Tools" Then If CellStr = "Robotizalunk Kft." Or CellStr = "Robotizalunk" Then
MoreThanOne = MoreThanOne + 1 MoreThanOne = MoreThanOne + 1
iTableRef = iTablea iTableRef = iTablea
End If End If
@@ -1773,54 +1842,60 @@ Public Class MainWindow
' iLayer. ' iLayer.
End Sub End Sub
Private Sub HideShowTables(session As IpfcBaseSession, model1 As IpfcModel, HideShow As Boolean) 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 Dim iTables As IpfcTables
If iModelItem.GetName.ToString = "HIDETABLE" Then Dim iTableOnwer As IpfcTableOwner
iLayer = iModelItem iTableOnwer = model1
CheckLayers = 1 iTables = iTableOnwer.ListTables
Dim iTCells As IpfcTableCell
End If iTCells = (New CCpfcTableCell).Create(5, 7)
Next Dim Cstringseq As New Cstringseq
Dim iModelItems As IpfcModelItems
If CheckLayers = 0 Then Dim iLayer As IpfcLayer = Nothing
iLayer = model1.CreateLayer("HideTable") iModelItems = CType(model1, IpfcModelItemOwner).ListItems(EpfcModelItemType.EpfcITEM_LAYER)
End If Dim CheckLayers As Integer = 0
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
For Each iModelItem In iModelItems
If iModelItem.GetName.ToString = "HIDETABLE" Then
iLayer = iModelItem
CheckLayers = 1
End If End If
' MsgBox(Cstringseq.Item(0)) Next
Catch ex As Exception
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. ' iLayer.
End Sub End Sub

View File

@@ -1,11 +1,4 @@
<Window x:Class="Form3" <Window x:Class="Form3"
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
TextElement.FontWeight="Regular"
TextElement.FontSize="13"
TextOptions.TextFormattingMode="Ideal"
TextOptions.TextRenderingMode="Auto"
Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{DynamicResource MaterialDesignFont}"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -14,12 +7,51 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mde="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions" xmlns:mde="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
mc:Ignorable="d" mc:Ignorable="d"
Title="Elkészült" Height="183.994" Width="370.188" FontSize="13" WindowStyle="None" WindowStartupLocation="CenterScreen"> Title="Elkészült"
<Grid Height="178" VerticalAlignment="Top" HorizontalAlignment="Left" Width="370" Margin="0,0,-8,0"> Height="183.994"
<TextBox x:Name="TextBox1" HorizontalAlignment="Left" Height="68" Margin="0,63,0,0" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="360" IsReadOnly="True" BorderBrush="{DynamicResource {x:Static SystemColors.ActiveBorderBrushKey}}" BorderThickness="1" VerticalScrollBarVisibility="Auto"/> Width="370.188"
<Button x:Name="MaterialRaisedButton1" Content="Ok" HorizontalAlignment="Left" Margin="10,136,0,0" VerticalAlignment="Top" Width="156" RenderTransformOrigin="0.785,1.101"/> FontSize="13"
<Label x:Name="Label1" Content="A dokumentáció elkészült" Margin="0,10,10,0" FontSize="20" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Height="48" VerticalAlignment="Top"/> WindowStyle="None"
<Button x:Name="MaterialRaisedButton2" Content="Tartalmazó mappa" HorizontalAlignment="Left" Margin="187,136,0,0" VerticalAlignment="Top" Width="156" RenderTransformOrigin="0.785,1.101"/> WindowStartupLocation="CenterScreen"
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
TextElement.FontWeight="Regular"
TextElement.FontSize="13"
TextOptions.TextFormattingMode="Ideal"
TextOptions.TextRenderingMode="Auto"
Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{DynamicResource MaterialDesignFont}">
<!-- Téma beállítása Teal színnel -->
<Window.Resources>
<materialDesign:BundledTheme BaseTheme="Light"
PrimaryColor="Teal"
SecondaryColor="Teal"/>
</Window.Resources>
<Grid Height="178" VerticalAlignment="Top" HorizontalAlignment="Left" Width="370" Margin="0,0,-8,0">
<Button x:Name="MaterialRaisedButton1"
Content="Ok"
Style="{StaticResource MaterialDesignRaisedButton}"
HorizontalAlignment="Left"
Margin="10,106,0,0"
VerticalAlignment="Top"
Width="156"/>
<Label x:Name="Label1"
Content="A dokumentáció elkészült"
Margin="5,10,5,0"
FontSize="20"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Height="48"
VerticalAlignment="Top"/>
<Button x:Name="MaterialRaisedButton2"
Content="Tartalmazó mappa"
Style="{StaticResource MaterialDesignRaisedButton}"
HorizontalAlignment="Left"
Margin="185,106,0,0"
VerticalAlignment="Top"
Width="156"/>
</Grid> </Grid>
</Window> </Window>

View File

@@ -2,7 +2,7 @@
Private Sub Form3_Loaded(ByVal sender As Object, ByVal e As EventArgs) Handles MyClass.Loaded 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 ' MaterialLabel2.Text = "Hibák száma: " & MainWindow.HibakSzama
If MainWindow.HibakSzama = 0 Then If MainWindow.HibakSzama = 0 Then
@@ -25,9 +25,9 @@
Process.Start(MainWindow.workDir) Process.Start(MainWindow.workDir)
End Sub 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 Private Sub MaterialRaisedButton1_Click_1(sender As Object, e As RoutedEventArgs) Handles MaterialRaisedButton1.Click