Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
79382dc526 | |||
0992b91b9d |
@ -86,7 +86,7 @@
|
||||
Me.sPath = Nothing
|
||||
Me.oOrt.Clear()
|
||||
ReDim Me.Markierung(0) '####################### <<<<======= Hier werden Funktionen und Rotienen Geschreiben die die Markierungen steuern ....
|
||||
End Sub
|
||||
End Sub 'Lehren des Objects
|
||||
|
||||
Public Sub Create_NewMark(ByVal ID As Long, ByVal PositionX As Long, ByVal PositionY As Long, Optional ByVal Radius As Long = 10, Optional ByVal Description As String = "")
|
||||
' Dim Index As Integer
|
||||
@ -159,7 +159,7 @@
|
||||
Me.sAdresse = Nothing
|
||||
Me.sDescription = Nothing
|
||||
Me.sGPS = Nothing
|
||||
End Sub
|
||||
End Sub 'Lehren des Objects
|
||||
|
||||
End Class 'Place
|
||||
End Namespace 'Stammbaum.Classen
|
24
SB-PictureTagger/F_SB_PictureTagger.Designer.vb
generated
24
SB-PictureTagger/F_SB_PictureTagger.Designer.vb
generated
@ -57,6 +57,8 @@ Partial Class Main
|
||||
Me.cb_AutoSave = New System.Windows.Forms.CheckBox()
|
||||
Me.cb_marks_visible = New System.Windows.Forms.CheckBox()
|
||||
Me.Label7 = New System.Windows.Forms.Label()
|
||||
Me.ShapeContainer1 = New Microsoft.VisualBasic.PowerPacks.ShapeContainer()
|
||||
Me.OvalShape1 = New Microsoft.VisualBasic.PowerPacks.OvalShape()
|
||||
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.GroupBox1.SuspendLayout()
|
||||
Me.GroupBox2.SuspendLayout()
|
||||
@ -377,8 +379,25 @@ Partial Class Main
|
||||
Me.Label7.AutoSize = True
|
||||
Me.Label7.Location = New System.Drawing.Point(9, 633)
|
||||
Me.Label7.Name = "Label7"
|
||||
Me.Label7.Size = New System.Drawing.Size(0, 13)
|
||||
Me.Label7.Size = New System.Drawing.Size(65, 13)
|
||||
Me.Label7.TabIndex = 13
|
||||
Me.Label7.Text = "Pfadangabe"
|
||||
'
|
||||
'ShapeContainer1
|
||||
'
|
||||
Me.ShapeContainer1.Location = New System.Drawing.Point(0, 0)
|
||||
Me.ShapeContainer1.Margin = New System.Windows.Forms.Padding(0)
|
||||
Me.ShapeContainer1.Name = "ShapeContainer1"
|
||||
Me.ShapeContainer1.Shapes.AddRange(New Microsoft.VisualBasic.PowerPacks.Shape() {Me.OvalShape1})
|
||||
Me.ShapeContainer1.Size = New System.Drawing.Size(1106, 723)
|
||||
Me.ShapeContainer1.TabIndex = 14
|
||||
Me.ShapeContainer1.TabStop = False
|
||||
'
|
||||
'OvalShape1
|
||||
'
|
||||
Me.OvalShape1.Location = New System.Drawing.Point(156, 216)
|
||||
Me.OvalShape1.Name = "OvalShape1"
|
||||
Me.OvalShape1.Size = New System.Drawing.Size(81, 77)
|
||||
'
|
||||
'Main
|
||||
'
|
||||
@ -397,6 +416,7 @@ Partial Class Main
|
||||
Me.Controls.Add(Me.b_last)
|
||||
Me.Controls.Add(Me.b_next)
|
||||
Me.Controls.Add(Me.PictureBox1)
|
||||
Me.Controls.Add(Me.ShapeContainer1)
|
||||
Me.Name = "Main"
|
||||
Me.Text = "SB-PictureTagger"
|
||||
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
@ -448,5 +468,7 @@ Partial Class Main
|
||||
Friend WithEvents NumericUpDown_OrdnerTiefe As System.Windows.Forms.NumericUpDown
|
||||
Friend WithEvents Label9 As System.Windows.Forms.Label
|
||||
Friend WithEvents tb_Place_Title As System.Windows.Forms.TextBox
|
||||
Friend WithEvents ShapeContainer1 As Microsoft.VisualBasic.PowerPacks.ShapeContainer
|
||||
Friend WithEvents OvalShape1 As Microsoft.VisualBasic.PowerPacks.OvalShape
|
||||
|
||||
End Class
|
||||
|
@ -129,4 +129,16 @@
|
||||
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Position.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Radius.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
</root>
|
@ -15,27 +15,11 @@ Public Class Main
|
||||
End Sub 'Main_Load
|
||||
|
||||
Private Sub Form1_Closing(ByVal sender As Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles MyBase.Closing
|
||||
'Speichere
|
||||
SaveTagg()
|
||||
SaveConfigForm()
|
||||
End Sub 'Form1_Closing
|
||||
|
||||
|
||||
'###################################################################################################################
|
||||
'############### Form1_Function-Tasks ##############################################################################
|
||||
'###################################################################################################################
|
||||
|
||||
'###################################################################################################################
|
||||
'############### Form1_Sub-Tasks ###################################################################################
|
||||
'###################################################################################################################
|
||||
Private Sub Clear_Form()
|
||||
tb_Bild_Time.Clear()
|
||||
tb_Bild_Title.Clear()
|
||||
tb_Place_Addresse.Clear()
|
||||
tb_Place_GPS.Clear()
|
||||
rtb_Bild_Description.Clear()
|
||||
rtb_Place_Description.Clear()
|
||||
End Sub 'Resetet die Form
|
||||
|
||||
Private Sub LoadConfigForm()
|
||||
'Unsterstützte Formate
|
||||
ReDim Settings.PictureTagger.pub_aSupportedFiles(5)
|
||||
@ -47,56 +31,95 @@ Public Class Main
|
||||
Settings.PictureTagger.pub_aSupportedFiles(5) = ".tif"
|
||||
'Portable oder Nicht komming soon!
|
||||
|
||||
End Sub 'LoadConfigForm
|
||||
End Sub 'LoadConfigForm ### in work ###
|
||||
Private Sub SaveConfigForm()
|
||||
'Wird noch Programmert, stürzt sich auf Stammbaum.Settings
|
||||
End Sub
|
||||
'Wie zuletz verwendetes Verzeichnis ...
|
||||
End Sub 'SaveConfigForm ### in work ###
|
||||
|
||||
Private Sub Reload()
|
||||
SaveTaggByEvent()
|
||||
Stammbaum.Module.PictureTagger.PT_LoadVerzeichnis()
|
||||
LoadTaggedIMG()
|
||||
End Sub 'Reload
|
||||
|
||||
Private Sub SaveTaggByEvent()
|
||||
If Settings.PictureTagger.pub_bChangeTagg Then
|
||||
If Not System.IO.File.Exists(Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Path) Then
|
||||
Settings.PictureTagger.pub_bChangeTagg = False
|
||||
ElseIf cb_AutoSave.Checked Then
|
||||
SaveTagg()
|
||||
ElseIf MessageBox.Show("Do you want to save changes?", "SB-PictureTagger", MessageBoxButtons.YesNo) = DialogResult.Yes Then
|
||||
SaveTagg()
|
||||
Else
|
||||
Settings.PictureTagger.pub_bChangeTagg = False
|
||||
'###################################################################################################################
|
||||
'############### Form1_Function-Tasks ##############################################################################
|
||||
'###################################################################################################################
|
||||
|
||||
Private Function ChangesAreTrue() As Boolean
|
||||
'Setze Standardwert:
|
||||
ChangesAreTrue = False
|
||||
|
||||
If Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Title <> tb_Bild_Title.Text Then ChangesAreTrue = True
|
||||
If Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Time <> tb_Bild_Time.Text Then ChangesAreTrue = True
|
||||
If Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Description <> rtb_Bild_Description.Text Then ChangesAreTrue = True
|
||||
|
||||
If Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Title <> tb_Place_Title.Text Then ChangesAreTrue = True
|
||||
If Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Adresse <> tb_Place_Addresse.Text Then ChangesAreTrue = True
|
||||
If Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.GPS <> tb_Place_GPS.Text Then ChangesAreTrue = True
|
||||
If Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Description <> rtb_Place_Description.Text Then ChangesAreTrue = True
|
||||
|
||||
'Wenn Markierungen geändert ... ### in work ###
|
||||
|
||||
End Function 'PT_ChangesTrue = True; wenn ÄNDERUNGEN vorgenommen!
|
||||
|
||||
'###################################################################################################################
|
||||
'############### Form1_Sub-Tasks ###################################################################################
|
||||
'###################################################################################################################
|
||||
|
||||
Private Sub Clear_Form()
|
||||
tb_Bild_Time.Clear()
|
||||
tb_Bild_Title.Clear()
|
||||
tb_Place_Addresse.Clear()
|
||||
tb_Place_GPS.Clear()
|
||||
rtb_Bild_Description.Clear()
|
||||
rtb_Place_Description.Clear()
|
||||
|
||||
'Entlehre Pfadangabe
|
||||
Label7.Text = Nothing
|
||||
|
||||
'Entlehre PictureBox
|
||||
PictureBox1.Image = Nothing
|
||||
|
||||
'Entlehre Speicher
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Clear()
|
||||
|
||||
'### Lösche Markierungen ## ### in work ###
|
||||
|
||||
|
||||
End Sub 'Resetet die Maske - - - - - - - - - - ### in work ###
|
||||
|
||||
|
||||
Private Sub SaveTagg(Optional ByVal WithoutQestion = False)
|
||||
|
||||
'Überprüfe ob Änderungen forgenommen #UND# Ob eine ID existiert #UND# Ob das Bild existiert
|
||||
If ChangesAreTrue() And (Settings.PictureTagger.Pub_oLoaded_TaggedIMG.ID <> "" Or Nothing) And System.IO.File.Exists(Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Path) Then
|
||||
|
||||
'Überprüfe ob Tagg Speichern erlaubt
|
||||
If cb_AutoSave.Checked Or WithoutQestion Then
|
||||
_SaveTaggs()
|
||||
ElseIf (MessageBox.Show("Willst du die Änderungen Speichern?", "SB-PictureTagger", MessageBoxButtons.YesNo) = DialogResult.Yes) Then
|
||||
_SaveTaggs()
|
||||
End If
|
||||
End If
|
||||
End Sub 'SaveTaggByEvent Like: Next/Last Picture, Colse Form, ...
|
||||
|
||||
Private Sub SaveTagg()
|
||||
|
||||
If Settings.PictureTagger.pub_aPfade(Settings.PictureTagger.pub_nPfadeIndex) <> "" Then
|
||||
|
||||
'TextBox sichern
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Title = tb_Bild_Title.Text
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Time = tb_Bild_Time.Text
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Description = rtb_Bild_Description.Text
|
||||
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Title = tb_Place_Title.Text
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Adresse = tb_Place_Addresse.Text
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.GPS = tb_Place_GPS.Text
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Description = rtb_Place_Description.Text
|
||||
|
||||
'Lese Markierungen <-- in Planung (Fieleicht Überflüsig, jenachdem wie Markierungen angesteuert werden
|
||||
|
||||
Stammbaum.Module.PictureTagger.PT_SaveTaggedIMG()
|
||||
|
||||
End If
|
||||
Settings.PictureTagger.pub_bChangeTagg = False
|
||||
End Sub 'SaveTagg to What ever is Configurated in Stammbaum.Module.PictureTagger
|
||||
End Sub 'Save Taggs when Changes are hapened
|
||||
|
||||
Private Sub _SaveTaggs()
|
||||
'TextBox sichern
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Title = tb_Bild_Title.Text
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Time = tb_Bild_Time.Text
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Description = rtb_Bild_Description.Text
|
||||
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Title = tb_Place_Title.Text
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Adresse = tb_Place_Addresse.Text
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.GPS = tb_Place_GPS.Text
|
||||
Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Description = rtb_Place_Description.Text
|
||||
|
||||
'Lese Markierungen <-- in Planung (Fieleicht Überflüsig, jenachdem wie Markierungen angesteuert werden
|
||||
|
||||
'In TaggSource speichern
|
||||
Stammbaum.Module.PictureTagger.PT_SaveTaggedIMG()
|
||||
End Sub 'Eigendliche Sicherungs Rotiene
|
||||
|
||||
|
||||
Private Sub LoadTaggedIMG()
|
||||
|
||||
SaveTaggByEvent()
|
||||
|
||||
'Textvelder Lehren
|
||||
Clear_Form()
|
||||
@ -104,8 +127,9 @@ Public Class Main
|
||||
'Lade neues TaggedIMG mit Stammbaum.Module.PictureTagger Modul
|
||||
Stammbaum.Module.PictureTagger.PT_LoadTaggedIMG()
|
||||
|
||||
'Zeigt den BildPfad unter der PictureBox an
|
||||
'Zeigt den BildPfad unter PictureBox an
|
||||
Label7.Text = Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Path
|
||||
PictureBox1.Image = Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Image
|
||||
|
||||
'Befülle die TextBox-en
|
||||
tb_Bild_Title.Text = Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Title
|
||||
@ -117,9 +141,9 @@ Public Class Main
|
||||
tb_Place_GPS.Text = Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.GPS
|
||||
rtb_Place_Description.Text = Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Description
|
||||
|
||||
'Erstelle Marks
|
||||
'Erstelle Marks ### in work ###
|
||||
|
||||
End Sub 'LoadTaggedIMG -> SaveTaggByEvent()
|
||||
End Sub 'LoadTaggedIMG -> Befülle TextBox-en [UND erstelle Markierungen] - - - - - - ### in work ###
|
||||
|
||||
'###################################################################################################################
|
||||
'############### Buton Events: Click ###############################################################################
|
||||
@ -129,73 +153,46 @@ Public Class Main
|
||||
Private Sub b_exit_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles b_exit.Click
|
||||
' Programm Beenden
|
||||
Me.Close()
|
||||
End Sub 'Cloas Programm
|
||||
End Sub 'Closing Programm = Save Taggs -> Save Configs from Form
|
||||
|
||||
Private Sub b_loaddir_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles b_loaddir.Click
|
||||
'Laden eines zu Taggenden Bilder-Verzeichnis
|
||||
Dim sTMP As String
|
||||
sTMP = Tools.Dialoge.FolderBrowserDialog()
|
||||
If Directory.Exists(sTMP) Then
|
||||
SaveTagg()
|
||||
Settings.PictureTagger.Pub_sPath = sTMP
|
||||
Reload()
|
||||
Stammbaum.Module.PictureTagger.PT_LoadVerzeichnis()
|
||||
LoadTaggedIMG()
|
||||
End If
|
||||
End Sub 'Öffne Ordner -> wenn Pfad OK -> Reload()
|
||||
End Sub 'Öffne Ordner -> wenn Pfad OK -> Save Taggs -> Lade Verzeichnis -> Load Tagged IMG
|
||||
|
||||
Private Sub b_reloaddir_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles b_reloaddir.Click
|
||||
Reload()
|
||||
End Sub 'Relaod()
|
||||
SaveTagg()
|
||||
Stammbaum.Module.PictureTagger.PT_LoadVerzeichnis()
|
||||
LoadTaggedIMG()
|
||||
End Sub 'Save Taggs -> Lade Verzeichnis -> Load Tagged IMG
|
||||
|
||||
Private Sub b_save_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles b_save.Click
|
||||
If Settings.PictureTagger.pub_bChangeTagg Then
|
||||
SaveTagg()
|
||||
End If
|
||||
End Sub 'Wenn Änderung -> SaveTagg()
|
||||
SaveTagg()
|
||||
LoadTaggedIMG()
|
||||
End Sub 'Wenn Änderung -> Save Taggs
|
||||
|
||||
Private Sub b_next_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles b_next.Click
|
||||
If Settings.PictureTagger.pub_nPfadeIndex < UBound(Settings.PictureTagger.pub_aPfade) Then
|
||||
Settings.PictureTagger.pub_nPfadeIndex += 1
|
||||
LoadTaggedIMG()
|
||||
SaveTagg()
|
||||
If Settings.PictureTagger.Pub_nPfadeIndex < UBound(Settings.PictureTagger.Pub_aPfade) Then
|
||||
Settings.PictureTagger.Pub_nPfadeIndex += 1
|
||||
End If
|
||||
End Sub 'Next Index -> LoadTaggedIMG()
|
||||
LoadTaggedIMG()
|
||||
End Sub 'Speichere Taggs -> Next Index -> Load Tagged IMG
|
||||
|
||||
Private Sub b_last_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles b_last.Click
|
||||
If Settings.PictureTagger.pub_nPfadeIndex > 0 Then
|
||||
Settings.PictureTagger.pub_nPfadeIndex = Settings.PictureTagger.pub_nPfadeIndex - 1
|
||||
LoadTaggedIMG()
|
||||
SaveTagg()
|
||||
If Settings.PictureTagger.Pub_nPfadeIndex > 0 Then
|
||||
Settings.PictureTagger.Pub_nPfadeIndex = Settings.PictureTagger.Pub_nPfadeIndex - 1
|
||||
End If
|
||||
End Sub 'Last Index -> LoadTaggedIMG()
|
||||
|
||||
|
||||
'###################################################################################################################
|
||||
'############### TextBox: TextCanched ##############################################################################
|
||||
'###################################################################################################################
|
||||
Private Sub rtb_Bild_Description_TextChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles rtb_Bild_Description.TextChanged
|
||||
Settings.PictureTagger.pub_bChangeTagg = True
|
||||
End Sub 'Description Changed
|
||||
|
||||
Private Sub rtb_Place_Description_TextChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles rtb_Place_Description.TextChanged
|
||||
Settings.PictureTagger.pub_bChangeTagg = True
|
||||
End Sub 'Ort Descriptio Changed
|
||||
|
||||
Private Sub tb_Bild_Time_TextChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles tb_Bild_Time.TextChanged
|
||||
Settings.PictureTagger.pub_bChangeTagg = True
|
||||
End Sub 'Time Changed
|
||||
|
||||
Private Sub tb_Bild_Title_TextChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles tb_Bild_Title.TextChanged
|
||||
Settings.PictureTagger.pub_bChangeTagg = True
|
||||
End Sub 'Titel Changed
|
||||
|
||||
Private Sub tb_Place_Title_TextChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles tb_Place_Title.TextChanged
|
||||
Settings.PictureTagger.pub_bChangeTagg = True
|
||||
End Sub 'Ort Titel Changed
|
||||
|
||||
Private Sub tb_Place_Addresse_TextChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles tb_Place_Addresse.TextChanged
|
||||
Settings.PictureTagger.pub_bChangeTagg = True
|
||||
End Sub 'Ort Addresse Changed
|
||||
|
||||
Private Sub tb_Place_GPS_TextChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles tb_Place_GPS.TextChanged
|
||||
Settings.PictureTagger.pub_bChangeTagg = True
|
||||
End Sub 'Ort GPS Changed
|
||||
LoadTaggedIMG()
|
||||
End Sub 'Speichere Taggs -> Last Index -> Load Tagged IMG
|
||||
|
||||
|
||||
'###################################################################################################################
|
||||
@ -204,15 +201,18 @@ Public Class Main
|
||||
|
||||
Private Sub cb_marks_visible_CheckStateChanged(ByVal sender As Object, ByVal e As System.EventArgs)
|
||||
'Wenn cb_marks_visible=true then ZeichneMarks() ELSE VerstekeMarks()
|
||||
End Sub 'Visible/Hide Markierungen
|
||||
End Sub 'Visible/Hide Markierungen - - - ### in work ###
|
||||
|
||||
'###################################################################################################################
|
||||
'############### NumericUpDown Events: ValueChanged ################################################################
|
||||
'###################################################################################################################
|
||||
|
||||
Private Sub NumericUpDown_OrdnerTiefe_ValueChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles NumericUpDown_OrdnerTiefe.ValueChanged
|
||||
Settings.PictureTagger.nOrdnerTiefe = NumericUpDown_OrdnerTiefe.Value
|
||||
End Sub 'Ordner Tiefe Festlegen
|
||||
SaveTagg()
|
||||
Settings.PictureTagger.Pub_nOrdnerTiefe = NumericUpDown_OrdnerTiefe.Value
|
||||
Stammbaum.Module.PictureTagger.PT_LoadVerzeichnis()
|
||||
LoadTaggedIMG()
|
||||
End Sub ''Speichere Taggs -> Neue Ordner Tiefe -> Lade Verzeichnis -> Load Tagged IMG
|
||||
|
||||
|
||||
End Class
|
||||
|
@ -9,19 +9,23 @@ Namespace Stammbaum.Module.PictureTagger
|
||||
|
||||
Public Sub PT_LoadVerzeichnis()
|
||||
If System.IO.Directory.Exists(Settings.PictureTagger.Pub_sPath) Then
|
||||
Settings.PictureTagger.pub_aPfade = Tools.Filesystem.GetFilesFromDir(Settings.PictureTagger.Pub_sPath, Settings.PictureTagger.pub_aSupportedFiles, Settings.PictureTagger.nOrdnerTiefe)
|
||||
Settings.PictureTagger.Pub_aPfade = Tools.Filesystem.GetFilesFromDir(Settings.PictureTagger.Pub_sPath, Settings.PictureTagger.Pub_aSupportedFiles, Settings.PictureTagger.Pub_nOrdnerTiefe)
|
||||
Settings.PictureTagger.pub_nPfadeIndex = 0
|
||||
End If
|
||||
End Sub 'Lade Bilder in pub_aPfade Array
|
||||
End Sub 'Lade Bilder in pub_aPfade Array; Setze Index auf 0
|
||||
|
||||
Public Sub PT_LoadTaggedIMG()
|
||||
'Absicherung für Undimensioniertes Array
|
||||
If Settings.PictureTagger.pub_aPfade.Length = 0 Then ReDim Settings.PictureTagger.pub_aPfade(0)
|
||||
If Settings.PictureTagger.Pub_aPfade.Length = 0 Then ReDim Settings.PictureTagger.Pub_aPfade(0)
|
||||
|
||||
'Bereinige Falsche Indexangaben
|
||||
If UBound(Settings.PictureTagger.Pub_aPfade) < Settings.PictureTagger.Pub_nPfadeIndex Then Settings.PictureTagger.Pub_nPfadeIndex = UBound(Settings.PictureTagger.Pub_aPfade)
|
||||
|
||||
'Bildpfad auf existenz Prüfen
|
||||
If System.IO.File.Exists(Settings.PictureTagger.pub_aPfade(Settings.PictureTagger.pub_nPfadeIndex)) Then
|
||||
If System.IO.File.Exists(Settings.PictureTagger.Pub_aPfade(Settings.PictureTagger.Pub_nPfadeIndex)) Then
|
||||
|
||||
'Taggs With INI:
|
||||
Settings.PictureTagger.Pub_oLoaded_TaggedIMG = INI_Load_Taggs(Settings.PictureTagger.pub_aPfade(Settings.PictureTagger.pub_nPfadeIndex), False)
|
||||
Settings.PictureTagger.Pub_oLoaded_TaggedIMG = INI_Load_Taggs(Settings.PictureTagger.Pub_aPfade(Settings.PictureTagger.Pub_nPfadeIndex), False)
|
||||
|
||||
'Later With DB ---
|
||||
|
||||
@ -34,10 +38,14 @@ Namespace Stammbaum.Module.PictureTagger
|
||||
'###################################################################################################################
|
||||
Public Sub PT_SaveTaggedIMG()
|
||||
|
||||
'Taggs With INI:
|
||||
INI_Save_Taggs(Settings.PictureTagger.Pub_oLoaded_TaggedIMG, False)
|
||||
If (Settings.PictureTagger.Pub_oLoaded_TaggedIMG.ID <> "" Or Nothing) And System.IO.File.Exists(Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Path) Then
|
||||
|
||||
'Later With DB ---
|
||||
'Taggs With INI:
|
||||
INI_Save_Taggs(Settings.PictureTagger.Pub_oLoaded_TaggedIMG, False)
|
||||
|
||||
'Later With DB ---
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
@ -70,18 +78,8 @@ Namespace Stammbaum.Module.PictureTagger
|
||||
|
||||
If System.IO.File.Exists(INI_Locate) Then
|
||||
'Deklarationen
|
||||
Dim i As Long
|
||||
Dim sKey As String = TMP_TaggIMG.ID
|
||||
|
||||
'Führ Makr einlese Schleife
|
||||
Dim Mark_ID As String
|
||||
Dim Mark_PositionX As Long
|
||||
Dim Mark_PositionY As Long
|
||||
Dim Mark_Radius As Long
|
||||
Dim Mark_Description As String
|
||||
Dim Mark_Index As String
|
||||
|
||||
|
||||
'Lade Optionalen Rest:
|
||||
'Titel
|
||||
TMP_TaggIMG.Title = Tools.Data.File.INI_ReadValue(INI_Locate, sKey, "Title", Nothing)
|
||||
@ -109,32 +107,39 @@ Namespace Stammbaum.Module.PictureTagger
|
||||
|
||||
|
||||
|
||||
'Führ Makrierungen einlese Schleife
|
||||
''Dim i As Long
|
||||
''Dim Mark_ID As String
|
||||
''Dim Mark_PositionX As Long
|
||||
''Dim Mark_PositionY As Long
|
||||
''Dim Mark_Radius As Long
|
||||
''Dim Mark_Description As String
|
||||
''Dim Mark_Index As Long
|
||||
|
||||
'Load Marks
|
||||
'sMark_Index = Modul_Tools.Config_INI_ReadValue(INI_Locate, ID, "Title")
|
||||
i = 0
|
||||
Do While i <= 200
|
||||
Mark_Index = ("Mark" & Convert.ToString(i) & "_ID")
|
||||
Mark_ID = Tools.Data.File.INI_ReadValue(INI_Locate, sKey, Mark_Index)
|
||||
If Mark_ID <> "" Then
|
||||
i += 1
|
||||
|
||||
Mark_PositionX = Convert.ToDouble(Tools.Data.File.INI_ReadValue(INI_Locate, sKey, "Mark" & Convert.ToString(i) & "_PositionX", "0"))
|
||||
Mark_PositionY = Convert.ToInt32(Tools.Data.File.INI_ReadValue(INI_Locate, sKey, "Mark" & Convert.ToString(i) & "_PositionY", "0"))
|
||||
Mark_Radius = Convert.ToInt32(Tools.Data.File.INI_ReadValue(INI_Locate, sKey, "Mark" & Convert.ToString(i) & "_Radius", "0"))
|
||||
'##############################################################
|
||||
'ReFormate Description Text from "Mark_Description"
|
||||
Mark_Description = Tools.Convert.Coding.Base64_To_Ascii(Tools.Data.File.INI_ReadValue(INI_Locate, sKey, "Mark" & Convert.ToString(i) & "_Description", Nothing))
|
||||
'##############################################################
|
||||
|
||||
'Erstellen eines Neuen Marks
|
||||
TMP_TaggIMG.Create_NewMark(Mark_ID, Mark_PositionX, Mark_PositionY, Mark_Radius, Mark_Description)
|
||||
Else
|
||||
'Verlasse Schleife
|
||||
Exit Do
|
||||
End If
|
||||
Loop
|
||||
''i = 0
|
||||
''Do While i <= 200
|
||||
'' Mark_Index = ("Mark" & Convert.ToString(i) & "_ID")
|
||||
'' Mark_ID = Tools.Data.File.INI_ReadValue(INI_Locate, sKey, Mark_Index)
|
||||
'' If Mark_ID <> "" Then
|
||||
'' i += 1
|
||||
|
||||
'' Mark_PositionX = Convert.ToDouble(Tools.Data.File.INI_ReadValue(INI_Locate, sKey, "Mark" & Convert.ToString(i) & "_PositionX", "0"))
|
||||
'' Mark_PositionY = Convert.ToInt32(Tools.Data.File.INI_ReadValue(INI_Locate, sKey, "Mark" & Convert.ToString(i) & "_PositionY", "0"))
|
||||
'' Mark_Radius = Convert.ToInt32(Tools.Data.File.INI_ReadValue(INI_Locate, sKey, "Mark" & Convert.ToString(i) & "_Radius", "0"))
|
||||
'' '##############################################################
|
||||
'' 'ReFormate Description Text from "Mark_Description"
|
||||
'' Mark_Description = Tools.Convert.Coding.Base64_To_Ascii(Tools.Data.File.INI_ReadValue(INI_Locate, sKey, "Mark" & Convert.ToString(i) & "_Description", Nothing))
|
||||
'' '##############################################################
|
||||
|
||||
'' 'Erstellen eines Neuen Marks
|
||||
'' TMP_TaggIMG.Create_NewMark(Mark_ID, Mark_PositionX, Mark_PositionY, Mark_Radius, Mark_Description)
|
||||
'' Else
|
||||
'' 'Verlasse Schleife
|
||||
'' Exit Do
|
||||
'' End If
|
||||
''Loop
|
||||
|
||||
|
||||
End If 'File.Exists(INI_Locate)
|
||||
@ -158,7 +163,6 @@ Namespace Stammbaum.Module.PictureTagger
|
||||
INI_Locate = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(PicturePath), INI_Name)
|
||||
End If
|
||||
|
||||
Dim i As Long
|
||||
'### Main ##
|
||||
If System.IO.File.Exists(PicturePath) Then
|
||||
If Not System.IO.File.Exists(INI_Locate) Then System.IO.File.Create(INI_Locate)
|
||||
@ -192,21 +196,23 @@ Namespace Stammbaum.Module.PictureTagger
|
||||
Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Place_GPS", oTaggedIMG.Ort.GPS)
|
||||
|
||||
|
||||
'Save Marks ############### wird noch geändert ############### <--
|
||||
'i = 0
|
||||
'If oTaggedIMG.Markierung(0).ID <> "" Then
|
||||
' For i = 0 To UBound(oTaggedIMG.Markierung)
|
||||
' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark" & i & "_ID", Convert.ToString(i))
|
||||
' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark" & i & "_PositionX", Convert.ToString(oTaggedIMG.Markierung(i).PositionX))
|
||||
' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark" & i & "_PositionY", Convert.ToString(oTaggedIMG.Markierung(i).PositionY))
|
||||
' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark" & i & "_Radius", Convert.ToString(oTaggedIMG.Markierung(i).Radius))
|
||||
' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark" & i & "_Description", Tools.Convert.Coding.Ascii_To_Base64(oTaggedIMG.Markierung(i).Description))
|
||||
|
||||
' 'Schreibe Begrenzung
|
||||
' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark_MaxIndex", i)
|
||||
|
||||
' Next i
|
||||
'End If
|
||||
'Save Marks ############### wird noch geändert ############### <-- 'Anhand von Mark_Index wird anzahl geregelt!
|
||||
''i = 0
|
||||
''If oTaggedIMG.Markierung(0).ID <> "" Then
|
||||
'' For i = 0 To UBound(oTaggedIMG.Markierung)
|
||||
'' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark" & i & "_ID", Convert.ToString(i))
|
||||
'' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark" & i & "_PositionX", Convert.ToString(oTaggedIMG.Markierung(i).PositionX))
|
||||
'' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark" & i & "_PositionY", Convert.ToString(oTaggedIMG.Markierung(i).PositionY))
|
||||
'' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark" & i & "_Radius", Convert.ToString(oTaggedIMG.Markierung(i).Radius))
|
||||
'' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark" & i & "_Description", Tools.Convert.Coding.Ascii_To_Base64(oTaggedIMG.Markierung(i).Description))
|
||||
|
||||
'' 'Schreibe Begrenzung
|
||||
'' Tools.Data.File.INI_WriteValue(INI_Locate, sKey, "Mark_MaxIndex", i)
|
||||
|
||||
'' Next i
|
||||
''End If
|
||||
|
||||
End If 'File.Exists(PicturePath)
|
||||
End Sub
|
||||
|
@ -68,7 +68,7 @@
|
||||
aAim(UBound(aAim)) = EachFile
|
||||
End If
|
||||
Next
|
||||
Catch err As Exception
|
||||
Catch err As System.UnauthorizedAccessException
|
||||
End Try
|
||||
End Sub 'Teil von Finction GetFilesFromDir
|
||||
'######################################################################################
|
||||
|
@ -49,6 +49,7 @@
|
||||
<OptionInfer>On</OptionInfer>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Deployment" />
|
||||
|
@ -3,12 +3,11 @@
|
||||
Module PictureTagger
|
||||
Public Pub_oLoaded_TaggedIMG As New Stammbaum.Classen.PictureTagger.TaggedIMG
|
||||
Public Pub_sPath As String 'Pfad des Aktuell Arbeits Verzeichnises
|
||||
Public pub_aPfade(0) As String 'Array mit den Photo Pfaden
|
||||
Public pub_nPfadeIndex As Long = 0 'IndexNR des aktuell Geladenen Photos aus pub_aPfade
|
||||
Public pub_bChangeTagg As Boolean = False 'Wenn ein Tagg geänderd wird:= True bis SaveTagg()
|
||||
Public pub_aConfigForm(0) As String 'Array mit FormConfiguration
|
||||
Public pub_aSupportedFiles(0) As String 'Speichert die Unterstützten Extentions
|
||||
Public nOrdnerTiefe As Integer = 0 'Recursive Ordnertiefe beim Ordnereinlesen
|
||||
Public Pub_aPfade(0) As String 'Array mit den Photo Pfaden
|
||||
Public Pub_nPfadeIndex As Long = 0 'IndexNR des aktuell Geladenen Photos aus pub_aPfade
|
||||
Public Pub_aConfigForm(0) As String 'Array mit FormConfiguration
|
||||
Public Pub_aSupportedFiles(0) As String 'Speichert die Unterstützten Extentions
|
||||
Public Pub_nOrdnerTiefe As Integer = 0 'Recursive Ordnertiefe beim Ordnereinlesen
|
||||
End Module
|
||||
End Namespace
|
||||
End Namespace
|
Reference in New Issue
Block a user