Changeset 1313

Timestamp:

11/13/07 01:50:24 (11 months ago)

Author:

calvin

Message:

zonajs patches: "Save", machine view scale is a regular configuration setting.
and some other minor fixes

Location:

trunk/src/buzelib

Files:

• BuzeConfiguration.cpp (modified) (2 diffs)
• BuzeConfiguration.h (modified) (2 diffs)
• MachineView.cpp (modified) (3 diffs)
• MainFrm.cpp (modified) (3 diffs)
• MainFrm.h (modified) (2 diffs)
• PatternView.cpp (modified) (2 diffs)
• Preferences/AudioDriverPreferencesView.cpp (modified) (1 diff)
• buze.rc (modified) (2 diffs)

trunk/src/buzelib/BuzeConfiguration.cpp

@@ -325 +325 @@
 }
 
-void CConfiguration::setMachineSkinVisibility(std::string uri, bool state) {
+void CConfiguration::setMachineSkinVisibility(bool state) {
         setConfigNumber("Settings", "MachineSkin", state?1:0);
 }
 
-bool CConfiguration::getMachineSkinVisibility(std::string uri) {
+bool CConfiguration::getMachineSkinVisibility() {
         DWORD dw = 1;
         getConfigNumber("Settings", "MachineSkin", &dw);
@@ -354 +354 @@
         return dw;
 }
+
+void CConfiguration::setMachineScale(double sc) {
+        std::string str;
+        char pc[10];
+        sprintf(pc, "%.6f", sc);
+        str = pc;
+        setConfigString("Settings", "MachineScale", str);
+}
+
+double CConfiguration::getMachineScale() {
+        string str;
+        if (!getConfigString("Settings", "MachineScale", &str))
+                return 1.0;
+        return atof(str.c_str());
+}

trunk/src/buzelib/BuzeConfiguration.h

@@ -54 +54 @@
         int getMachinePatternLength(std::string uri);
 
-        void setMachineSkinVisibility(std::string uri, bool state);
-        bool getMachineSkinVisibility(std::string uri);
+        void setMachineSkinVisibility(bool state);
+        bool getMachineSkinVisibility();
 
         void setExternalWaveEditor(std::string cmd);
@@ -65 +65 @@
         int getSequencerStepLow();
         
+        void setMachineScale(double sc);
+        double getMachineScale();
 
 };

trunk/src/buzelib/MachineView.cpp

@@ -49 +49 @@
         mbuttonState = false;
         isLButtonDown = false;
-        scale = 1.0;
+        scale = _Module.configuration->getMachineScale();
         moveType = MachineViewMoveNothing;
         SetRect(&prevDragRect, -1, -1, -1, -1);
@@ -170 +170 @@
 
 LRESULT CMachineView::OnFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
+        scale = _Module.configuration->getMachineScale();
         mainFrame->setCurrentFocus(m_hWnd);
         moveType = MachineViewMoveNothing;
@@ -1723 +1724 @@
 
 
+

trunk/src/buzelib/MainFrm.cpp

@@ -1603 +1603 @@
 }
 
+LRESULT CMainFrame::saveFile(std::string filename) {
+        char tempPath[MAX_PATH];
+        char tempFile[MAX_PATH];
+        GetTempPath(MAX_PATH, tempPath);
+        GetTempFileName(tempPath, "3zE", 0, tempFile);
+        debug("Save temporary " + (std::string)tempFile);
+
+        bool state = false;
+        string ext = "";
+        size_t lp = filename.find_last_of('.');
+        if (lp!=string::npos) {
+                ext = filename.substr(lp+1);
+                transform(ext.begin(), ext.end(), ext.begin(), tolower);
+        }
+        if (ext=="bmx" || ext=="bmw") {
+                zzub::file_outstream outf;
+
+                state = outf.create(tempFile);
+                if (state) {
+                        BuzzWriter writer(&outf);
+                        state = writer.writePlayer(player, vector<metaplugin*>(), true);
+                        outf.close();
+                }
+        } else {
+                CcmWriter writer;
+                state = writer.save(tempFile, player);
+        }
+
+        if (state) {
+                debug("Delete original " + filename);
+                
+                if (PathFileExists(filename.c_str()))
+                        state = DeleteFile(filename.c_str()) != 0;
+
+                debug("Rename temporary to original");
+                if (state) {
+                        state = MoveFile(tempFile, filename.c_str());
+                }
+
+                debug("Delete temporary");
+                DeleteFile(tempFile);
+        }
+
+        if (state) {
+                // update window text
+                document->setCurrentFile(filename);
+                setWindowTitle(document->currentFileName.c_str());
+                document->lastSaveUndoPosition=document->undoManager.getPosition();
+                setMostRecent(filename);
+        } else {
+                MessageBox("Cannot save file!", filename.c_str());
+                debug("Save failed!");
+        }
+
+        return 0;
+}
+
 LRESULT CMainFrame::OnFileSave(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& bHandled) {
-        return OnFileSaveAs(0, 0, 0, bHandled);
+        if(document->currentFileName.size() && document->currentFileName != "Untitled")
+                return saveFile(document->currentDirectory + "\\" + document->currentFileName + "." + document->currentExtension);
+        else
+                return OnFileSaveAs(0, 0, 0, bHandled);
 }
 
 LRESULT CMainFrame::OnFileSaveAs(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
+
         OPENFILENAME ofn;       // common dialog box structure
         char szFile[260];       // buffer for file name
@@ -1639 +1700 @@
         if (GetSaveFileName(&ofn)!=TRUE) return 1;
 
-        string filename = ofn.lpstrFile;
-        string ext = "";
-        size_t lp = filename.find_last_of('.');
-        if (lp!=string::npos) {
-                ext = filename.substr(lp+1);
-                transform(ext.begin(), ext.end(), ext.begin(), tolower);
-        }
-
-        char tempPath[MAX_PATH];
-        char tempFile[MAX_PATH];
-        GetTempPath(MAX_PATH, tempPath);
-        GetTempFileName(tempPath, "3zE", 0, tempFile);
-        debug("Save temporary " + (std::string)tempFile);
-
-        bool state = false;
-        if (ext=="bmx" || ext=="bmw") {
-                zzub::file_outstream outf;
-
-                state = outf.create(tempFile);
-                if (state) {
-                        BuzzWriter writer(&outf);
-                        state = writer.writePlayer(player, vector<metaplugin*>(), true);
-                        outf.close();
-                }
-        } else {
-                CcmWriter writer;
-                state = writer.save(tempFile, player);
-        }
-
-        if (state) {
-                debug("Delete original " + (std::string)ofn.lpstrFile);
-                
-                if (PathFileExists(ofn.lpstrFile))
-                        state = DeleteFile(ofn.lpstrFile) != 0;
-
-                debug("Rename temporary to original");
-                if (state) {
-                        state = MoveFile(tempFile, ofn.lpstrFile);
-                }
-
-                debug("Delete temporary");
-                DeleteFile(tempFile);
-        }
-
-        if (state) {
-                // update window text
-                document->setCurrentFile(ofn.lpstrFile);
-                setWindowTitle(document->currentFileName.c_str());
-                document->lastSaveUndoPosition=document->undoManager.getPosition();
-        } else {
-                MessageBox("Cannot save file!", ofn.lpstrFile);
-                debug("Save failed!");
-        }
-
-        return 0;
+        return saveFile(ofn.lpstrFile);
 }
 
@@ -2753 +2760 @@
 
 MachineSkin* CMainFrame::getSkin(std::string uri) {
-        if (!_Module.configuration->getMachineSkinVisibility(uri)) return 0; // Skin visibility setting
+        if (!_Module.configuration->getMachineSkinVisibility()) return 0; // Skin visibility setting
 
         map<string, MachineSkin>::iterator i = skins.find(uri);

trunk/src/buzelib/MainFrm.h

@@ -498 +498 @@
         bool openSongFromFile(bool clearAll);
         bool openSongFromFile(std::string fileName, bool clearAll);
+        LRESULT saveFile(std::string filename);
 
         void updateTick();
@@ -667 +668 @@
                 mainFrame = 0;
         }
-        std::string serialize() { 
-                char pc[64];
-                sprintf(pc, "%.6f", data->scale);
-                return pc; 
-        }
+        std::string serialize() { return ""; }
         CMachineView* deserialize(std::string str) {
-                CMachineView* view = new CMachineView(mainFrame, mainFrame); 
-                double scale = atof(str.c_str());
-                if (scale != 0.0)
-                        view->scale = scale;
+                CMachineView* view = new CMachineView(mainFrame, mainFrame);
                 return view;
         }

trunk/src/buzelib/PatternView.cpp

@@ -28 +28 @@
         { 12, 3 },
         { 12, 4 },
+        { 16, 3 },
         { 16, 4 },
         { 16, 8 },
@@ -33 +34 @@
         { 18, 6 },
         { 18, 9 },
+        { 24, 4 },
+        { 24, 6 },
+        { 24, 8 },
 };
 

trunk/src/buzelib/Preferences/AudioDriverPreferencesView.cpp

@@ -174 +174 @@
         int nearest = -1;
         int nearestDist = UINT_MAX;
-        for (int i = 0; device->rates.size(); i++) {
+        for (int i = 0; i < device->rates.size(); i++) {
                 unsigned int testRate = device->rates[i];
                 if (testRate == 0) break;

trunk/src/buzelib/buze.rc

@@ -168 +168 @@
         MENUITEM "&New\tCtrl+N",                ID_FILE_NEW
         MENUITEM "&Open...\tCtrl+O",            ID_FILE_OPEN
-        MENUITEM "&Save As\tCtrl+S",            ID_FILE_SAVE
+        MENUITEM "&Save\tCtrl+S",               ID_FILE_SAVE
         MENUITEM "Save &As...",                 ID_FILE_SAVE_AS
         MENUITEM SEPARATOR
@@ -1246 +1246 @@
 
 
+