diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3d5146ee95aaa459251f6634eeefd21814ce2597..b55ccdb799bf9247d6b47f262201708ea0ae3ee8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -184,8 +184,8 @@ <option name="delegateBuildToMaven" value="true" /> </component> <component name="ProjectFrameBounds" extendedState="6"> - <option name="x" value="950" /> - <option name="y" value="-10" /> + <option name="x" value="-9" /> + <option name="y" value="-9" /> <option name="width" value="980" /> <option name="height" value="1050" /> </component> @@ -302,7 +302,7 @@ <component name="PropertiesComponent"> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583521893751" /> + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583523876314" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" /> @@ -367,7 +367,7 @@ <option name="totallyTimeSpent" value="14619000" /> </component> <component name="ToolWindowManager"> - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> + <frame x="-7" y="-7" width="1550" height="838" extended-state="7" /> <editor active="true" /> <layout> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27114093" /> diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/backround.jpg b/GUI/src/main/java/cz/fidentis/analyst/resources/backround.jpg similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/backround.jpg rename to GUI/src/main/java/cz/fidentis/analyst/resources/backround.jpg diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/batchProcessing.png b/GUI/src/main/java/cz/fidentis/analyst/resources/batchProcessing.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/batchProcessing.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/batchProcessing.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/batchProcessingGreen.png b/GUI/src/main/java/cz/fidentis/analyst/resources/batchProcessingGreen.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/batchProcessingGreen.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/batchProcessingGreen.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/bottom.png b/GUI/src/main/java/cz/fidentis/analyst/resources/bottom.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/bottom.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/bottom.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/close.png b/GUI/src/main/java/cz/fidentis/analyst/resources/close.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/close.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/close.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/compareTwo.png b/GUI/src/main/java/cz/fidentis/analyst/resources/compareTwo.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/compareTwo.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/compareTwo.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/compareTwoGreen.png b/GUI/src/main/java/cz/fidentis/analyst/resources/compareTwoGreen.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/compareTwoGreen.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/compareTwoGreen.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/copareWithDatabase.png b/GUI/src/main/java/cz/fidentis/analyst/resources/copareWithDatabase.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/copareWithDatabase.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/copareWithDatabase.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/copareWithDatabaseGreen.png b/GUI/src/main/java/cz/fidentis/analyst/resources/copareWithDatabaseGreen.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/copareWithDatabaseGreen.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/copareWithDatabaseGreen.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/divide.png b/GUI/src/main/java/cz/fidentis/analyst/resources/divide.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/divide.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/divide.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/downButton.png b/GUI/src/main/java/cz/fidentis/analyst/resources/downButton.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/downButton.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/downButton.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/downButtonPressed.png b/GUI/src/main/java/cz/fidentis/analyst/resources/downButtonPressed.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/downButtonPressed.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/downButtonPressed.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/exportModel.png b/GUI/src/main/java/cz/fidentis/analyst/resources/exportModel.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/exportModel.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/exportModel.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/exportModelPressed.png b/GUI/src/main/java/cz/fidentis/analyst/resources/exportModelPressed.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/exportModelPressed.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/exportModelPressed.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/home.png b/GUI/src/main/java/cz/fidentis/analyst/resources/home.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/home.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/home.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/leftButton.png b/GUI/src/main/java/cz/fidentis/analyst/resources/leftButton.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/leftButton.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/leftButton.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/leftButtonPressed.png b/GUI/src/main/java/cz/fidentis/analyst/resources/leftButtonPressed.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/leftButtonPressed.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/leftButtonPressed.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/loadCanva.png b/GUI/src/main/java/cz/fidentis/analyst/resources/loadCanva.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/loadCanva.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/loadCanva.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/loadCanvaClicked.png b/GUI/src/main/java/cz/fidentis/analyst/resources/loadCanvaClicked.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/loadCanvaClicked.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/loadCanvaClicked.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/loadModel.png b/GUI/src/main/java/cz/fidentis/analyst/resources/loadModel.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/loadModel.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/loadModel.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/loadModelPressed.png b/GUI/src/main/java/cz/fidentis/analyst/resources/loadModelPressed.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/loadModelPressed.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/loadModelPressed.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/logo.png b/GUI/src/main/java/cz/fidentis/analyst/resources/logo.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/logo.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/logo.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/logo2.png b/GUI/src/main/java/cz/fidentis/analyst/resources/logo2.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/logo2.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/logo2.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/logo3.png b/GUI/src/main/java/cz/fidentis/analyst/resources/logo3.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/logo3.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/logo3.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/maximize.png b/GUI/src/main/java/cz/fidentis/analyst/resources/maximize.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/maximize.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/maximize.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/minus.png b/GUI/src/main/java/cz/fidentis/analyst/resources/minus.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/minus.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/minus.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/minusPressed.png b/GUI/src/main/java/cz/fidentis/analyst/resources/minusPressed.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/minusPressed.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/minusPressed.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/modelView.png b/GUI/src/main/java/cz/fidentis/analyst/resources/modelView.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/modelView.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/modelView.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/modelViewMoved.png b/GUI/src/main/java/cz/fidentis/analyst/resources/modelViewMoved.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/modelViewMoved.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/modelViewMoved.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/n.png b/GUI/src/main/java/cz/fidentis/analyst/resources/n.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/n.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/n.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/navigBackground.png b/GUI/src/main/java/cz/fidentis/analyst/resources/navigBackground.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/navigBackground.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/navigBackground.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/navigationBackground.png b/GUI/src/main/java/cz/fidentis/analyst/resources/navigationBackground.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/navigationBackground.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/navigationBackground.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/new_project.jpg b/GUI/src/main/java/cz/fidentis/analyst/resources/new_project.jpg similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/new_project.jpg rename to GUI/src/main/java/cz/fidentis/analyst/resources/new_project.jpg diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/new_project.png b/GUI/src/main/java/cz/fidentis/analyst/resources/new_project.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/new_project.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/new_project.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/new_project_opened.png b/GUI/src/main/java/cz/fidentis/analyst/resources/new_project_opened.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/new_project_opened.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/new_project_opened.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/plus.png b/GUI/src/main/java/cz/fidentis/analyst/resources/plus.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/plus.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/plus.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/plusPressed.png b/GUI/src/main/java/cz/fidentis/analyst/resources/plusPressed.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/plusPressed.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/plusPressed.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/resetButton.png b/GUI/src/main/java/cz/fidentis/analyst/resources/resetButton.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/resetButton.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/resetButton.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/resetButtonPressed.png b/GUI/src/main/java/cz/fidentis/analyst/resources/resetButtonPressed.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/resetButtonPressed.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/resetButtonPressed.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/rightBottom.png b/GUI/src/main/java/cz/fidentis/analyst/resources/rightBottom.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/rightBottom.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/rightBottom.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/rightButton.png b/GUI/src/main/java/cz/fidentis/analyst/resources/rightButton.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/rightButton.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/rightButton.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/rightButtonPressed.png b/GUI/src/main/java/cz/fidentis/analyst/resources/rightButtonPressed.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/rightButtonPressed.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/rightButtonPressed.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/symetry.png b/GUI/src/main/java/cz/fidentis/analyst/resources/symetry.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/symetry.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/symetry.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/symetryCount.png b/GUI/src/main/java/cz/fidentis/analyst/resources/symetryCount.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/symetryCount.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/symetryCount.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/symetryCountClicked.png b/GUI/src/main/java/cz/fidentis/analyst/resources/symetryCountClicked.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/symetryCountClicked.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/symetryCountClicked.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/symetryGreen.png b/GUI/src/main/java/cz/fidentis/analyst/resources/symetryGreen.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/symetryGreen.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/symetryGreen.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/texture.png b/GUI/src/main/java/cz/fidentis/analyst/resources/texture.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/texture.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/texture.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/texture2.png b/GUI/src/main/java/cz/fidentis/analyst/resources/texture2.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/texture2.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/texture2.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/upButton.png b/GUI/src/main/java/cz/fidentis/analyst/resources/upButton.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/upButton.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/upButton.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/upButtonPressed.png b/GUI/src/main/java/cz/fidentis/analyst/resources/upButtonPressed.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/upButtonPressed.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/upButtonPressed.png diff --git a/GUI/src/main/resources/cz/findetis/analyst/gui/resources/wireframe.png b/GUI/src/main/java/cz/fidentis/analyst/resources/wireframe.png similarity index 100% rename from GUI/src/main/resources/cz/findetis/analyst/gui/resources/wireframe.png rename to GUI/src/main/java/cz/fidentis/analyst/resources/wireframe.png