Skip to content

Commit

Permalink
Version 0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fbecir committed Dec 4, 2024
1 parent c5b44df commit 16a0223
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 13 deletions.
Binary file removed IGNMap/Builds/LinuxMakefile/build/IGNMap
Binary file not shown.
Binary file modified IGNMap/Builds/LinuxMakefile/build/IGNMap_Linux
Binary file not shown.
Binary file removed IGNMap/Builds/LinuxMakefile/build/IGNMap_Linux24
Binary file not shown.
6 changes: 4 additions & 2 deletions IGNMap/JuceLibraryCode/BinaryData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3360,7 +3360,9 @@ static const unsigned char temp_binary_data_16[] =
"\"Server : \" = \"Serveur : \"\r\n"
"\"Layer : \" = \"Couche : \"\r\n"
"\"TMS : \" = \"TMS : \"\r\n"
"\"Format : \" = \"Format : \"\r\n";
"\"Format : \" = \"Format : \"\r\n"
"\"Double-click for loading the layer\" = \"Double-cliquez pour charger la couche\"\r\n"
"\"Server URL :\" = \"URL du serveur :\"";

const char* Translation_fr_txt = (const char*) temp_binary_data_16;

Expand Down Expand Up @@ -3392,7 +3394,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes)
case 0xc80d2c37: numBytes = 612; return Text_png;
case 0x4b26a5af: numBytes = 1279; return View_png;
case 0x389447dd: numBytes = 6752; return Zoom_png;
case 0x6c6745eb: numBytes = 5151; return Translation_fr_txt;
case 0x6c6745eb: numBytes = 5266; return Translation_fr_txt;
default: break;
}

Expand Down
2 changes: 1 addition & 1 deletion IGNMap/JuceLibraryCode/BinaryData.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace BinaryData
const int Zoom_pngSize = 6752;

extern const char* Translation_fr_txt;
const int Translation_fr_txtSize = 5151;
const int Translation_fr_txtSize = 5266;

// Number of elements in the namedResourceList and originalFileNames arrays.
const int namedResourceListSize = 17;
Expand Down
16 changes: 8 additions & 8 deletions IGNMap/Source/ImageOptionsViewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ class PixelValuesModel : public juce::TableListBoxModel {
PixelValuesModel() : juce::TableListBoxModel() { PixX = PixY = 0; WinSize = 3; NbSample = 0; PixValue = nullptr;}
~PixelValuesModel() { ClearPixels(); }

virtual void paintCell(juce::Graphics&, int rowNumber, int columnId, int width, int height, bool rowIsSelected) override;
virtual void paintRowBackground(juce::Graphics&, int /*rowNumber*/, int /*width*/, int /*height*/, bool /*rowIsSelected*/) override { ; }
virtual int getNumRows() override { return 2 * WinSize + 1; }
virtual void cellDoubleClicked(int rowNumber, int columnId, const juce::MouseEvent&) override;
virtual juce::String getCellTooltip(int rowNumber, int columnId) override { return GetText(rowNumber, columnId); }
void paintCell(juce::Graphics&, int rowNumber, int columnId, int width, int height, bool rowIsSelected) override;
void paintRowBackground(juce::Graphics&, int /*rowNumber*/, int /*width*/, int /*height*/, bool /*rowIsSelected*/) override { ; }
int getNumRows() override { return 2 * WinSize + 1; }
void cellDoubleClicked(int rowNumber, int columnId, const juce::MouseEvent&) override;
juce::String getCellTooltip(int rowNumber, int columnId) override { return GetText(rowNumber, columnId); }

bool AllocPixels(uint32_t nbSample);
void ClearPixels() { if (PixValue != nullptr) { delete[] PixValue; PixValue = nullptr; } }
Expand Down Expand Up @@ -60,9 +60,9 @@ class ImageOptionsViewer : public juce::Component,
void SetGroundPos(const double& X, const double& Y);
void SetPixPos(const int& X, const int& Y);

virtual void comboBoxChanged(juce::ComboBox* comboBoxThatHasChanged) override;
virtual void sliderValueChanged(juce::Slider* slider) override;
virtual void buttonClicked(juce::Button*) override;
void comboBoxChanged(juce::ComboBox* comboBoxThatHasChanged) override;
void sliderValueChanged(juce::Slider* slider) override;
void buttonClicked(juce::Button*) override;
bool keyPressed(const juce::KeyPress& key) override;

private:
Expand Down
4 changes: 2 additions & 2 deletions IGNMap/Source/MainComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -901,8 +901,8 @@ void MainComponent::NewWindow()
//==============================================================================
void MainComponent::AboutIGNMap()
{
juce::String version = "0.0.9";
juce::String info = "12/11/2024";
juce::String version = "0.1.0";
juce::String info = "04/12/2024";
juce::String message = "IGNMap 3 Version : " + version + "\n" + info + "\n";
message += "JUCE Version : " + juce::String(JUCE_MAJOR_VERSION) + "."
+ juce::String(JUCE_MINOR_VERSION) + "." + juce::String(JUCE_BUILDNUMBER) + "\n";
Expand Down
2 changes: 2 additions & 0 deletions IGNMap/Source/Translation_fr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,5 @@ countries: fr be mc ch lu
"Layer : " = "Couche : "
"TMS : " = "TMS : "
"Format : " = "Format : "
"Double-click for loading the layer" = "Double-cliquez pour charger la couche"
"Server URL :" = "URL du serveur :"
2 changes: 2 additions & 0 deletions IGNMap/Source/WmtsTmsViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ WmtsViewerComponent::WmtsViewerComponent()
m_Table.setSize(600, 200);

m_Table.setModel(&m_Model);
m_Table.setTooltip(juce::translate("Double-click for loading the layer"));
addAndMakeVisible(m_Table);
}

Expand Down Expand Up @@ -411,6 +412,7 @@ TmsViewerComponent::TmsViewerComponent()
m_Table.setSize(600, 200);

m_Table.setModel(&m_Model);
m_Table.setTooltip(juce::translate("Double-click for loading the layer"));
addAndMakeVisible(m_Table);
}

Expand Down
2 changes: 2 additions & 0 deletions IGNMap/Source/WmtsTmsViewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class WmtsViewerModel : public juce::TableListBoxModel, public juce::ActionBroad
void cellDoubleClicked(int /*rowNumber*/, int /*columnId*/, const juce::MouseEvent&) override;
void sortOrderChanged(int newSortColumnId, bool isForwards) override;
int getColumnAutoSizeWidth(int columnId) override;
juce::String getCellTooltip(int, int) override { return juce::translate("Double-click for loading the layer"); }

private:
XGeoBase* m_Base;
Expand Down Expand Up @@ -151,6 +152,7 @@ class TmsViewerModel : public juce::TableListBoxModel, public juce::ActionBroadc
void cellDoubleClicked(int /*rowNumber*/, int /*columnId*/, const juce::MouseEvent&) override;
void sortOrderChanged(int newSortColumnId, bool isForwards) override;
int getColumnAutoSizeWidth(int columnId) override;
juce::String getCellTooltip(int, int) override { return juce::translate("Double-click for loading the layer"); }

private:
XGeoBase* m_Base;
Expand Down

0 comments on commit 16a0223

Please sign in to comment.