diff --git a/IGNMap/Builds/LinuxMakefile/build/IGNMap b/IGNMap/Builds/LinuxMakefile/build/IGNMap deleted file mode 100644 index 0b41703..0000000 Binary files a/IGNMap/Builds/LinuxMakefile/build/IGNMap and /dev/null differ diff --git a/IGNMap/Builds/LinuxMakefile/build/IGNMap_Linux b/IGNMap/Builds/LinuxMakefile/build/IGNMap_Linux index cc6a774..3007b7f 100644 Binary files a/IGNMap/Builds/LinuxMakefile/build/IGNMap_Linux and b/IGNMap/Builds/LinuxMakefile/build/IGNMap_Linux differ diff --git a/IGNMap/Builds/LinuxMakefile/build/IGNMap_Linux24 b/IGNMap/Builds/LinuxMakefile/build/IGNMap_Linux24 deleted file mode 100644 index 486b49d..0000000 Binary files a/IGNMap/Builds/LinuxMakefile/build/IGNMap_Linux24 and /dev/null differ diff --git a/IGNMap/JuceLibraryCode/BinaryData.cpp b/IGNMap/JuceLibraryCode/BinaryData.cpp index ad555f3..4d8cf0d 100644 --- a/IGNMap/JuceLibraryCode/BinaryData.cpp +++ b/IGNMap/JuceLibraryCode/BinaryData.cpp @@ -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; @@ -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; } diff --git a/IGNMap/JuceLibraryCode/BinaryData.h b/IGNMap/JuceLibraryCode/BinaryData.h index 0dc4090..80299bf 100644 --- a/IGNMap/JuceLibraryCode/BinaryData.h +++ b/IGNMap/JuceLibraryCode/BinaryData.h @@ -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; diff --git a/IGNMap/Source/ImageOptionsViewer.h b/IGNMap/Source/ImageOptionsViewer.h index 9478577..7d868c1 100644 --- a/IGNMap/Source/ImageOptionsViewer.h +++ b/IGNMap/Source/ImageOptionsViewer.h @@ -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; } } @@ -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: diff --git a/IGNMap/Source/MainComponent.cpp b/IGNMap/Source/MainComponent.cpp index a6c9165..02cceec 100644 --- a/IGNMap/Source/MainComponent.cpp +++ b/IGNMap/Source/MainComponent.cpp @@ -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"; diff --git a/IGNMap/Source/Translation_fr.txt b/IGNMap/Source/Translation_fr.txt index 3e00b6c..ea15ad7 100644 --- a/IGNMap/Source/Translation_fr.txt +++ b/IGNMap/Source/Translation_fr.txt @@ -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 :" \ No newline at end of file diff --git a/IGNMap/Source/WmtsTmsViewer.cpp b/IGNMap/Source/WmtsTmsViewer.cpp index 3012477..c0d3b39 100644 --- a/IGNMap/Source/WmtsTmsViewer.cpp +++ b/IGNMap/Source/WmtsTmsViewer.cpp @@ -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); } @@ -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); } diff --git a/IGNMap/Source/WmtsTmsViewer.h b/IGNMap/Source/WmtsTmsViewer.h index edd8929..07e4c70 100644 --- a/IGNMap/Source/WmtsTmsViewer.h +++ b/IGNMap/Source/WmtsTmsViewer.h @@ -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; @@ -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;