Skip to content

Commit c0d4ea8

Browse files
committed
Export photothèque
1 parent 96f0ce4 commit c0d4ea8

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

IGNMap/IGNMap.jucer

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,8 +824,10 @@
824824
<VS2026 targetFolder="Builds/VisualStudio2026" extraLinkerFlags="/STACK:10000000"
825825
bigIcon="bOamUH" userNotes="Installation de la LibJpeg (jpeg-9f) : copier jconfig.vc en jconfig.h">
826826
<CONFIGURATIONS>
827-
<CONFIGURATION isDebug="1" name="Debug" headerPath="$(SolutionDir)\..\..\..\libwebp-1.3.2&#10;$(SolutionDir)\..\..\..\protozero\include&#10;$(SolutionDir)\..\..\..\vtzero\include"/>
828-
<CONFIGURATION isDebug="0" name="Release" headerPath="$(SolutionDir)\..\..\..\libwebp-1.3.2&#10;$(SolutionDir)\..\..\..\protozero\include&#10;$(SolutionDir)\..\..\..\vtzero\include"/>
827+
<CONFIGURATION isDebug="1" name="Debug" headerPath="$(SolutionDir)\..\..\..\libwebp-1.3.2&#10;$(SolutionDir)\..\..\..\protozero\include&#10;$(SolutionDir)\..\..\..\vtzero\include"
828+
useRuntimeLibDLL="0"/>
829+
<CONFIGURATION isDebug="0" name="Release" headerPath="$(SolutionDir)\..\..\..\libwebp-1.3.2&#10;$(SolutionDir)\..\..\..\protozero\include&#10;$(SolutionDir)\..\..\..\vtzero\include"
830+
useRuntimeLibDLL="0"/>
829831
</CONFIGURATIONS>
830832
<MODULEPATHS>
831833
<MODULEPATH id="juce_core" path="../JUCE/modules"/>

IGNMap/Source/MainComponent.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ void MainComponent::actionListenerCallback(const juce::String& message)
865865
if (((T.size() - 1) % 3 != 0) || (T.size() == 1))
866866
return;
867867
std::vector<XPt3D> target;
868-
for (size_t i = 0; i < (T.size() - 1) / 3; i++) {
868+
for (int i = 0; i < ((int)T.size() - 1) / 3; i++) {
869869
target.push_back(XPt3D(T[3*i + 1].getDoubleValue(), T[3*i + 2].getDoubleValue(), T[3*i + 3].getDoubleValue()));
870870
}
871871
if (m_MapView.get() != nullptr)
@@ -1068,7 +1068,7 @@ bool MainComponent::ShowHideSidePanel()
10681068
//==============================================================================
10691069
void MainComponent::AboutIGNMap()
10701070
{
1071-
juce::String version = "0.1.4";
1071+
juce::String version = "0.1.5";
10721072
juce::String info = "Compilation : " + juce::String(__DATE__) + ", " + juce::String(__TIME__);
10731073
juce::String message = "IGNMap 3 Version : " + version + "\n\n" + info + "\n\n";
10741074
message += "JUCE Version : " + juce::String(JUCE_MAJOR_VERSION) + "."
@@ -1845,6 +1845,8 @@ void MainComponent::ShowProperties(uint32_t index, bool typeVector)
18451845
viewer->setVisible(true);
18461846
m_ToolWindows.push_back(viewer);
18471847
}
1848+
XPt3D T = m_MapView.get()->GetTarget();
1849+
viewer->SetTarget(T.X, T.Y, T.Z);
18481850
viewer->SetSelection(obj);
18491851
}
18501852

IGNMap/Source/ObjectViewer.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,19 @@ void ObjectViewerComponent::comboBoxChanged(juce::ComboBox* comboBoxThatHasChang
262262
}
263263
}
264264

265+
//==============================================================================
266+
// ObjectViewerComponent : fixe le point cible
267+
//==============================================================================
268+
void ObjectViewerComponent::SetTarget(const double& X, const double& Y, const double& Z)
269+
{
270+
m_Target = XPt3D(X, Y, Z);
271+
if (m_Object == nullptr)
272+
return;
273+
RotationImage* image = dynamic_cast<RotationImage*>(m_Object);
274+
if (image != nullptr)
275+
UpdateFrameExport(image);
276+
}
277+
265278
//==============================================================================
266279
// ObjectViewerComponent : fixe la selection
267280
//==============================================================================
@@ -492,4 +505,5 @@ void ObjectViewerComponent::ExportUsefulFrame()
492505
juce::PNGImageFormat png;
493506
png.writeImageToStream(export_ima, outputFileStream);
494507
juce::MouseCursor::hideWaitCursor();
508+
file.revealToUser();
495509
}

IGNMap/Source/ObjectViewer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ObjectViewerComponent : public juce::Component, public juce::ActionListene
4646
bool SetInternetImage(GeoInternetImage* internet);
4747
bool UpdateInternetImage(GeoInternetImage* internet);
4848

49-
void SetTarget(const double& X, const double& Y, const double& Z) { m_Target = XPt3D(X, Y, Z); }
49+
void SetTarget(const double& X, const double& Y, const double& Z);
5050

5151
private:
5252
XGeoObject* m_Object;

0 commit comments

Comments
 (0)